From d2aea084a5ab6cf7557bc36609b9586193662846 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 21 Apr 2026 21:51:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue            |   6 +-
 src/components/Template/HandleFormItem.vue         |  37 +++---
 src/components/Template/mixins/operationMixins.js  |   5 +-
 .../business/comps/template/comps/gsp/GSP015.vue   | 140 ++++++++++++---------
 .../comps/template/formConfig/gsp/gsp015.js        |   6 +-
 .../business/comps/template/formConfig/sp/SP007.js |   2 +-
 6 files changed, 111 insertions(+), 85 deletions(-)

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 408329b..c07ae20 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -84,7 +84,7 @@
 							<el-checkbox v-model="row._checked" @change="handleCheckChange(row, $event)"></el-checkbox>
 						</div>
 					</div>
-					<div v-for="(col, colIndex) in columns" :key="colIndex"
+					<div v-for="(col, colIndex) in columns" :key="colIndex+row.id"
 						class="custom-table-cell body-cell   no-break" :style="getCellWidth(col)">
 						<div class="inner-table-cell">
 							<div class="flex1" :class="{ 'item-center': !isBorder && col.label }">
@@ -109,7 +109,7 @@
 								</template>
 								<div v-else-if="col.bodyType === 'checkboxTree'">
 									<HandleFormItem :field-item-label="fieldItemLabel"
-										:field-key="prefixKey + '_' + col.prop + rowIndex" type="checkboxTree"
+										:field-key="prefixKey + '_' + col.prop + '_' + row.id" type="checkboxTree"
 										:item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
 										@change="(e) => onBodyValueChange(rowIndex, colIndex, e, row, col.bodyType)"
 										:error="hasError(rowIndex, colIndex, col.prop)"
@@ -195,7 +195,7 @@
 								</div>
 								<div class="flex flex1">
 									<HandleFormItem :field-item-label="fieldItemLabel"
-										:field-key="prefixKey + '_' + col.otherCode"
+										:fieldKey="prefixKey + '_' + col.otherCode + '_' + row.id"
 										@blur="onBlur(rowIndex, col.prop, $event)" :item="getOtherItem(col)"
 										v-model="row[col.otherCode]"
 										:error="hasError(rowIndex, colIndex, col.otherCode)"
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index cdd1730..8e71332 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -313,7 +313,7 @@ export default {
         } else if (this.type === 'fqyq' && !this.value) {
             initialValue = { mainRadio: '', subRadio: '', inputValue: "" };
         } else if ((this.type === 'checkboxTree') && !this.value) {
-            const defaultCheckedValue = getDefaultValueByOptions(this.item.options || []);
+            const defaultCheckedValue = getDefaultValueByOptions(this.item.options) || [];
             initialValue = { checkedValues: defaultCheckedValue, otherValues: {} };
         } else if ((this.type === 'radioTree') && !this.value) {
             initialValue = { checkedValues: "", otherValues: {} };
@@ -381,7 +381,12 @@ export default {
                     inputValue: newVal.inputValue || '',
                     subRadio: newVal.subRadio || ''
                 };
-            } else {
+            } else if(this.type === 'checkboxTree'){
+                if(!newVal){
+                    this.inputValue = { checkedValues: [], otherValues: {} };
+                }
+            }else {
+                console.log(newVal,"newVal")
                 this.inputValue = typeof newVal === 'object' ? JSON.parse(JSON.stringify(newVal)) : newVal;
             }
         }
@@ -534,7 +539,6 @@ export default {
             // 所有删除操作都需要验证电子签名
             // 保存待删除的文件信息
             this.pendingRemoveFile = { file, fileList: this.fileList };
-            console.log("fillll")
             // 触发电子签名弹窗
             EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
 
@@ -964,17 +968,18 @@ export default {
 
         // 获取checkboxTree的选中值
         getCheckboxTreeChecked(value) {
-            const { checkedValues } = this.inputValue
+            const { checkedValues = [] } = this.inputValue
             const o = checkedValues.find(item => item.label === value) || {};
             return !!o.checked;
         },
 
         // 获取或创建checkedItem
         getOrCreateCheckedItem(value) {
-            let checkedItem = this.inputValue.checkedValues.find(item => item.label === value);
+            const {checkedValues = []} = this.inputValue;
+            let checkedItem = checkedValues.find(item => item.label === value);
             if (!checkedItem) {
                 checkedItem = { label: value, checked: false };
-                this.inputValue.checkedValues.push(checkedItem);
+                checkedValues.push(checkedItem);
             }
             return checkedItem;
         },
@@ -999,7 +1004,6 @@ export default {
                     }
                 });
             }
