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

src/api/template/index.js

@@ -7,4 +7,13 @@ export const getReagentList = (params) => {
     method: 'get',
     params
   })
+}
+
+//获取最新的sn号
+export const getLatestSn = (params) => {
+  return request({
+    url: '/system/business/public/getSn',
+    method: 'get',
+    params
+  })
 }

src/components/Template/BaseInfoFormPcakge.vue

@@ -243,6 +243,7 @@ export default {
                 this.$set(this.errors, key, false);
             }
         },
+        //更新表单数据
         updateFormData(key, value) {
             this.formFields[key] = value;
             // 清除该表单项的错误状态
@@ -250,6 +251,7 @@ export default {
                 this.$set(this.errors, key, false);
             }
         },
+        //批量更新表单数据
         batchUpdateFormData(data) {
             Object.keys(data).forEach(key => {
                 this.formFields[key] = data[key];
@@ -467,7 +469,7 @@ export default {
             });
         },
         //直接获取表单数据，不做校验
-        getDirectFormData() {
+        getFilledFormData() {
             return this.formFields;
         },
         getFormDataByKey(key) {

src/components/Template/CustomTable.vue

@@ -192,7 +192,7 @@ export default {
       this.headerSelectFields = headerSelectObj;
     },
     // 直接获取表单数据，不做校验
-    getDirectFormData() {
+    getFilledFormData() {
       return {
             stepTableFormData: [...this.localDataSource],
             headerSelectFields: this.headerSelectFields,

src/components/Template/HandleFormItem.vue

@@ -33,7 +33,7 @@
         </div>
         <!-- qc才能操作 -->
         <div class="handle-row" v-if="isShowHandle()">
-            <el-checkbox class="ml-5"></el-checkbox>
+            <el-checkbox class="ml-5" @change="onCheckboxChange"></el-checkbox>
             <div @mouseenter="onMouseEnter" @mouseleave="onMouseLeave">
                 <Question   class="handle-icon" :class="getQuestionColor()" />
             </div>
@@ -75,6 +75,7 @@
 <script>
 import Question from "./icons/Question.vue";
 import DecimalInput from "./DecimalInput.vue";
+import { EventBus } from "@/utils/eventBus"
 export default {
     components: {
         Question,
@@ -152,6 +153,17 @@ export default {
             //gray 灰色 green 绿色 orange 橙色
             return "green"
         },
+        // 复选框变化处理
+        onCheckboxChange(val) {
+            // 触发修改记录事件
+            EventBus.$emit('onModifyRecord', {
+                timestamp: new Date().toLocaleString(),
+                oldValue: this.oldValue,
+                newValue: val,
+            });
+            // this.$emit('input', val);
+            // this.$emit('change', val);
+        },
         // 统一处理输入变化
         onInputChange(val) {
             const value = val !== undefined ? val : this.inputValue;
@@ -180,24 +192,33 @@ export default {
             }
             const {templateStatus} = this.$store.state.template;
             // 检查值是否发生变化
-            if (this.inputValue !== this.oldValue && templateStatus === "actFill") {
+            if (templateStatus === "actFill") {
                 // 值发生了变化，需要弹出密码输入框
                 try {
-                    // const passwordResult = await this.$prompt('请输入密码以确认修改', '密码验证', {
-                    //     confirmButtonText: '确定',
-                    //     cancelButtonText: '取消',
-                    //     inputType: 'password',
-                    //     inputPattern: /.+/,
-                    //     inputErrorMessage: '请输入密码',
-                    //     zIndex: 10000,
-                    // });
-                    // 用户输入密码并点击确定，保存修改
+                    if(this.oldValue && this.oldValue !== this.inputValue){
+                        const passwordResult = await this.$prompt('请输入密码以确认修改', '密码验证', {
+                                confirmButtonText: '确定',
+                                cancelButtonText: '取消',
+                                inputType: 'password',
+                                inputPattern: /.+/,
+                                inputErrorMessage: '请输入密码',
+                                zIndex: 10000,
+                        });
+                    }
+                    this.$emit("onModifyRecord", {
+                        timestamp: new Date().toLocaleString(),
+                        oldValue: this.oldValue,
+                        value: this.inputValue,
+                        title:this.oldValue?"修改记录":"填写",
+                        field:"试验基本信息-其他信息"
+                    })
+                    //用户输入密码并点击确定，保存修改
                     this.oldValue = this.inputValue; // 更新旧值
                     this.$emit("blur", val);
                     this.$emit('input', this.inputValue);
                     this.$emit("change", val);
                     // 调用后端接口记录修改记录
-                    await this.saveModificationRecord();
+                    // await this.saveModificationRecord();
                 } catch {
                     // 用户点击取消，还原数据
                     this.inputValue = this.oldValue;

src/components/Template/Step.vue

@@ -254,7 +254,7 @@ export default {
     },
 
     // 直接获取表单数据，不做校验
-    getDirectFormData() {
+    getFilledFormData() {
       return this.steps.map(step => ({
         type: step.type,
         ...step.formData

src/utils/eventBus.js

@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export const EventBus = new Vue()

src/views/business/comps/template/TemplateTable.vue

@@ -2,12 +2,13 @@
   <div class="template-table">
     <!-- <SP001 v-if="sn == 'SP0012'" />
     <SWYPFXRYPZB v-if="sn == 'SP001'" /> -->
-     <component ref="templateComponent" :is="getTemplateComponent()" :templateData="templateData" :fillType="fillType">
-      </component>
+    <component ref="templateComponent" :is="getTemplateComponent()" :templateData="templateData" :fillType="fillType">
+    </component>
   </div>
 </template>
 
 <script>
+import { EventBus } from "@/utils/eventBus"
 //色谱
 import SP001 from './comps/sp/SP001';
 import SWYPFXRYPZB from "./comps/sp/SWYPFXRYPZB.vue";
@@ -22,9 +23,9 @@ import MJYLQSQD from "./comps/gy/MJYLQSQD.vue";
 
 export default {
   name: "TemplateTable",
-  components: { 
-    MJYLQSQD,SYWZPZJHB,
-    SP001,SWYPFXRYPZB ,Demo,SWYPFXCBYPZB,SWYPBQGZYZBB,SWYPNBGZYZBB,IndexDBDemo
+  components: {
+    MJYLQSQD, SYWZPZJHB,
+    SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB, IndexDBDemo
   },
   props: {
     sn: {
@@ -37,11 +38,11 @@ export default {
     },
     templateData: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   computed: {
-    
+
     templateComponentMap() {
       if (!this.componentMap) {
         this.componentMap = {
@@ -61,7 +62,7 @@ export default {
     sn: {
       immediate: true,
       handler(v) {
-        console.log(v,"sn")
+        console.log(v, "sn")
       }
     }
   },
@@ -71,17 +72,23 @@ export default {
     };
   },
   mounted() {
-    console.log(this.fillType,"fillType")
+    EventBus.$on('onModifyRecord', (data) => {
+      this.$emit("onModifyRecord", data)
+    })
+  },
+  beforeDestroy() {
+    // 记得移除监听，避免内存泄漏
+    EventBus.$off('onModifyRecord')
   },
   methods: {
     async getFormData() {
       return await this.$refs.templateComponent.getFormData();
     },
-    getResource(){
+    getResource() {
       return this.$refs.templateComponent.getResource();
     },
     getTemplateComponent() {
-      return this.templateComponentMap[this.sn] 
+      return this.templateComponentMap[this.sn]
     },
   }
 };

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

@@ -37,6 +37,7 @@ import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
+import { getLatestSn } from '@/api/template';
 
 export default {
 	name: "SWYPFXRYPZB",
@@ -141,11 +142,11 @@ export default {
 					type: "cellItem",
 					label: this.$t('template.common.configurationTime'),
 					config: {
-						createTime: {
+						startDate: {
 							label: this.$t('template.common.startTime'),
 							type: "input",
 						},
-						endTime: {
+						endDate: {
 							label: this.$t('template.common.endTime'),
 							type: "input",
 						},
@@ -169,7 +170,7 @@ export default {
 							type: "input",
 							subType: "span",
 							fillType: "preFill",
-							subKey: "targetCode1",
+							subKey: "targetCodeSn",
 							maxlength: 20
 						},
 						targetPreConcentration: {
@@ -254,9 +255,26 @@ export default {
 		};
 	},
 	mounted() {
+		if(this.fillType === "actFill"){
+			this.getCode();
+		}
+		
 
 	},
 	methods: {
+		//获取目标溶液编号
+		async getCode(){
+			const result = await getLatestSn({
+				count: 1,
+			})
+			if(result.code == 200){
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data)
+			}
+		},
+		//获取已填写的表单数据
+		getFilledFormData(){
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
+		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
 			//生成resource
@@ -279,11 +297,10 @@ export default {
 			//使用的试剂
 			this.resource=tmpResource
 			
-			console.log(this.resource, "resource")
 			return content;
 		},
 		async onSave() {
-			const formData = await this.getFormData();
+			const formData = await this.getFilledFormData();
 
 			console.log(formData, "formData")
 		},

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

@@ -785,16 +785,16 @@ export default {
 			return await this.validFormFields(refsToValidate);
 		},
 		getRealFormData(){
-			const baseData =  this.$refs.baseInfoRef.getDirectFormData();
-			const conditionData = this.$refs.storageConditionRef.getDirectFormData();
+			const baseData =  this.$refs.baseInfoRef.getFilledFormData();
+			const conditionData = this.$refs.storageConditionRef.getFilledFormData();
 			
 			// 获取所有阶梯配制数据
 			const ladderConfigsData = [];
 			if (this.formData.ladderConfigs && this.formData.ladderConfigs.length > 0) {
 				for (let i = 0; i < this.formData.ladderConfigs.length; i++) {
-					const ladderFormData = this.$refs[`ladderStepFormPackageRef_${i}`][0].getDirectFormData();
-					const ladderTableFormData = this.$refs[`ladderStepTableRef_${i}`][0].getDirectFormData();
-					const ladderStepData = this.$refs[`ladderStepRef_${i}`][0].getDirectFormData();
+					const ladderFormData = this.$refs[`ladderStepFormPackageRef_${i}`][0].getFilledFormData();
+					const ladderTableFormData = this.$refs[`ladderStepTableRef_${i}`][0].getFilledFormData();
+					const ladderStepData = this.$refs[`ladderStepRef_${i}`][0].getFilledFormData();
 					
 					ladderConfigsData.push({
 						...ladderFormData,
@@ -809,9 +809,9 @@ export default {
 			const paralleConfigsData = [];
 			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
 				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
-					const paralleFormData = this.$refs[`paralleStepFormPackageRef_${i}`][0].getDirectFormData();
-					const paralleTableFormData = this.$refs[`paralleStepTableRef_${i}`][0].getDirectFormData();
-					const paralleStepData = this.$refs[`paralleStepRef_${i}`][0].getDirectFormData();
+					const paralleFormData = this.$refs[`paralleStepFormPackageRef_${i}`][0].getFilledFormData();
+					const paralleTableFormData = this.$refs[`paralleStepTableRef_${i}`][0].getFilledFormData();
+					const paralleStepData = this.$refs[`paralleStepRef_${i}`][0].getFilledFormData();
 					
 					paralleConfigsData.push({
 						...paralleFormData,
@@ -822,7 +822,7 @@ export default {
 				}
 			}
 			
-			const remarkData = this.$refs.remarkRef.getDirectFormData();
+			const remarkData = this.$refs.remarkRef.getFilledFormData();
 			
 			return {
 				...baseData,

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

@@ -43,8 +43,15 @@ export default {
     this.setTemplateData({});
   },
   methods: {
-    getResource() {
-      return this.resource;
+    
+    //根据ref数组获取直接formData
+    getFilledFormDataByRefs(refArr = []){
+      let result = {};
+      refArr.map(ref => {
+        const refData = this.$refs[ref]?.getFilledFormData() || {};
+          result = { ...result, ...refData };
+      });
+      return result;
     },
     //统一校验form表单是否填写
     async validFormFields(refArr = []) {
@@ -96,9 +103,9 @@ export default {
     //统一处理blur事件，因为有效周期和过期日期是相关的，所以需要在有效周期失焦时更新过期日期
     onHandleBlur(fields) {
       const { key, effectivePeriodUnit, effectivePeriod, codeSTD, targetStartSolution } = fields;
-      const { createTime } = this.formData;
+      const { startDate } = this.formData;
       if (key === "effectivePeriod") {//统一处理有效周期失焦，计算失效事件，保证字段名不能变
-        const start = moment(createTime);
+        const start = moment(startDate);
         const end = start.add(Number(effectivePeriod), effectivePeriodUnit).format("YYYY-MM-DD HH:mm:ss");
         this.$refs.stepFormPackageRef.updateFormData("expireDate", end);
       } else if (key === "codeSTD") {//起始编号STD失焦时，更新stepDataSource

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-          // target: `http://39.99.251.173:8080`,
+        // target: `http://localhost:8080`,
+          target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''