Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/assets/styles/ruoyi.scss

@@ -174,7 +174,7 @@
 
 .list-group-item {
   border-bottom: 1px solid #e7eaec;
-  border-top: 1px solid #e7eaec;
+  // border-top: 1px solid #e7eaec;
   margin-bottom: -1px;
   padding: 11px 0px;
   font-size: 13px;

src/components/Template/HandleFormItem.vue

@@ -1164,8 +1164,8 @@ export default {
                 isSame = isEqual(current.oldValue, current.newValue);
                 isOldValueEmpty = isValueEmpty(current.oldValue);
             } else if (this.type === "checkboxTree") {
-                const current = this.getCheckboxTreeInfo();
-                const { oldValue = {}, newValue } = current;
+                const current = this.getCheckboxTreeInfo() || {};
+                const { oldValue = {}, newValue = {} } = current;
                 if (currentHandleType === "checkboxTreeCheckbox") {
                     isSame = isEqual(oldValue.checked, newValue.checked);
                     isOldValueEmpty = oldValue.checked === undefined;
@@ -1248,7 +1248,7 @@ export default {
                 const current = this.getCheckboxTreeInfo();
                 if (this.currentHandleType === "checkboxTreeCheckbox") {
                     const { oldValue = {}, newValue = {} } = current;
-                    recordOldVlaue = `${oldValue.label || ''}:${oldValue.checked ? '勾选' : '未勾选'}`;
+                    recordOldVlaue = `${oldValue?.label || ''}:${oldValue?.checked ? '勾选' : '未勾选'}`;
                     recordValue = `${newValue.label || ''}:${newValue.checked ? '勾选' : '未勾选'}`;
                     isModify = newValue.checked !== undefined;
                 } else {

src/views/business/comps/template/comps/dj/DJ001.vue

@@ -13,7 +13,7 @@
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" 
 							ref="operateStepRef" :formConfig="operateConfig" :formData="formData" />
-						<BaseInfoFormPackage fieldItemLabel="template.dj.dj001.fhfw" 
+						<BaseInfoFormPackage v-if="fillType !== 'preFill'" fieldItemLabel="template.dj.dj001.fhfw" 
 							ref="fhfwCheckBoxRef" :formConfig="fhfwCheckBoxConfig" :formData="formData" />
 						<div class="template-form-item" >
 							<span>{{ $t('template.dj.dj001.fhfw')  }}</span>
@@ -159,13 +159,14 @@ export default {
 							label: 'template.dj.dj001.fhfw',
 							type: "checkboxTree",
 							fillType: 'actFill',
-							options: this.fhfwCheckOptions
+							options: Array.isArray(this.fhfwCheckOptions) ? this.fhfwCheckOptions : []
 						},
 						fhlrCheck: {
 							label: 'template.dj.dj001.fhlr',
 							type: "checkboxTree",
 							fillType: 'actFill',
-							options: this.fhlrCheckOptions
+							options: Array.isArray(this.fhlrCheckOptions) ? this.fhlrCheckOptions : []
+							
 						},
 					}
 				},
@@ -199,16 +200,17 @@ export default {
 	},
 	data() {
 		return {
-			formData: {},
+			formData: {
+				fhfwCheck: { checkedValues: [], otherValues: {} },
+				fhlrCheck: { checkedValues: [], otherValues: {} },
+			},
 			fhfwCheckOptions:[],
 			fhlrCheckOptions:[],
 			isFirstTableDataRecorded: false,
 		};
 	},
 	mounted() {
-		setTimeout(()=>{
-			this.getTableData()
-		},200)
+		this.getTableData()
 	},
 	methods: {
 		//获取已填写的表单数据
@@ -251,23 +253,47 @@ export default {
 		},
 		// 获取范围和内容表格数据（核心优化）
 		getTableData() {
-			const formData = this.getFilledFormData() || {};
-			const stepTableFormData = formData.stepTableFormData || [];
-			const stepTableFormData_1 = formData.stepTableFormData_1 || [];
-			// 处理数据为复选框options格式（去重+空值过滤）
-			const firstList = stepTableFormData
-				.filter(item => item.fhfw) // 过滤空值
-				.map(item => ({ label: item.fhfw, value: item.fhfw }))
-				.filter((item, index, arr) => arr.findIndex(i => i.value === item.value) === index); // 去重
+			try {
+				const formData = this.getFilledFormData() || {};
+				// 修复：增加空值保护
+				const stepTableFormData = formData.stepTableFormData || this.formData.stepTableFormData || [];
+				const stepTableFormData_1 = formData.stepTableFormData_1 || this.formData.stepTableFormData_1 || [];
+				
+				// 处理数据为checkboxTree期望的格式（包含children结构）
+				const firstList = stepTableFormData
+					.filter(item => item && item.fhfw && item.fhfw.trim()) // 严格过滤空值
+					.map(item => ({ 
+						label: item.fhfw, 
+						value: item.fhfw,
+						children: [] // 必须包含children字段，否则checkboxTree会报错
+					}))
+					// 去重优化
+					.filter((item, index, arr) => {
+						return arr.findIndex(i => i.value === item.value) === index;
+					});
 
-			const secondList = stepTableFormData_1
-				.filter(item => item.fhlr) // 过滤空值
-				.map(item => ({ label: item.fhlr, value: item.fhlr }))
-				.filter((item, index, arr) => arr.findIndex(i => i.value === item.value) === index); // 去重
+				const secondList = stepTableFormData_1
+					.filter(item => item && item.fhlr && item.fhlr.trim()) // 严格过滤空值
+					.map(item => ({ 
+						label: item.fhlr, 
+						value: item.fhlr,
+						children: [] // 必须包含children字段
+					}))
+					.filter((item, index, arr) => {
+						return arr.findIndex(i => i.value === item.value) === index;
+					});
 
-			// 更新响应式变量（触发computed更新）
-			this.fhfwCheckOptions = firstList;
-			this.fhlrCheckOptions = secondList;
+				// 响应式更新
+				this.$nextTick(()=>{
+					this.fhfwCheckOptions = firstList;
+					this.fhlrCheckOptions = secondList;
+				})
+				
+			} catch (error) {
+				// 异常时重置为空数组，避免页面崩溃
+				this.fhfwCheckOptions = [];
+				this.fhlrCheckOptions = [];
+			}
 		},
 	}
 };

src/views/business/comps/template/comps/dl/DL006.vue

@@ -659,9 +659,7 @@ export default {
         // 关键修复2：先构建完整的数据源数组，再一次性更新
         const newDataSource = [];
         let rowIndexNew = 0;
-        console.log(doseGroupCount, parallelDishCount,"doseGroupCount, parallelDishCount")
         for (let doseIndex = 0; doseIndex < doseGroupCount; doseIndex++) {
-
           for (let dishIndex = 0; dishIndex < parallelDishCount; dishIndex++) {
             const rowData = {
               jlzb: stepTableFormData[doseIndex]?.jlzmc || '', 
@@ -671,19 +669,28 @@ export default {
             newDataSource.push(rowData);
             rowIndexNew++;
           }
-          newDataSource.map((item,index)=>{
-            for (let i = 0; i < doseGroupCount; i++) {
-              item[`czrxm_${i}Label`] = formatNumberByDigits((i*newDataSource.length)+index+1)
-            }
-          })
         }
         // 在构建 newDataSource 之后，补充编号生成逻辑
-        console.log(this.getFilledFormData())
+        if (qsbh && /^\d+$/.test(qsbh)) {
+          let currentNum = parseInt(qsbh, 10);
+          const totalRows = newDataSource.length;
+          // 遍历每一列（菌种编号列）
+          for (let colIndex = 0; colIndex < Number(jzs); colIndex++) {
+            // 遍历每一行，为当前列赋值递增编号
+            for (let rowIndex = 0; rowIndex < totalRows; rowIndex++) {
+              const row = newDataSource[rowIndex];
+              // 格式化为3位数字（如 001、002）
+              row[`czrxm_${colIndex}Label`] = currentNum.toString().padStart(3, '0');
+              currentNum++;
+            }
+          }
+        }
         // 关键修复3：一次性更新数据源，覆盖原空数据
         this.$refs.czxxTableRef.updateDataSource(newDataSource);
         justUpdateFilledFormData()
       });
     },
+    
   }
 }
 </script>