-
             this.onCommonHandleSaveRecord();
         },
 
@@ -1126,11 +1130,11 @@ export default {
             return o[this.currentHandleType];
         },
         getCheckboxTreeInfo() {
-            const { checkedValues, otherValues } = this.inputValue;
+            const { checkedValues = [], otherValues = {} } = this.inputValue;
             const { checkedValues: oldCheckedValues, otherValues: oldOtherValues } = this.oldValue;
             const { currentHandleType, currentCheckboxTreeValue } = this;
             const newItem = checkedValues.find(item => item.label === currentCheckboxTreeValue);
-            const oldItem = oldCheckedValues.find(item => item.label === currentCheckboxTreeValue);
+            const oldItem = (oldCheckedValues || []).find(item => item.label === currentCheckboxTreeValue);
             const o = {
                 "checkboxTreeCheckbox": { oldValue: oldItem, newValue: newItem, des: "" },
                 "checkboxTreeOther": { oldValue: oldOtherValues[currentCheckboxTreeValue], newValue: otherValues[currentCheckboxTreeValue], des: `${currentCheckboxTreeValue}：`, key: this.fieldKey + "_" + currentCheckboxTreeValue },
@@ -1203,19 +1207,20 @@ export default {
                 const current = this.getFqyqInfo();
                 isSame = isEqual(current.oldValue, current.newValue);
                 if (this.currentHandleType === "inputValue") {
-                    isOldValueEmpty = this.isUnSubmitted(current.key);
+                    isOldValueEmpty = this.isUnSubmitted(this.fieldKey+current.key);
                 } else {
                     isOldValueEmpty = isValueEmpty(current.oldValue);
                 }
             } else if (this.type === "checkboxTree") {
                 const current = this.getCheckboxTreeInfo() || {};
                 const { oldValue = {}, newValue = {} } = current;
+                console.log(oldValue,newValue,"oldValue,newValue")
                 if (currentHandleType === "checkboxTreeCheckbox") {
                     isSame = isEqual(oldValue.checked, newValue.checked);
                     isOldValueEmpty = oldValue.checked === undefined;
                 } else {
                     isSame = isEqual(current.oldValue, current.newValue);
-                    isOldValueEmpty = this.isUnSubmitted(current.key);
+                    isOldValueEmpty = this.isUnSubmitted(this.fieldKey+current.key);
                 }
 
             } else if(this.type === "radioTree"){
@@ -1223,11 +1228,10 @@ export default {
                 const { oldValue = {}, newValue = {} } = current;
                 if (this.currentHandleType === "checkboxTreeCheckbox") {
                     isSame = isEqual(oldValue, newValue);
-                    console.log(oldValue,newValue,oldValue !== newValue,"newValue")
                     isOldValueEmpty = oldValue === newValue;
                 } else {
                     isSame = isEqual(current.oldValue, current.newValue);
-                    isOldValueEmpty = this.isUnSubmitted(current.key);
+                    isOldValueEmpty = this.isUnSubmitted(this.fieldKey+current.key);
                 }   
 
             } else if (this.type === "checkbox") {
@@ -1311,7 +1315,7 @@ export default {
                 recordOldVlaue = `${current.des + current.oldValue}`;
                 recordValue = `${current.des + current.newValue}`;
                 if (this.currentHandleType === "inputValue") {
-                    finallyKey = current.key;
+                    finallyKey = this.fieldKey+current.key;
                 }
                 isModify = !!this.oldFqyqValue.mainRadio
             } else if (this.type === "checkboxTree") {
@@ -1325,7 +1329,7 @@ export default {
                 } else {
                     recordOldVlaue = `${current.des + (current.oldValue || '')}`;
                     recordValue = `${current.des + (current.newValue || '')}`;
-                    finallyKey = current.key;
+                    finallyKey = this.fieldKey+current.key;
                     isModify = !!current.oldValue;
                 }
             }  else if (this.type === "radioTree") {
@@ -1338,7 +1342,7 @@ export default {
                 } else {
                     recordOldVlaue = `${current.des + (current.oldValue || '')}`;
                     recordValue = `${current.des + (current.newValue || '')}`;
-                    finallyKey = current.key;
+                    finallyKey = this.fieldKey+current.key;
                     isModify = !!current.oldValue;
                 }
             } else if (this.type === "checkbox") {
@@ -1548,6 +1552,7 @@ export default {
         //获取字段修改记录
         getModifyRecords() {
             const { fieldKey, getZdxgjl } = this;
+            
             const records = getZdxgjl().filter(item => item.key === fieldKey);
             return records;
         },
diff --git a/src/components/Template/mixins/operationMixins.js b/src/components/Template/mixins/operationMixins.js
index 1073b21..931b05d 100644
--- a/src/components/Template/mixins/operationMixins.js
+++ b/src/components/Template/mixins/operationMixins.js
@@ -24,7 +24,7 @@ export default {
                 const { fieldItemLabel, columnsData } = this.columns;
                 const { row } = this;
                 const desArr = columnsData.map((item) => {
-                    const label = this.$t(item.label), otherValue = "", subValue = "", mainValue = row[item.prop];
+                let label = this.$t(item.label), otherValue = "", subValue = "", mainValue = row[item.prop];
                     if (item.bodySubKey && (item.bodySubType !== "button")) {
                         subValue = row[item.bodySubKey];
                     }
@@ -44,7 +44,8 @@ export default {
                         "value": "",
                         "title": "修改",
                         "time": moment().format("YYYY-MM-DD HH:mm:ss"),
-                        "reason": remark
+                        "reason": remark,
+                        type:"deleteRow"
                     }
                 ]
                 this.sureDelete(record);
diff --git a/src/views/business/comps/template/comps/gsp/GSP015.vue b/src/views/business/comps/template/comps/gsp/GSP015.vue
index a82a677..f294836 100644
--- a/src/views/business/comps/template/comps/gsp/GSP015.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP015.vue
@@ -56,9 +56,9 @@
 								<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
 									:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 									:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
-									@beforeReagentSubmit="(e) => beforeReagentSubmit(e, index)"
-									@onRegentSubmit="(e) => onRegentSubmit(e, index)"
-									fieldItemLabel="取样进样信息" :formData="item">
+									@beforeReagentSubmit="(e) => beforeReagentSubmit(e, index, 'ybsm')"
+									@onRegentSubmit="(e) => onRegentSubmit(e, index, 'ybsm')" fieldItemLabel="取样进样信息"
+									:formData="item">
 									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
 											@configComplete="(e) => onConfigComplete(e, 'qy')"
@@ -122,9 +122,11 @@
 								</div>
 								<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
 									:formConfig="ecFormConfig" :formData="item" />
-								<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
+								<CustomTable :ref="`ecTableRef${index}`" :columns="ecxsColumns" prefix="ec"
 									fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
 									:showOperation="fillType === 'preFill' || fillType === 'actFill'"
+									@beforeReagentSubmit="(e) => beforeReagentSubmit(e, index, 'ecxs')"
+									@onRegentSubmit="(e) => onRegentSubmit(e, index, 'ecxs')"
 									@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
 									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
@@ -212,6 +214,10 @@ export default {
 		ecFormConfig() {
 			return getEcFormConfig(this)
 		},
+		// 二次稀释格列
+		ecxsColumns() {
+			return getJyTableColumns(this, 'ec')
+		},
 	},
 	data() {
 		return {
@@ -233,95 +239,109 @@ export default {
 	methods: {
 		beforeReagentSubmit(data, index) {
 			const { selectData, callback, key, headerSelectFields } = data;
-			const {selectInfo = {}} = selectData;
-			const {nddw} = selectInfo;
-			const {sjzjnddw} = headerSelectFields;
-			 if (
+			const { selectInfo = {} } = selectData;
+			const { nddw } = selectInfo;
+			const { sjzjnddw, qynddw } = headerSelectFields;
+			if (
 				key === 'zjbh' &&
 				!isCommonUnit(nddw, [sjzjnddw])
 			) {
 				//选择起始源溶液需要同步更新table的变更记录。
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。')
 			}
+			if (
+				key === 'qybh' &&
+				!isCommonUnit(nddw, [qynddw])
+			) {
+				//选择起始源溶液需要同步更新table的变更记录。
+				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。')
+			}
 		},
-		onRegentSubmit(e, index) {
-			const {selectInfo,headerSelectFields} = e;
-			const {nd,nddw} = selectInfo.selectInfo;
-			const {sjzjnddw} = headerSelectFields;
-			const jyTableInfo = this.$refs[`jyTableRef${index}`][0].getFilledFormData();
-			const jyHeaderSelectFields = jyTableInfo.headerSelectFields;
-			const {qynddw} = jyHeaderSelectFields;
-			const sjnd = convertConcentration.convert(nd + nddw, sjzjnddw);//转换后的取样浓度
-			const transQynd = convertConcentration.convert(nd + nddw, qynddw);//转换后的取样浓度
-			const parseSjnd = parseFloat(sjnd.toFixed(4));
-			const parseQynd = parseFloat(transQynd.toFixed(4));
-
+		onRegentSubmit(e, index, type) {
+			const { selectInfo, headerSelectFields } = e;
+			const { nd, nddw } = selectInfo.selectInfo;
+			const { sjzjnddw } = headerSelectFields;
+			if (type === 'ybsm') {
+				const jyTableInfo = this.$refs[`jyTableRef${index}`][0].getFilledFormData();
+				const jyHeaderSelectFields = jyTableInfo.headerSelectFields;
+				const { qynddw } = jyHeaderSelectFields;
+				const sjnd = convertConcentration.convert(nd + nddw, sjzjnddw);//转换后的取样浓度
+				const transQynd = convertConcentration.convert(nd + nddw, qynddw);//转换后的取样浓度
+				const parseSjnd = parseFloat(sjnd.toFixed(4));
+				const parseQynd = parseFloat(transQynd.toFixed(4));
+				this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex, { sjzjnd: parseSjnd })
+				this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex, { qynd: parseQynd })
+			}
+			if(type === "ecxs"){
+				
+				const { qynddw } = headerSelectFields;	
+				const qynd = convertConcentration.convert(nd + nddw, qynddw);//转换后的取样浓度
+				this.$refs[`ecTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex, { qynd: parseFloat(qynd.toFixed(4)) })
+			}
 
-			this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex,{sjzjnd:parseSjnd})
-			this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex,{qynd:parseQynd})
 		},
-		async handleUpdateCode(){
-			const {ecDataList = [],ybsmDataList= []} = this.formData;
+		async handleUpdateCode() {
+			const { ecDataList = [], ybsmDataList = [] } = this.formData;
 			const codes = [];
 			let flag = false;
-			ybsmDataList.map((item,index) => {
-				const {stepTableFormData = [],jyStepTableFormData = []} = item;
-				stepTableFormData.map((step,sIndex) => {
-					if(step.qybhCode){
+			ybsmDataList.map((item, index) => {
+				const { stepTableFormData = [], jyStepTableFormData = [] } = item;
+				stepTableFormData.map((step, sIndex) => {
+					if (step.qybhCode) {
 						flag = true;
 					}
-					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybh:step.qybh})
-					codes.push({ pre: step.qybh, type: 1 ,id:`stepTableFormData_${step.qybh}_${index}_${sIndex}`,});
-	
+					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex, { qybh: step.qybh })
+					codes.push({ pre: step.qybh, type: 1, id: `stepTableFormData_${step.qybh}_${index}_${sIndex}`, });
+
 				});
-				jyStepTableFormData.map((step,sIndex) => {
-					if(step.jybhCode){
+				jyStepTableFormData.map((step, sIndex) => {
+					if (step.jybhCode) {
 						flag = true;
 					}
-					codes.push({ pre: step.jybh, type: 1 ,id:`jyStepTableFormData_${step.jybh}_${index}_${sIndex}`,});
+					codes.push({ pre: step.jybh, type: 1, id: `jyStepTableFormData_${step.jybh}_${index}_${sIndex}`, });
 				});
-				
+
 			});
-			ecDataList.map((item,index) => {
-				const {stepTableFormData} = item;
-				stepTableFormData.map((step,sIndex) => {
-					if(step.jybhCode){
+			ecDataList.map((item, index) => {
+				const { stepTableFormData } = item;
+				stepTableFormData.map((step, sIndex) => {
+					if (step.jybhCode) {
 						flag = true;
 					}
-					codes.push({ pre: step.jybh, type: 1 ,id:`ecStepTableFormData_${step.jybh}_${index}_${sIndex}`,});	
+					codes.push({ pre: step.jybh, type: 1, id: `ecStepTableFormData_${step.jybh}_${index}_${sIndex}`, });
 				});
 			});
-			if(flag){
+			if (flag) {
 				return;
 			}
-			
+
 			const result = await this.getLatestSnArr(codes)
-			codes.map((item,index)=>{
+			codes.map((item, index) => {
 				item.sn = result[index]
 			})
-			ybsmDataList.map((item,index)=>{
-				const {stepTableFormData = [],jyStepTableFormData = []} = item;
-				stepTableFormData.map((step,sIndex) => {
+			ybsmDataList.map((item, index) => {
+				const { stepTableFormData = [], jyStepTableFormData = [] } = item;
+				stepTableFormData.map((step, sIndex) => {
 					const id = `stepTableFormData_${step.qybh}_${index}_${sIndex}`;
-					const o = codes.find((item) => item.id === id) ||{};
-					this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybhCode:o.sn})
+					const o = codes.find((item) => item.id === id) || {};
+					this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(sIndex, { qybhCode: o.sn })
 				});
-				jyStepTableFormData.map((step,sIndex) => {
+				jyStepTableFormData.map((step, sIndex) => {
 					const id = `jyStepTableFormData_${step.jybh}_${index}_${sIndex}`;
-					const o = codes.find((item) => item.id === id) ||{};
-					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+					const o = codes.find((item) => item.id === id) || {};
+					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex, { jybhCode: o.sn })
 				});
 			})
-			ecDataList.map((item,index) => {
-				const {stepTableFormData} = item;
-				stepTableFormData.map((step,sIndex) => {
+			ecDataList.map((item, index) => {
+				const { stepTableFormData } = item;
+				stepTableFormData.map((step, sIndex) => {
 					const id = `ecStepTableFormData_${step.jybh}_${index}_${sIndex}`;
-					const o = codes.find((item) => item.id === id) ||{};
-					this.$refs[`ecTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+					const o = codes.find((item) => item.id === id) || {};
+					this.$refs[`ecTableRef${index}`][0].updateDataSourceByRowIndex(sIndex, { jybhCode: o.sn })
 				});
 			})
 			this.justUpdateFilledFormData();
-		
+
 		},
 		//获取文件blog
 		async handleBeforeDownload({ html2pdf, options, pdfContent }) {
@@ -344,7 +364,7 @@ export default {
 		},
 		//上传到服务器
 		async uploadPdfToServer(blob) {
-			let that=this
+			let that = this
 			const formData = new FormData();
 			formData.append('file', blob, 'hxhq-export-form.pdf');
 			try {
@@ -368,7 +388,7 @@ export default {
 					studyFormFill_exportTbByFileUrl(
 						{
 							url: data.data.url,
-							studyFormFillId:that.formData.id,
+							studyFormFillId: that.formData.id,
 							version: that.appTitle,
 							lang: that.$store.getters.language.split("_")[0]
 						}
@@ -529,7 +549,7 @@ export default {
 		deleteConfig(item, type = "ybsmDataList") {
 			if (this.formData[type].length > 1) {
 				const configIndex = this.formData[type].findIndex(config => config.id === item.id);
-				console.log(configIndex,item,"configIndex")
+				console.log(configIndex, item, "configIndex")
 				if (configIndex > -1) {
 					const newList = [...this.formData[type]]
 					newList.splice(configIndex, 1);
diff --git a/src/views/business/comps/template/formConfig/gsp/gsp015.js b/src/views/business/comps/template/formConfig/gsp/gsp015.js
index 2ea9c4a..65725ab 100644
--- a/src/views/business/comps/template/formConfig/gsp/gsp015.js
+++ b/src/views/business/comps/template/formConfig/gsp/gsp015.js
@@ -212,7 +212,7 @@ export const getQyTableColumns = ($this) => {
 }
 
 //进样table
-export const getJyTableColumns = ($this) => {
+export const getJyTableColumns = ($this,type) => {
     return [
         {
             label: '进样编号',
@@ -227,8 +227,8 @@ export const getJyTableColumns = ($this) => {
             label: '取样编号',
             prop: 'qybh',
             width: 200,
-            bodyType: 'input',
-            bodyDisabled: true,
+            bodyType: type==="ec"?'mix':'input',
+            bodyDisabled: type!="ec",
             bodyFillType: 'actFill',
         },
         {
diff --git a/src/views/business/comps/template/formConfig/sp/SP007.js b/src/views/business/comps/template/formConfig/sp/SP007.js
index 4049623..9a0ee32 100644
--- a/src/views/business/comps/template/formConfig/sp/SP007.js
+++ b/src/views/business/comps/template/formConfig/sp/SP007.js
@@ -110,7 +110,7 @@ export const getYbFormConfig = () => {
     {
       type: 'cellItem',
       config: {
-        remark: {
+        ybsm: {
           label: '',
           type: 'textarea',
           fillType: 'actFill',