feat:[模板管理][update]

src/components/Template/BaseInfoFormPackage.vue

@@ -107,9 +107,11 @@
                                 <span v-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText) }}</span>
                                 <HandleFormItem class="ml-10" v-else-if="sItem.subType === 'button'" type="button"
                                     :item="getButtonItem(sItem)" :value="formFields[sItem.subKey]"
+                                    :field-key="prefixKey + '_' + sItem.subKey"
                                     @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.subKey)" />
                                 <HandleFormItem class="ml-10" v-else-if="sItem.thirdType === 'button'" type="button"
                                     :item="getThirdButtonItem(sItem)" :value="formFields[sItem.thirdKey]"
+                                    :field-key="prefixKey + '_' + sItem.thirdKey"
                                     @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.thirdKey)" />
 
                             </div>
@@ -255,6 +257,7 @@
                                 <div v-else-if="sItem.subType === 'button'">
                                     <HandleFormItem class="ml-10" type="button" :item="getButtonItem(sItem)"
                                         :value="formFields[sItem.subKey]"
+                                        :field-key="prefixKey + '_' + sItem.subKey"
                                         @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.subKey)" />
                                 </div>
 
@@ -276,6 +279,7 @@
                             <div v-if="isShowSub(sItem,'thirdType')">
                                 <HandleFormItem class="ml-10" v-if="sItem.thirdType === 'button'" type="button"
                                     :item="getThirdButtonItem(sItem)" :value="formFields[sItem.thirdKey]"
+                                    :field-key="prefixKey + '_' + sItem.thirdKey"
                                     @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.thirdKey)" />
                             </div>
                             <div v-show="isShowOther(formFields[sItem.subKey])" class="flex flex1 ml-10">
@@ -324,6 +328,7 @@
                                 :orange-bg="orangeBgFields[sItem.thirdKey]" />
                             <HandleFormItem class="ml-10" v-if="sItem.fourthType === 'button'" type="button"
                                 :item="getFourthButtonItem(sItem)" :value="formFields[sItem.fourthKey]"
+                                :field-key="prefixKey + '_' + sItem.fourthKey"
                                 @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.fourthKey)" />
 
                         </div>

src/components/Template/CustomTable.vue

@@ -98,6 +98,7 @@
 											@blur="onBlur(rowIndex, col.prop, $event)" @copy="onCopy(rowIndex, col)"
 											class="body-input" :item="getBodyItem(col, rowIndex)"
 											v-model="row[col.prop]"
+											:ref = "col.prop+rowIndex"
 											@change="onBodyValueChange(rowIndex, colIndex, $event, row, col.bodyType)"
 											:error="hasError(rowIndex, colIndex, col.prop)"
 											@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
@@ -208,6 +209,7 @@
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType"
 										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
 										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
+										
 										v-model="row[col.bodySubKey]"
 										@change="onBodySubValueChange(rowIndex, colIndex, $event, row, col.bodySubType)"
 										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
@@ -222,7 +224,7 @@
 								<template v-else-if="col.bodySubType === 'button'">
 									<HandleFormItem class="ml-10" type="button" :item="getBodyButtonItem(col, rowIndex)"
 										:value="row[col.bodySubKey]"
-										@clickButton="(e, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
+										@clickButton="(e,val, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
 								</template>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodySubType')">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
@@ -238,7 +240,7 @@
 								<template v-if="col.bodyThirdType === 'button'">
 									<HandleFormItem class="ml-10" type="button" :item="getBodyThirdButtonItem(col, rowIndex)"
 										:value="row[col.bodyThirdKey]"
-										@clickButton="(e, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
+										@clickButton="(e,val, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
 								</template>
 							</div>
 						</div>
@@ -523,7 +525,6 @@ export default {
 		},
 		// 点击事件
 		handleClickable(col, rowIndex, colIndex, row) {
-			console.log("clickable", rowIndex, colIndex, col, row)
 			if (this.templateFillType !== 'actFill') {
 				return
 			}
@@ -537,7 +538,6 @@ export default {
 		},
 		onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex) {
 			this.headerFields[`${colIndex}_${headerIndex}`] = inputValue;
-			console.log("onHeaderRegentSubmit", data, inputValue, colIndex, headerIndex, this.headerFields)
 
 			this.$emit("onHeaderRegentSubmit", { selectInfo: data, headerIndex, colIndex, headerFields: this.headerFields })
 		},