src/views/system/dept/index.vue

@@ -359,7 +359,7 @@ export default {
       getDept(row.deptId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = this.$t('page.system.dept.modifyDept')
+        this.title = readonly? this.$t('form.detail'): this.$t('page.system.dept.modifyDept')
         listDeptExcludeChild(row.deptId).then(response => {
           this.deptOptions = this.handleTree(response.data, "deptId")
           if (this.deptOptions.length == 0) {

src/views/system/role/index.vue

@@ -229,7 +229,7 @@
 
         </el-form-item>
          <el-form-item :label="$t('page.system.role.remark')+'：'">
-          <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderSelect')" :readonly="readonly"></el-input>
+          <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderSelect')" :readonly="readonly" :maxlength="200" show-word-limit></el-input>
         </el-form-item>
         <el-form-item :label="$t('page.system.role.permit')+'：'">
           <!-- <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
@@ -638,7 +638,7 @@ export default {
           })
         })
       })
-      this.title = this.$t('page.system.role.modifyRole')
+      this.title = readonly? this.$t('form.detail'): this.$t('page.system.role.modifyRole')
     },
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {
@@ -670,7 +670,6 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.$modal.loading()
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             this.operate = "update"

src/views/system/user/index.vue

@@ -167,7 +167,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="$t('page.system.user.department')+'：'" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" :placeholder="$t('form.placeholderSelect')" />
+              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" :placeholder="$t('form.placeholderSelect')" @input="handleChangeDept" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -596,6 +596,9 @@ export default {
         this.form.password = ""
       })
     },
+    handleChangeDept(){
+      this.$refs["form"].validate()
+    },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -734,6 +737,10 @@ export default {
       })
     },
     handleExportHistory(){
+      if(this.changeDialog.total<1){
+        this.$message.error(`暂无数据导出!`)
+        return
+      }
       this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色变更历史导出',jcmcEn:'Role History Export'})
       this.download('/system/business/roleChange/export', this.changeDialog.searchForm, `roleHistory_${new Date().getTime()}.xlsx`)
     },

src/views/system/user/profile/index.vue

@@ -7,9 +7,9 @@
             <span>个人信息</span>
           </div>
           <div>
-            <div class="text-center">
+            <!-- <div class="text-center">
               <userAvatar />
-            </div>
+            </div> -->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
@@ -45,9 +45,9 @@
             <span>基本资料</span>
           </div>
           <el-tabs v-model="selectedTab">
-            <el-tab-pane label="基本资料" name="userinfo">
+            <!-- <el-tab-pane label="基本资料" name="userinfo">
               <userInfo :user="user" />
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd />
             </el-tab-pane>
@@ -72,7 +72,7 @@ export default {
       user: {},
       roleGroup: {},
       postGroup: {},
-      selectedTab: "userinfo"
+      selectedTab: "resetPwd"
     }
   },
   created() {

src/views/system/user/profile/resetPwd.vue

@@ -57,6 +57,9 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功")
+            this.$store.dispatch('LogOut').then(() => {
+              location.href = '/'
+            })
           })
         }
       })