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

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

@@ -18,6 +18,7 @@
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
           <CustomTable
+            fieldItemLabel="template.dl.dl007.yqsyxx"
             :columns="yqsyColumns"
             :ref="refConf.yqsy"
             @onRegentSubmit="(e) => onRegentSubmit(e)"
@@ -40,7 +41,7 @@
           <LineLabel label="template.dl.dl013.xbxx" />
           <div class="template-form-item">
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.xbxx"
               label=""
               :ref="refConf.xbxx"
               :formConfig="xbxxConfig"
@@ -52,7 +53,7 @@
           <LineLabel label="template.dl.dl013.cdxx" />
           <div class="template-form-item">
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.cdxx"
               label=""
               :ref="refConf.cdxx"
               :formConfig="cdxxConfig"
@@ -81,12 +82,13 @@
               >
             </div>
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.cdxx"
               label=""
               :ref="`cdxx${index}Ref`"
               :formConfig="getCdxxTimeConfig(index)"
               :formData="cdxxItem"
               @blur="(e) => onBlur(e, index)"
+              :prefixKey="'paralle' + cdxxItem.id"
             />
           </div>
 
@@ -100,10 +102,12 @@
         </div>
       </div>
     </div>
+    <EditSign ref="editSignDL013Ref" @cancel="signCancel" @callback="signCallback" />
   </div>
 </template>
 
 <script>
+import EditSign from "../../dialog/EditSign.vue";//电子签名弹窗
 import BaseInfoFormPackage from '@/components/Template/BaseInfoFormPackage'
 import TableOpertaionDelete from '@/components/Template/operation/TableOpertaionDelete.vue'
 import CustomTable from '@/components/Template/CustomTable.vue'
@@ -113,6 +117,7 @@ import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import { getuuid } from '@/utils/index.js'
 import { EventBus } from '@/utils/eventBus'