@@ -938,7 +938,7 @@ export default {
 				item.checkboxLabel = this.$t(col.checkboxLabel);
 			}
 			if (col.bodyType === "operableInput" ) {
-				if(currentItem.isComplete){
+				if(currentItem.isComplete || this.templateFillType !== 'actFill'){
 					item.disabled = true;
 				}else{
 					item.disabled = false;
@@ -1017,10 +1017,21 @@ export default {
 			this.checkCompareToOnDataLoad();
 		},
 		// 根据行索引更新数据 autoUpdateRecord 是否自动更新记录
-		updateDataSourceByRowIndex(rowIndex, data) {
+		updateDataSourceByRowIndex(rowIndex, data,updateFieldsInfo={}) {
+			const {signData,updateFields = []} = updateFieldsInfo;
 			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
 			this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data };
 			this.localDataSource = [...this.localDataSource];
+			console.log(signData,"signData")
+			if(signData && signData.remark){
+				updateFields.map((key)=>{
+					const ref = this.$refs[key+rowIndex];
+					if(ref){
+						ref[0].handleUpdateRecord(signData, { oldValue: this.oldLocalDataSource[rowIndex][key], inputValue: data[key] });
+					}
+				})
+			}
+
 			this.checkCompareToOnDataLoad();
 			// justUpdateFilledFormData();
 		},

src/components/Template/HandleFormItem.vue

@@ -6,6 +6,7 @@
             <el-input 
                 v-if="type === 'input'" :maxlength="item.maxlength || 50" :disabled="getDisabled()"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" @blur="onBlur"
+                type = "textarea" :autosize="{ minRows: 1, maxRows: 6 }" resize = "none"
                 :placeholder="getPlaceholder()" v-model="inputValue" @input="onInputChange" @change="onInputChange" />
             <el-input v-else-if="type === 'textarea'" :maxlength="item.maxlength || 1000" :disabled="getDisabled()"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" type="textarea" show-word-limit

src/components/Template/mixins/operationMixins.js

@@ -63,9 +63,21 @@ export default {
         },
         // 删除行
         deleteRow(index) {
-
+            const { columnsData } = this.columns;
+            const { row } = this;
+            const filledRowData = {};
+            columnsData.map((item) => {
+                 filledRowData[item.prop] = row[item.prop];
+                if (item.bodySubKey && (item.bodySubType !== "button")) {
+                    filledRowData[item.bodySubKey] = row[item.bodySubKey];
+                }
+                if (item.otherCode) {
+                    filledRowData[item.otherCode] = row[item.otherCode];
+                }
+            })
+            const isFilled = Object.values(filledRowData).every((item) => !!item);
             this.deleteIndex = index;
-            if (this.templateFillType === "actFill") {
+            if (this.templateFillType === "actFill" && isFilled) {
                 EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
             } else {
                 this.sureDelete();

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

@@ -14,19 +14,20 @@
 					<!-- 观察情况 -->
 					<div class="template-form-item">
 						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
-							:formConfig="stepFormConfig" @blur="onHandleBlur"
-							:formData="formData" @onRegentSubmit="onRegentSubmit" />
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData"
+							@onRegentSubmit="onRegentSubmit" />
 						<div style="color:#999;font-size:14px;">
 							畸变类型以代号填写：断片(b)、裂隙(g)、互换及射体(t)、环状染色体(r)、多倍体(p)、双着丝点染色体(d)、内复制(e)、染色体碎化(z)、缺失(l)、粘着(s)、微小体(m)。
 						</div>
 						<CustomTable :ref="`tableRef`" :columns="tableColumns" :formData="tableFormData"
 							operationWidth="120px" :prefixKey="`table`" fieldItemLabel="template.dl.dl022.jbqk"
-							@onAddRow = "onAddRow" @blur="handleClickButton"
-							:showAddRow="fillType === 'actFill'" :showOperation="fillType === 'actFill'">
+							@onAddRow="onAddRow" @blur="handleClickButton" :showAddRow="fillType === 'actFill'"
+							:showOperation="fillType === 'actFill'">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
 									@deleteRow="deleteRow"></TableOpertaionDelete>
-								<button v-if="fillType === 'actFill'" class="edit-button" @click="onEditClick(row, rowIndex)">
+								<button v-if="fillType === 'actFill'" class="edit-button"
+									@click="onEditClick(row, rowIndex)">
 									{{ row.isComplete ? '编辑' : '完成' }}
 								</button>
 							</template>
@@ -66,13 +67,13 @@ export default {
 		},
 	},
 	computed: {
-    // 表格数据
-    tableFormData() {
-      return {
-        stepTableFormData: this.formData.stepTableFormData || [],
-        headerSelectFields: {}
-      }
-    },
+		// 表格数据
+		tableFormData() {
+			return {
+				stepTableFormData: this.formData.stepTableFormData || [],
+				headerSelectFields: {}
+			}
+		},
 		// 备注表单配置
 		remarkConig() {
 			return [
@@ -175,7 +176,7 @@ export default {
 				bodyFillType: 'actFill',
 				width: 200,
 				disabled: true,
-					bodyDisabled: true,
+				bodyDisabled: true,
 			}, {
 				label: 'template.dl.dl022.lxjbs',
 				prop: 'lxjbs',
@@ -183,7 +184,7 @@ export default {
 				bodyFillType: 'actFill',
 				width: 200,
 				disabled: true,
-					bodyDisabled: true,
+				bodyDisabled: true,
 			}, {
 				label: 'template.dl.dl022.dbtjbs',
 				prop: 'dbtjbs',
@@ -191,7 +192,7 @@ export default {
 				bodyFillType: 'actFill',
 				width: 200,
 				disabled: true,
-					bodyDisabled: true,
+				bodyDisabled: true,
 			}, {
 				label: 'template.dl.dl022.nfzjbs',
 				prop: 'nfzjbs',
@@ -199,7 +200,7 @@ export default {
 				bodyFillType: 'actFill',
 				width: 200,
 				disabled: true,
-					bodyDisabled: true,
+				bodyDisabled: true,
 			}, {
 				label: 'template.dl.dl022.jblx',
 				prop: 'jblx',
@@ -213,96 +214,96 @@ export default {
 	data() {
 		return {
 			formData: {},
-			 uuid:getuuid(),//事件id
-			 currentItem: {},
-			 currentRowIndex: -1,
+			uuid: getuuid(),//事件id
+			currentItem: {},
+			currentRowIndex: -1,
 		};
 	},
-  watch: {
+	watch: {
 		formData: {
 			immediate: true,
 			handler(v) {
-				console.log('formData==============',v);
+				console.log('formData==============', v);
 			}
 		},
 	},
-	 mounted() {
-        EventBus.$on('onEditSignCallback', this.handleEditSignCallback);
-    },
-    unmounted() {
+	mounted() {
+		EventBus.$on('onEditSignCallback', this.handleEditSignCallback);
+	},
+	unmounted() {
 		EventBus.$off('onEditSignCallback', this.handleEditSignCallback);
 	},
 	methods: {
-    //畸变类型
-    handleClickButton(e, rowIndex) {
-			console.log('formData==============',e,rowIndex,this.formData);
-      if(this.formData.stepTableFormData&&this.formData.stepTableFormData.length>0){
-        const list = this.formData.stepTableFormData;
-        list.map((item, index) => {
-          let jblxList = item.jblx;
-          if(jblxList&&jblxList.length>0){
-            item.jgjxjbs = this.calculateJgjxjbs(jblxList);
-          }
-        })
+		//畸变类型
+		handleClickButton(e, rowIndex) {
+			console.log('formData==============', e, rowIndex, this.formData);
+			if (this.formData.stepTableFormData && this.formData.stepTableFormData.length > 0) {
+				const list = this.formData.stepTableFormData;
+				list.map((item, index) => {
+					let jblxList = item.jblx;
+					if (jblxList && jblxList.length > 0) {
+						item.jgjxjbs = this.calculateJgjxjbs(jblxList);
+					}
+				})
 
-        // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-        this.$set(this.formData, this.formData)
-      }
+				// 使用 $set 更新 formData，触发 CustomTable 的响应式更新
+				this.$set(this.formData, this.formData)
+			}
 
 		},
-    // 计算结构畸形畸变数
-    calculateJgjxjbs(jblxList,countCodes) {
-      if (!jblxList || jblxList.length === 0) return 0
-      // 需要计数的代号
-      // const countCodes = ['b', 't', 'r', 'd', 'z', 'l', 's', 'm']
+		// 计算结构畸形畸变数
+		calculateJgjxjbs(jblxList, countCodes) {
+			if (!jblxList || jblxList.length === 0) return 0
+			// 需要计数的代号
+			// const countCodes = ['b', 't', 'r', 'd', 'z', 'l', 's', 'm']
 
-      let count = 0
+			let count = 0
 
-      for (const it of jblxList) {
-        if (it.value) {
-          const val = String(it.value).toLowerCase()
-          // 同一输入框中，每个符合规则的代号都计1
-          for (const code of countCodes) {
-            if (val.includes(code)) {
-              count++
-            }
-          }
-        }
-      }
-      return count
-    },
-		handleEditSignCallback(data){
+			for (const it of jblxList) {
+				if (it.value) {
+					const val = String(it.value).toLowerCase()
+					// 同一输入框中，每个符合规则的代号都计1
+					for (const code of countCodes) {
+						if (val.includes(code)) {
+							count++
+						}
+					}
+				}
+			}
+			return count
+		},
+		handleEditSignCallback(data) {
 			if (data.uuid === this.uuid) {
 				this.handleEdit();
 			}
 		},
-		handleEdit(){
-			const {currentItem, currentRowIndex} = this;
+		handleEdit() {
+			const { currentItem, currentRowIndex } = this;
 			currentItem.isComplete = !currentItem.isComplete;
 			this.$refs.tableRef.updateDataSourceByRowIndex(currentRowIndex, currentItem)
 		},
 
 		// 编辑/完成
 		onEditClick(item, rowIndex) {
-			const { jblx=[] } = item;
+			const { jblx = [] } = item;
 			const flag = jblx.every(it => !!it.value)
-			if(!item.isComplete && !flag){
+			if (!item.isComplete && !flag) {
 				this.$message.error('畸变类型还未填写完，请填写完成后再操作')
 				return
 			}
-      item.jgjxjbs = this.calculateJgjxjbs(jblx,['b', 't', 'r', 'd', 'z', 'l', 's', 'm'])
-      item.lxjbs = this.calculateJgjxjbs(jblx,['g'])
-      item.dbtjbs = this.calculateJgjxjbs(jblx,['p'])
-      item.nfzjbs = this.calculateJgjxjbs(jblx,['e'])
+			item.jgjxjbs = this.calculateJgjxjbs(jblx, ['b', 't', 'r', 'd', 'z', 'l', 's', 'm'])
+			item.lxjbs = this.calculateJgjxjbs(jblx, ['g'])
+			item.dbtjbs = this.calculateJgjxjbs(jblx, ['p'])
+			item.nfzjbs = this.calculateJgjxjbs(jblx, ['e'])
 			EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
 			this.currentItem = item;
 			this.currentRowIndex = rowIndex;
-      this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, item)
+			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, item)
 		},
 		// 新增行
 		onAddRow() {
 			this.$refs.tableRef.addRow({
-				jblx: [{value: undefined}],
+				jblx: [{ value: undefined }],
 			})
 		},
 		onFormSelect(fields) {
@@ -386,14 +387,14 @@ export default {
 }
 </script>
 <style rel="stylesheet/scss" lang="scss">
-.edit-button{
-  color: #409eff;
-  font-size: 13px;
-  border-radius: 3px;
-  padding: 5px 9px;
-  cursor: pointer;
-  border-color: transparent;
-  background: transparent;
-  margin: 0 0 5px 10px !important;
+.edit-button {
+	color: #409eff;
+	font-size: 13px;
+	border-radius: 3px;
+	padding: 5px 9px;
+	cursor: pointer;
+	border-color: transparent;
+	background: transparent;
+	margin: 0 0 5px 10px !important;
 }
 </style>

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

@@ -277,7 +277,7 @@ export default {
 					bodySubType: "span",
 					bodySubKey: "subTargetSolutionCode",
 					bodyFillType: "preFill",
-					width: 140,
+					width: 280,
 					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
 					maxVolumeField: "actSolutionVolume",//分装的最大量字段
 					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段

src/views/business/comps/template/comps/yp/YP005.vue

@@ -206,7 +206,7 @@ export default {
 				timeArr[0] = startTime
 				this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{
 					qxsj: timeArr.join('~'),
-				})
+				},{signData:data,updateFields:['qxsj']})
 
 				// this.$nextTick(() => {
 				// 	//通知后端保存数据
@@ -219,12 +219,11 @@ export default {
 				// })
 			}
 			if(key === "endBtn"){
-				debugger
 				let endTime = moment().format("YYYY/MM/DD HH:mm")
 				timeArr[1] = endTime
 				this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{
 					qxsj: timeArr.join('~'),
-				})
+				},{signData:data,updateFields:['qxsj']})
 
 				// this.$nextTick(() => {
 				// 	//通知后端保存数据

src/views/business/comps/template/mixins/templateMixin.js

@@ -581,7 +581,9 @@ export default {
 				} else {
 					initNd = dataSource[rowIndex - 1].actSolutionConcentration;
 				}
+
 				if (isValueEmpty(initNd)) {
+					console.log("initNd",initNd)
 					this.$message.error('请先选择起始源溶液')
 					return
 				} else {