diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 97cd932..408329b 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -539,7 +539,7 @@ export default {
 			if (this.templateFillType !== 'actFill') {
 				return
 			}
-			this.$emit("beforeReagentSubmit", { selectData: data, callback, key: col.prop, rowData: row })
+			this.$emit("beforeReagentSubmit", { selectData: data, callback, key: col.prop, rowData: row,headerSelectFields: this.headerSelectFields })
 		},
 		onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex) {
 			this.headerFields[`${colIndex}_${headerIndex}`] = inputValue;
@@ -563,7 +563,7 @@ export default {
 			// 	return
 			// }
 			this.updateDataSourceByRowIndex(rowIndex, { [key]: inputValue, [`selectInfo_${key}`]: data.selectInfo })
-			this.$emit("onRegentSubmit", { selectInfo: data, key, col, rowIndex, colIndex, rowData: row })
+			this.$emit("onRegentSubmit", { selectInfo: data, key, col, rowIndex, colIndex, rowData: row,headerSelectFields: this.headerSelectFields })
 		},
 		isShowAddRos() {
 			if (this.showAddRow !== undefined) {
diff --git a/src/views/business/comps/template/comps/gsp/GSP015.vue b/src/views/business/comps/template/comps/gsp/GSP015.vue
index a8cbb13..a82a677 100644
--- a/src/views/business/comps/template/comps/gsp/GSP015.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP015.vue
@@ -56,6 +56,8 @@
 								<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">
 									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
@@ -229,11 +231,97 @@ export default {
 		}
 	},
 	methods: {
-		handleUpdateCode(){
-			const refs = ["jyTableRef"]
-			const {ecDataList = [],ybsmDataList= []} = this.fromData;
+		beforeReagentSubmit(data, index) {
+			const { selectData, callback, key, headerSelectFields } = data;
+			const {selectInfo = {}} = selectData;
+			const {nddw} = selectInfo;
+			const {sjzjnddw} = headerSelectFields;
+			 if (
+				key === 'zjbh' &&
+				!isCommonUnit(nddw, [sjzjnddw])
+			) {
+				//选择起始源溶液需要同步更新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));
+
+
+			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;
+			const codes = [];
+			let flag = false;
+			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}`,});
+	
+				});
+				jyStepTableFormData.map((step,sIndex) => {
+					if(step.jybhCode){
+						flag = true;
+					}
+					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){
+						flag = true;
+					}
+					codes.push({ pre: step.jybh, type: 1 ,id:`ecStepTableFormData_${step.jybh}_${index}_${sIndex}`,});	
+				});
+			});
+			if(flag){
+				return;
+			}
 			
-			console.log(this.formData,"fff")
+			const result = await this.getLatestSnArr(codes)
+			codes.map((item,index)=>{
+				item.sn = result[index]
+			})
+			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})
+				});
+				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})
+				});
+			})
+			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})
+				});
+			})
+			this.justUpdateFilledFormData();
+		
 		},
 		//获取文件blog
 		async handleBeforeDownload({ html2pdf, options, pdfContent }) {
diff --git a/src/views/business/comps/template/formConfig/gsp/gsp015.js b/src/views/business/comps/template/formConfig/gsp/gsp015.js
index 0925fac..2ea9c4a 100644
--- a/src/views/business/comps/template/formConfig/gsp/gsp015.js
+++ b/src/views/business/comps/template/formConfig/gsp/gsp015.js
@@ -88,10 +88,14 @@ export const getYbsmFormConfig = ($this) => {
                     disabled: true,
                     subType:"button",
                     subKey: "startButton",
+                    subFillType: 'actFill',
+                    subDisabled: false,
                     buttonName:"开始",
                     thirdType: 'button',
                     showSub:$this.fillType === 'actFill',
                     showThird:$this.fillType === 'actFill',
+                    thirdDisabled: false,
+                    thirdFillType: 'actFill',
                     thirdKey: 'endButton',
                     thirdButtonName:"结束",
                 },
@@ -118,15 +122,19 @@ export const getQyTableColumns = ($this) => {
             width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
-            subBodyType:"span",
-            subBodyKey: "qybhCode",
+            bodySubType:"span",
+            bodySubKey: "qybhCode",
         },
         {
             label: '制剂编号',
             prop: 'zjbh',
             width: 200,
-            bodyType: 'gsp',
-            bodyFillType: 'actFill',
+            bodyType: 'input',
+            bodyFillType: 'preFill',
+            bodySubType: 'mix',
+            bodySubKey: "zjbhCode",
+            bodySubFillType: 'actFill',
+
         },
         {
             label: '预设制剂浓度',
@@ -142,6 +150,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际制剂浓度',
             prop: 'sjzjnd',
+            bodyDisabled: true,
             width: 200,
             headerSelectKey: 'sjzjnddw',
             fillType: "preFill",
@@ -164,10 +173,10 @@ export const getQyTableColumns = ($this) => {
             width: 180,
             bodyType: 'select',
             bodyOptions: $this.getDictOptions('business_qywz'),
-            bodyFillType: 'actFill',
+            bodyFillType: 'preFill',
         },
         {
-            label: '预设取样位置',
+            label: '实际取样位置',
             prop: 'sjqywz',
             width: 180,
             bodyType: 'select',
@@ -211,20 +220,22 @@ export const getJyTableColumns = ($this) => {
             width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
-            subBodyType:"span",
-            subBodyKey: "jybhCode",
+            bodySubType:"span",
+            bodySubKey: "jybhCode",
         },
         {
             label: '取样编号',
             prop: 'qybh',
             width: 200,
-            bodyType: 'gsp',
+            bodyType: 'input',
+            bodyDisabled: true,
             bodyFillType: 'actFill',
         },
         {
             label: '取样浓度',
             prop: 'qynd',
             width: 200,
+            bodyDisabled: true,
             headerSelectKey: 'qynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -235,6 +246,7 @@ export const getJyTableColumns = ($this) => {
             label: '取样体积',
             prop: 'qytj',
             width: 200,
+            bodyDisabled: true,
             headerSelectKey: 'qytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),