+import moment from "moment";
 
 const refConf = {
   base: 'baseInfoRef',
@@ -131,7 +136,8 @@ export default {
     TableList,
     Step,
     CustomTable,
-    TableOpertaionDelete
+    TableOpertaionDelete,
+    EditSign
   },
   mixins: [templateMixin],
   props: {
@@ -306,7 +312,8 @@ export default {
   data() {
     return {
       formData: {},
-      refConf
+      refConf,
+      deleteIndex:-1
     }
   },
   mounted() {
@@ -427,27 +434,15 @@ export default {
         (config) => config.id === cdxxItem.id
       )
       if (configIndex !== -1) {
-        // 创建新数组，确保响应式更新
-        const newConfigs = [...this.formData.cdxxConfigs]
-        newConfigs.splice(configIndex, 1)
-        this.$set(this.formData, 'cdxxConfigs', newConfigs)
         
-        // 更新测定次数
-        this.$refs[refConf.cdxx]?.updateFormData('cdcs', newConfigs.length, {
-          isUpdateRecord: false,
-          signData: null
-        })
-        
-        this.$nextTick(() => {
-          // 更新平均细胞密度
-          this.updatePjxbmd()
-          // 通知后端保存数据
-          EventBus.$emit('onModifyRecord', {
-            type: 'fieldChanged',
-            newRecord: null,
-            resourceList: null
-          })
-        })
+        let content = this.getFilledFormData()
+        let thisItem = content.cdxxConfigs[configIndex]
+        if(!thisItem.xsbs && !thisItem.zsg && !thisItem.ysg && !thisItem.zxg && !thisItem.yxg){
+          this.doDeleteParalleConfig(configIndex,null)
+        }else{
+          this.deleteIndex = configIndex
+          this.$refs.editSignDL013Ref.show();
+        }
       }
     },
     // 新增测定信息
@@ -635,7 +630,65 @@ export default {
     async onSave() {
       const formData = this.getStepResource()
       console.log(formData, 'formData')
-    }
+    },
+
+
+    checkDelete(index){
+			let content = this.getFilledFormData()
+			let thisItem = content.paralleConfigs[index]
+			if(!thisItem.jcb && !thisItem.jg && !thisItem.sjwjm){
+				this.doDeleteParalleConfig(index,null)
+			}else{
+				this.deleteIndex = index
+				this.$refs.editSignLAB006Ref.show();
+			}
+		},
+		// 处理电子签名取消事件
+		signCancel() {
+		},
+		// 处理电子签名确认回调事件
+		signCallback(data) {
+			let content = this.getFilledFormData()
+			let record = [
+				{
+					"userNameCn": data.qmrMc,
+					"userNameEn": data.qmrMcEn,
+					"key": "paralle",
+					"fieldCn": this.$t('template.dl.dl013.cdxx','zh_CN'),
+					"fieldEn": this.$t('template.dl.dl013.cdxx','en_US'),
+					// "oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+(content.paralleConfigs[this.deleteIndex].jg==='接受'?''(content.paralleConfigs[this.deleteIndex].jgOther+";"))+content.paralleConfigs[this.deleteIndex].sjwjm,
+					"oldValue": '稀释倍数:'+content.cdxxConfigs[this.deleteIndex].xsbs+";左上格(个):"+content.cdxxConfigs[this.deleteIndex].zsg+";右上格(个):"+content.cdxxConfigs[this.deleteIndex].ysg+";左下格(个):"+content.cdxxConfigs[this.deleteIndex].zxg+";右下格(个):"+content.cdxxConfigs[this.deleteIndex].yxg,
+					"value": "",
+					"title": "修改",
+					"time": moment().format("YYYY-MM-DD HH:mm:ss"),
+					"reason": data.remark
+				}
+			]
+			this.doDeleteParalleConfig(this.deleteIndex,record)
+		},
+		doDeleteParalleConfig(configIndex,newRecord){
+			// 创建新数组，确保响应式更新
+      const newConfigs = [...this.formData.cdxxConfigs]
+      newConfigs.splice(configIndex, 1)
+      this.$set(this.formData, 'cdxxConfigs', newConfigs)
+      
+      // 更新测定次数
+      this.$refs[refConf.cdxx]?.updateFormData('cdcs', newConfigs.length, {
+        isUpdateRecord: false,
+        signData: null
+      })
+      
+      this.$nextTick(() => {
+        // 更新平均细胞密度
+        this.updatePjxbmd()
+        // 通知后端保存数据
+        EventBus.$emit('onModifyRecord', {
+          type: 'fieldChanged',
+          newRecord: newRecord,
+          resourceList: null
+        })
+      })
+		},
   }
 }
 </script>

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

@@ -15,7 +15,7 @@
           <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
-          <CustomTable :columns="yqsyColumns" :ref="refConf.yqsy" @onRegentSubmit="(e) => onRegentSubmit(e)"
+          <CustomTable fieldItemLabel="template.dl.dl007.yqsyxx" :columns="yqsyColumns" :ref="refConf.yqsy" @onRegentSubmit="(e) => onRegentSubmit(e)"
             :showOperation="fillType === 'actFill'" :showAddRow="fillType === 'actFill'" :formData="formData"
             :prefixKey="`yqsyTable`">
             <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -25,17 +25,17 @@
           </CustomTable>
 
           <LineLabel label="template.dl.dl014.xbxx" />
-          <BaseInfoFormPackage :ref="refConf.xbInfo" :formConfig="xbInfoFormConfig" :formData="formData" />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.xbxx" :ref="refConf.xbInfo" :formConfig="xbInfoFormConfig" :formData="formData" />
 
           <!-- 剂量组配制信息 -->
           <LineLabel label="template.dl.dl014.jlzpzxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.jlzInfo" :formConfig="jlzInfoFormConfig"
+            <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.jlzpzxx" label="" :ref="refConf.jlzInfo" :formConfig="jlzInfoFormConfig"
               :formData="formData" @select="onSftjs9Change" @clickButton="handleJlzzsButton"
               @onRegentSubmit="(data) => onTableRegentSubmit(data)" @blur="onJlzInfoBlur" />
 
             <!-- 剂量组名称列表 -->
-            <CustomTable :columns="jlzmcTableColumns" :ref="refConf.jlzmcTable" :showOperation="false"
+            <CustomTable fieldItemLabel="template.dl.dl014.jlzpzxx" :columns="jlzmcTableColumns" :ref="refConf.jlzmcTable" :showOperation="false"
               :showAddRow="false" :formData="jlzmcTableFormData" :prefixKey="`jlzmcTable`" @blur="onJlzmcTableBlur">
             </CustomTable>
 
@@ -47,11 +47,11 @@
             </div>
 
             <!-- 培养液 -->
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyy" :formConfig="pyyFormConfig"
+            <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.jlzpzxx" label="" :ref="refConf.pyy" :formConfig="pyyFormConfig"
               @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
 
             <!-- 剂量组列表 -->
-            <CustomTable :columns="jlzTableColumns" :ref="refConf.jlzTable" :showOperation="false" :showAddRow="false"
+            <CustomTable fieldItemLabel="template.dl.dl014.jlzpzxx" :columns="jlzTableColumns" :ref="refConf.jlzTable" :showOperation="false" :showAddRow="false"
               :formData="jlzTableFormData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
               :prefixKey="`jlzTable`">
               <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -374,6 +374,7 @@ export default {
           bodyFillType: 'preFill',
           bodyMaxlength: 10,
           headerSelectKey: 'ysplyjrlUnit',
+          headerSelectTo: 'sjplyjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           width: 180,
           fillType: 'preFill'
@@ -384,7 +385,7 @@ export default {
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
           bodyMaxlength: 10,
-          headerSelectKey: 'ysplyjrlUnit',
+          headerSelectKey: 'sjplyjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           copyFrom: 'ysplyjrl',
           compareTo: 'ysplyjrl',
@@ -403,6 +404,7 @@ export default {
             bodyFillType: 'preFill',
             bodyMaxlength: 10,
             headerSelectKey: 'yss9hhyjrlUnit',
+            headerSelectTo: 'sjs9hhyjrlUnit',
             headerOptions: this.getDictOptions('business_tjdw'),
             width: 220,
             fillType: 'preFill'
@@ -443,6 +445,7 @@ export default {
           bodyFillType: 'preFill',
           bodyMaxlength: 10,
           headerSelectKey: 'ysgspjrlUnit',
+          headerSelectTo: 'sjgspjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           width: 180,
           fillType: 'preFill'

src/views/business/comps/template/comps/lba/LBA006.vue

@@ -273,7 +273,7 @@ export default {
 					"fieldCn": this.$t('template.lba.lba006.fxxx','zh_CN'),
 					"fieldEn": this.$t('template.lba.lba006.fxxx','en_US'),
 					// "oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+(content.paralleConfigs[this.deleteIndex].jg==='接受'?''(content.paralleConfigs[this.deleteIndex].jgOther+";"))+content.paralleConfigs[this.deleteIndex].sjwjm,
-					"oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+content.paralleConfigs[this.deleteIndex].jgOther+";"+content.paralleConfigs[this.deleteIndex].sjwjm,
+					"oldValue": '检测板:'+content.paralleConfigs[this.deleteIndex].jcb+";结果:"+content.paralleConfigs[this.deleteIndex].jg+(content.paralleConfigs[this.deleteIndex].jg=='接受'?'':('('+content.paralleConfigs[this.deleteIndex].jgOther+')'))+";数据文件名:"+content.paralleConfigs[this.deleteIndex].sjwjm,
 					"value": "",
 					"title": "修改",
 					"time": moment().format("YYYY-MM-DD HH:mm:ss"),