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

src/components/Template/CustomTable.vue

@@ -92,7 +92,7 @@
 									{{ $t(col.label) }}
 								</div>
 								<template
-									v-if="col.bodyType === 'input' || col.bodyType === 'inputNumber' || col.bodyType === 'select' || col.bodyType === 'dateTimeRange' || col.bodyType === 'radio'">
+									v-if="col.bodyType === 'input' || col.bodyType === 'inputNumber' || col.bodyType === 'select' || col.bodyType === 'dateTimeRange' || col.bodyType === 'dateTime' || col.bodyType === 'radio'">
 									<div class="flex flex1">
 										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 											:fieldItemLabel="fieldItemLabel" :type="col.bodyType"
@@ -510,7 +510,7 @@ export default {
 		getOperationColumns() {
 			return { columnsData: this.columns, headerSelectFields: this.headerSelectFields, fieldItemLabel: this.fieldItemLabel }
 		},
-		//获取其他下拉框的配制
+		//获取其他下拉框的配置
 		getOtherItem(sItem) {
 			return {
 				label: sItem.otherLabel ? this.$t(sItem.otherLabel) : this.$t("template.common.other"),
@@ -892,6 +892,9 @@ export default {
 			if (type === "select") {
 				this.$emit('bodySelectChange', { rowIndex, item: row, colIndex, value, key: col.prop, dataSource: this.localDataSource, headerSelectFields: this.headerSelectFields });
 			}
+			if (type === "checkboxTree") {
+				this.$emit('bodyTreeChange', { rowIndex, colIndex, value, row, type });
+			}
 		},
 		// 表体子值变化
 		onBodySubValueChange(rowIndex, colIndex, value, row, type) {
@@ -959,7 +962,7 @@ export default {
 				// 优先从行数据中获取动态label（如jzbh1Label）
 				item.checkboxLabel = currentItem[dynamicLabelKey];
 			} else if (col.checkboxLabel !== undefined && col.checkboxLabel !== '') {
-				// 否则使用列配制的checkboxLabel
+				// 否则使用列配置的checkboxLabel
 				item.checkboxLabel = this.$t(col.checkboxLabel);
 			}
 			if (col.bodyType === "operableInput") {
@@ -1174,7 +1177,7 @@ export default {
 		onBlur(rowIndex, colKey) {
 			const value = this.localDataSource[rowIndex][colKey];
 
-			// 查找对应的列配制
+			// 查找对应的列配置
 			const col = this.columns.find(c => c.prop === colKey);
 			if (col && col.bodyFillType === "actFill" && col.compareTo) {
 				const compareToValue = this.localDataSource[rowIndex][col.compareTo];
@@ -1191,7 +1194,7 @@ export default {
 			this.$emit("blur", { rowIndex, colKey, value, dataSource: this.localDataSource, headerSelectFields: this.headerSelectFields, item: this.localDataSource[rowIndex] });
 		},
 		onSubBlur(rowIndex, colKey, value) {
-			// 查找对应的列配制
+			// 查找对应的列配置
 			const col = this.columns.find(c => c.bodySubKey === colKey);
 			if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
 				const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];

src/views/business/comps/template/comps/bl/BL001.vue

@@ -40,6 +40,7 @@
             </CustomTable>    
 
             <CustomTable
+              @bodyTreeChange="changeTree"
               fieldItemLabel="template.dj.dj003.ypyjxx"
               :columns="ypyjColumns"
               :ref="'ypyjTableRef'"
@@ -121,7 +122,7 @@ export default {
     }
   },
   computed: {
-    // 备注表单配制
+    // 备注表单配置
     remarkConig() {
       return [
         {
@@ -140,7 +141,7 @@ export default {
         }
       ]
     },
-    // 试验基本信息表单配制
+    // 试验基本信息表单配置
     baseInfoFormConfig() {
       return [
         {
@@ -276,6 +277,7 @@ export default {
           prop: "yps",
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
+          bodyDisabled: true,
           width: 180,
         },
       ]
@@ -294,6 +296,8 @@ export default {
               maxlength: 200,
               subType: 'button',
               subKey: 'yjsjButton',
+              disabled:true,
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dj.dj003.hqsj',
             },
             dsfs: {
@@ -359,7 +363,15 @@ export default {
     },
     //获取表格数据并赋值
     getTabletoCheck() {
-      let { stepTableFormData_1 = [] } = this.getFilledFormData()
+      let { stepTableFormData_1 = [] , stepTableFormData = [] } = this.getFilledFormData()
+      // stepTableFormData?.map((item,index)=>{
+      //   if(!item?.ypmcTa){
+      //     this.$refs.ypyjTableRef.updateDataSourceByRowIndex(index, {yps:0})
+      //   }else{
+      //     let checkTree = item?.ypmcTa?.checkedValues?.filter(i=>i.checked)
+      //     this.$refs.ypyjTableRef.updateDataSourceByRowIndex(index, {yps:checkTree.length})
+      //   }
+      // })
       const firstList = stepTableFormData_1
         .filter(item => item && item.ypmc && item.ypmc.trim()) // 严格过滤空值
         .map(item => ({ 
@@ -375,6 +387,12 @@ export default {
         this.ypmcTaOptions = firstList;
       })
     },
+    //样品名称选择
+    changeTree(data){
+      let { rowIndex , value , row } = data
+      let checkTree = value?.checkedValues?.filter(i=>i.checked)
+      this.$refs.ypyjTableRef.updateDataSourceByRowIndex(rowIndex, {yps:checkTree?.length})
+    },
   }
 }
 </script>

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

@@ -15,11 +15,17 @@
 							:formConfig="operateConfig" :formData="formData" />
 						<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>
-							<CustomTable :columns="operateColumns" ref="operateTableRef"
-								:showOperation="fillType === 'preFill'" :showAddRow="fillType === 'preFill'"
-								:formData="formData" :isBorder="false" :prefixKey="`operateTable`">
+						<div class="template-form-item" v-if="fillType === 'preFill'">
+							<span>{{ $t('template.dj.dj001.fhfw')  }}</span>
+							<CustomTable
+								:columns="operateColumns"
+								ref="operateTableRef"
+								:showOperation="fillType === 'preFill'"
+								:showAddRow="fillType === 'preFill'"
+								:formData="formData"
+								:isBorder="false"
+								:prefixKey="`operateTable`"
+							>
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 									<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
 										@deleteRow="() => deleteTableRow(rowIndex, 'operateTableRef')">
@@ -27,7 +33,7 @@
 								</template>
 							</CustomTable>
 						</div>
-						<div class="template-form-item">
+						<div class="template-form-item" v-ifan class="s">="fillType === 'preFill'">
 							<span>{{ $t('template.dj.dj001.fhlr') }}</span>
 							<CustomTable :columns="fhlrColumns" ref="fhlrTableRef"
 								:showOperation="fillType === 'preFill'" :showAddRow="fillType === 'preFill'"

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

@@ -43,6 +43,7 @@
               fieldItemLabel="template.dj.dj003.ypyjxx"
               :columns="ypyjColumns"
               :ref="'ypyjTableRef'"
+              @clickButton="handleClickButton"
               :showOperation="fillType === 'actFill'"
               :showAddRow="fillType === 'actFill'"
               :formData="formData"
@@ -242,8 +243,13 @@ export default {
         {
           label: 'template.dj.dj003.cysj',
           prop: "cysj",
-          bodyType: 'dateTimeRange',
-          width: 450,
+          bodyType: 'input',
+          bodySubType: 'button',
+					bodySubButtonName: 'template.dl.dl018.ksButton',
+					bodySubKey: 'cysjButton',
+					bodySubyDisabled: this.fillType !== 'actFill',
+          bodyDisabled: true,
+          bodySubFillType: 'actFill',
           bodyFillType: 'actFill'
         },
         {
@@ -278,6 +284,8 @@ export default {
               maxlength: 200,
               subType: 'button',
               subKey: 'yjsjButton',
+              disabled:true,
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dj.dj003.hqsj',
             },
             dsfs: {
@@ -334,11 +342,15 @@ export default {
     },
     // 点击按钮
     handleClickButton(_item, signData) {
-      this.$refs.yjczxxRef.updateFormData(
-        _item?.subKey?.replace("Button", ""),
-        moment().format('YYYY/MM/DD HH:mm'),
-        { isUpdateRecord: true, signData }
-      )
+      if(_item === 'cysjButton'){
+        this.$refs.ypyjTableRef.updateDataSourceByRowIndex(signData, {cysj:moment().format('YYYY/MM/DD HH:mm')})
+      }else{
+        this.$refs.yjczxxRef.updateFormData(
+          _item?.subKey?.replace("Button", ""),
+          moment().format('YYYY/MM/DD HH:mm'),
+          { isUpdateRecord: true, signData }
+        )
+      }
     },
     //获取表格数据并赋值
     getTabletoCheck() {

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

@@ -21,6 +21,7 @@
             fieldItemLabel="template.dj.dj003.ypyjxx"
             :columns="ypyjColumns"
             :ref="'ypyjTableRef'"
+            @clickButton="handleClickButton"
             :showOperation="fillType === 'actFill'"
             :showAddRow="fillType === 'actFill'"
             :formData="formData"
@@ -198,8 +199,13 @@ export default {
         {
           label: 'template.dj.dj003.cysj',
           prop: "cysj",
-          bodyType: 'dateTimeRange',
-          width: 450,
+          bodyType: 'input',
+          bodySubType: 'button',
+					bodySubButtonName: 'template.dl.dl018.ksButton',
+					bodySubKey: 'cysjButton',
+					bodySubyDisabled: this.fillType !== 'actFill',
+          bodyDisabled: true,
+          bodySubFillType: 'actFill',
           bodyFillType: 'actFill'
         },
         {
@@ -234,6 +240,8 @@ export default {
               maxlength: 200,
               subType: 'button',
               subKey: 'yjsjButton',
+              disabled:true,
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dj.dj003.hqsj',
             },
             dsfs: {
@@ -286,12 +294,15 @@ export default {
     },
     // 点击按钮
     handleClickButton(_item, signData) {
-      this.$refs.yjczxxRef.updateFormData(
-        _item?.subKey?.replace("Button", ""),
-        moment().format('YYYY/MM/DD HH:mm'),
-        { isUpdateRecord: true, signData }
-      )
-     
+      if(_item === 'cysjButton'){
+        this.$refs.ypyjTableRef.updateDataSourceByRowIndex(signData, {cysj:moment().format('YYYY/MM/DD HH:mm')})
+      }else{
+        this.$refs.yjczxxRef.updateFormData(
+          _item?.subKey?.replace("Button", ""),
+          moment().format('YYYY/MM/DD HH:mm'),
+          { isUpdateRecord: true, signData }
+        )
+      }
     },
   }
 }

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

@@ -225,6 +225,7 @@ export default {
               maxlength: 200,
               subType: 'button',
               subKey: 'jzkssjButton',
+              disabled: true,
               subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dl.dl003.ksButton',
             },
@@ -234,7 +235,9 @@ export default {
               fillType: 'actFill',
               maxlength: 200,
               subType: 'button',
+              disabled: true,
               subKey: 'jzjssjButton',
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dl.dl003.jsButton',
             },
             fssygbh: {
@@ -273,6 +276,7 @@ export default {
               type: 'input',
               subType: 'button',
               subKey: 'pykssjButton',
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dl.dl003.ksButton',
             },
 

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

@@ -196,6 +196,8 @@ export default {
               fillType: 'actFill',
               maxlength: 200,
               subType: 'button',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               subKey: 'pykssjButton',
               buttonName: 'template.dl.dl003.ksButton',
             },
@@ -205,6 +207,8 @@ export default {
               fillType: 'actFill',
               maxlength: 200,
               subType: 'button',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               subKey: 'pyjssjButton',
               buttonName: 'template.dl.dl003.jsButton',
             },