feat:[模板管理][update]

src/components/Template/CustomTable.vue

@@ -713,27 +713,56 @@ export default {
 			this.$emit('row-delete', rowIndex);
 		},
 		// 更新数据方法，可在formData变更时调用，也可由父组件调用
-		updateDataSource(dataSource = [],autoUpdateRecord = true) {
+		updateDataSource(dataSource = []) {
 			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
-			if(autoUpdateRecord){
-				this.showEditSignDialog();
-			}
-			console.log(this.oldLocalDataSource, "oldLocalDataSource")
 			// 深拷贝数据以避免直接修改原始数据
 			this.localDataSource = JSON.parse(JSON.stringify(dataSource || []));
 		},
 		// 根据行索引更新数据 autoUpdateRecord 是否自动更新记录
 		updateDataSourceByRowIndex(rowIndex, data,autoUpdateRecord = true) {
 			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
-			if(autoUpdateRecord){
-				this.showEditSignDialog();
-			}
+			if(autoUpdateRecord){//如果formpackage联动table的情况，不需要自动更新，不然会出现多个弹窗的问题。
+                this.showEditSignDialog(rowIndex,data);
+            }
 			this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data };
 			this.localDataSource = [...this.localDataSource];
 		},
-		showEditSignDialog: _.debounce(()=>{
+		showEditSignDialog: _.debounce(function(rowIndex,data){
+			const oldData = this.oldLocalDataSource[rowIndex];
+			let isFirst = false;//是否是第一次添加,是否和旧数据相同
+			const isSame = this.compareOldAndCurrentFormFields(data,oldData);
+			// 遍历data对象，和oldData比较，判断data的key值在对应oldData里面是否有值
+			for(const key in data) {
+				if(!oldData[key]&&oldData[key]!=0){
+					isFirst = true;
+					break;
+				}
+			}
+			if(!isFirst &&!isSame && this.templateFillType === "actFill"){
+				console.log("showww")
+				setTimeout(() => {
+					EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
+				}, 100);
+			}else{
+				this.updateRecord(rowIndex,data);
+			}
+
 			
 		}, 100),
+		 // 比较newData和oldData的值是否相等，只要有一对不相等就返回false
+        compareOldAndCurrentFormFields(newData,oldData) {
+            for (const key in newData) {
+				const oldValue = newData[key];
+				const currentValue = oldData[key];
+				if (JSON.stringify(oldValue) !== JSON.stringify(currentValue)) {
+					return false;
+				} else {
+				return false;
+				}
+            }
+
+            return true;
+        },
 		onAddRow() {
 			this.addRow({
 				actSolutionVolumePrecision: 3,//小数点精度默认为3

src/components/Template/StepComponents/ry/bdtj.vue

@@ -1,6 +1,6 @@
 <!-- 标定(体积) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_bdtj" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/bdzl.vue

@@ -1,6 +1,6 @@
 <!-- 标定(质量) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_bdzl" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/clcz.vue

@@ -1,6 +1,6 @@
 <!-- 称量（非传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_clcz" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/clfcz.vue

@@ -1,6 +1,6 @@
 <!-- 称量（传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_clfcz" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/cs.vue

@@ -1,6 +1,6 @@
 <!-- 超声 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_cs" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/czdd.vue

@@ -1,6 +1,6 @@
 <!-- 操作地点 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_czdd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/czhj.vue

@@ -1,6 +1,6 @@
 <!-- 操作环境 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_czhj" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/dc.vue

@@ -1,6 +1,6 @@
 <!-- 氮吹 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_dc" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/ddhy.vue

@@ -1,6 +1,6 @@
 <!-- 颠倒混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_ddhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fb.vue

@@ -1,6 +1,6 @@
 <!-- 封板 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_fb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fr.vue

@@ -1,6 +1,6 @@
 <!-- 复溶 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_fr" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/frdrq.vue

@@ -1,6 +1,6 @@
 <!-- 复溶(多容器) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_frdrq" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fs.vue

@@ -1,6 +1,6 @@
 <!-- 复苏 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_fs" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/fy.vue

@@ -1,6 +1,6 @@
 <!-- 孵育 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_fy" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/glsd.vue

@@ -1,6 +1,6 @@
 <!-- 过滤(手动)  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_glsd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/glzd.vue

@@ -1,6 +1,6 @@
 <!-- 过滤(自动) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_glzd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/hb.vue

@@ -1,6 +1,6 @@
 <!-- 合并 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_hb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/hwhy.vue

@@ -1,6 +1,6 @@
 <!-- 恒温混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_hwhy" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jb.vue

@@ -1,6 +1,6 @@
 <!-- 搅拌 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jb" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jd.vue

@@ -1,6 +1,6 @@
 <!-- 解冻  -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jd" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jrjb.vue

@@ -1,6 +1,6 @@
 <!-- 加热搅拌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_jrjb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/jrry.vue

@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jrry" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/js.vue

@@ -1,6 +1,6 @@
 <!-- 计数 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_js" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/jz.vue

@@ -1,6 +1,6 @@
 <!-- 静置  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_jz" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/lx.vue

@@ -1,6 +1,6 @@
 <!-- 离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_lx" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/mj.vue

@@ -1,6 +1,6 @@
 <!-- 灭菌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_mj" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/qcyy.vue

@@ -1,6 +1,6 @@
 <!-- 取出原药 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_qcyy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/qywz.vue

@@ -1,6 +1,6 @@
 <!-- 取用物质 -->
 <template>
-    <StepFormPackage @onDialogSubmit="onDialogSubmit" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage @onDialogSubmit="onDialogSubmit" prefixKey="ry_qywz" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/rs.vue

@@ -1,6 +1,6 @@
 <!-- 染色 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_rs" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/sy.vue

@@ -1,6 +1,6 @@
 <!-- 水浴 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_sy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tjphcz.vue

@@ -1,6 +1,6 @@
 <!-- 调节PH(传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_tjphcz" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tjphfcz.vue

@@ -1,6 +1,6 @@
 <!-- 调节PH(非传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_tjphfcz" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tpjydd.vue

@@ -1,7 +1,7 @@
 <!-- 天平校验(单点) -->
 <template>
     <StepFormPackage 
-        ref = "stepFormPackageRef" @resetRecord = "resetRecord" 
+        ref = "stepFormPackageRef" prefixKey="ry_tpjydd" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
 </template>

src/components/Template/StepComponents/ry/tpjysd.vue

@@ -1,7 +1,7 @@
 <!-- 天平校验(双点) -->
 <template>
     <StepFormPackage 
-        ref = "stepFormPackageRef" @resetRecord = "resetRecord" 
+        ref = "stepFormPackageRef" prefixKey="ry_tpjysd" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
 </template>

src/components/Template/StepComponents/ry/wxhy.vue

@@ -1,6 +1,6 @@
 <!-- 涡旋混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_wxhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/xzrq.vue

@@ -1,6 +1,6 @@
 <!-- 选择容器 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_xzrq" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/ym.vue

@@ -1,6 +1,6 @@
 <!-- 研磨 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_ym" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/zy.vue

@@ -1,6 +1,6 @@
 <!-- 正压 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_zy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/zyhy.vue

@@ -1,6 +1,6 @@
 <!-- 振摇混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_zyhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/mixins/formPackageMixins.js

@@ -120,7 +120,7 @@ export default {
             
         },
         //更新表单数据
-        updateFormData(key, value) {
+        updateFormData(key, value,autoUpdateRecord = true) {
             // 深拷贝当前表单数据，避免直接修改原数据
             const cloneFormFields = JSON.parse(JSON.stringify(this.formFields));
             

src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue

@@ -543,13 +543,15 @@ export default {
 					newStepTableData[i].startSolutionCode = newStepTableData[i - 1].targetSolutionCode;
 				}
 				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
-				item.actSolutionVolume = actVol;
-				item.actSolutionConcentration = actNd;
-				item.actSolutionExpire = row.sxr;
+				var o = {
+					actSolutionVolume: actVol,
+					actSolutionConcentration: actNd,
+					actSolutionExpire: row.sxr,
+				}
+				this.$refs.stepTableRef.updateDataSourceByRowIndex(i, o);
 			}
 
 			// 更新stepTableRef组件的数据
-			this.$refs.stepTableRef.updateDataSource(newStepTableData);
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);

src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue

@@ -489,10 +489,13 @@ export default {
 				console.log(actNd, "actNd")
 				item.actSolutionVolume = actVol;
 				item.actSolutionConcentration = actNd;
+				const o = {
+					actSolutionVolume: actVol,
+					actSolutionConcentration: actNd,
+				}
+				// 更新stepTableRef组件的数据
+				this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].updateDataSourceByRowIndex(index, o);
 			})
-			// 更新stepTableRef组件的数据
-			this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].updateDataSource(newData);
-			// this.updateRecord();
 		},
 		//只做校验
 		async validFields() {