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

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻ELN V1.0
+VUE_APP_TITLE = 华西海圻实验室电子记录系统
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻ELN V1.0
+VUE_APP_TITLE = 华西海圻实验室电子记录系统
 
 # 生产环境配置
 ENV = 'production'

src/api/business/study/studyFormFill.js

@@ -24,6 +24,16 @@ export function studyFormFill_exportDetail(query) {
     params: query
   })
 }
+
+export function studyFormFill_exportTbByFileUrl(query) {
+  return request({
+    url: '/system/business/studyFormFill/exportTbByFileUrl',
+    method: 'get',
+    params: query
+  })
+}
+
+
 export function studyFormFill_exportByFileUrl(query) {
   return request({
     url: '/system/business/studyFormFill/exportByFileUrl',

src/components/Template/CustomTable.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div class="custom-table-wrapper" :class="{ 'no-border': !isBorder }">
-			<div class="custom-table-header" v-if="isBorder">
+			<div class="custom-table-header   no-break" v-if="isBorder">
 				<div class="custom-table-row">
 					<div v-if="showSort" class="custom-table-cell header-cell sort-cell">
 						序号
@@ -12,13 +12,13 @@
 								@change="handleCheckAllChange"></el-checkbox>
 						</div>
 					</div>
-					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell header-cell"
+					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell header-cell   no-break"
 						:style="getCellWidth(col)">
 						<div class="header-cell-content" v-if="col.headerColumns && col.headerColumns.length > 0">
 							<div class="header-columns-grid"
 								:style="{ 'grid-template-columns': `repeat(${col.span || 2}, 1fr)` }">
 								<div v-for="(headerCol, headerIndex) in col.headerColumns" :key="headerIndex"
-									class="header-column-item">
+									class="header-column-item" >
 									<template v-if="headerCol.type === 'span'">
 										<div class="span-content">{{ $t(headerCol.label) }}</div>
 									</template>
@@ -74,7 +74,7 @@
 			</div>
 
 			<div class="custom-table-body">
-				<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row">
+				<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row   no-break">
 					<div v-if="showSort" class="custom-table-cell body-cell sort-cell">
 						{{ rowIndex + 1 }}
 					</div>
@@ -83,7 +83,7 @@
 							<el-checkbox v-model="row._checked" @change="handleCheckChange(row, $event)"></el-checkbox>
 						</div>
 					</div>
-					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell"
+					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell   no-break"
 						:style="getCellWidth(col)">
 						<div class="inner-table-cell">
 							<div class="flex1" :class="{ 'item-center': !isBorder && col.label }">

src/components/Template/Step.vue

@@ -106,7 +106,7 @@ import cl from './StepComponents/b/cl.vue';//表配制-称量
 
 
 //生物样品分析
-//生物样品分析-解冻：使用溶液-解冻
+import jd_swypfx from './StepComponents/swypfx/jd_swypfx.vue';//生物样品分析-解冻：生物样品分析-融解
 //生物样品分析-涡旋混匀：使用溶液-涡旋混匀
 //生物样品分析-选择容器：使用溶液-选择容器
 import jryp from './StepComponents/swypfx/jryp.vue';//生物样品分析-加入样品
@@ -449,6 +449,7 @@ export default {
 		cl,
 
 		//生物样品分析
+		jd_swypfx,
 		jryp,
 		hhspe,
 		zyfc,
@@ -665,7 +666,7 @@ export default {
 					'fr_b': 'Fr',
 
 					//生物样品分析
-					'jd_swypfx': 'Jd',
+					'jd_swypfx': 'jd_swypfx',
 					'jryp': 'jryp',
 					'ysfy': 'Lx',
 					'hhspe': 'hhspe',

src/components/Template/StepComponents/pcr/bzyp.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     ytry: {

src/components/Template/StepComponents/pcr/jryp_pcr.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     srry: {

src/components/Template/StepComponents/pcr/nscyp.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将无菌去离子水",
+                        label: "仪器，按照样品排列示意图将无菌去离子水",
                         type: "text",
                     },
                     sjry:{

src/components/Template/StepComponents/pcr/sjjy.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将",
+                        label: "仪器，按照样品排列示意图将",
                         type: "text",
                     },
                     srry: {

src/components/Template/StepComponents/pcr/wxhy_pcr.vue

@@ -31,7 +31,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,对样品进行涡旋混匀。",
+                        label: "仪器，对样品进行涡旋混匀。",
                         type: "text",
                     },
                 }

src/components/Template/StepComponents/pcrfx/ndcd.vue

@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按核酸浓度测定排版表吸取核酸样品和Blank样品",
+                        label: "仪器，按核酸浓度测定排版表吸取核酸样品和Blank样品",
                         type: "text",
                     },
                     ry:{

src/components/Template/StepComponents/pcrfxyp/jryp_pcrfxyp.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     srry: {

src/components/Template/StepComponents/pcrfxyp/sjjy_pcrfxyp.vue

@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将",
+                        label: "仪器，按照样品排列示意图将",
                         type: "text",
                     },
                     srry: {

src/components/Template/StepComponents/pcrfxyp/xs.vue

@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按上表进行稀释。",
+                        label: "仪器，按上表进行稀释。",
                         type: "text",
                     },
                 }

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

@@ -36,7 +36,7 @@ export default {
                         dwCode: "wzsuldw",
                     },
                     text3: {
-                        label: "物质,称取预计质量为",
+                        label: "物质，称取预计质量为",
                         type: "text",
                     },
                     wzsul: {

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

@@ -36,7 +36,7 @@ export default {
                         dwCode: "wzsuldw1",
                     },
                     text3: {
-                        label: "物质,称取预计质量为",
+                        label: "物质，称取预计质量为",
                         type: "text",
                     },
                     wzsul: {

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

@@ -29,7 +29,7 @@ export default {
                         fillType: "actFill",
                     },
                     text2: {
-                        label: "环境下，操作下预计在",
+                        label: "环境下，预计在",
                         type: "text",
                     },
                     ytczhj: {

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

@@ -31,7 +31,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"actFill",
                         },
                         text2:{
-                            label:"仪器,设置预计温度为",
+                            label:"仪器，设置预计温度为",
                             type:"text",
                         },
                         yjwd:{

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

@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,吸取",
+                        label: "仪器，取",
                         type: "text",
                     },
                     srry: {

src/components/Template/StepComponents/swypfx/jd_swypfx.vue

@@ -0,0 +1,101 @@
+<!-- 解冻-改成了融解  -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @resetRecord="resetRecord" :form-config="formConfig"
+        @select="select"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'jd_swypfx',
+        },
+    },
+
+    components: {
+        StepFormPackage
+    },
+    methods: {
+        select(data) {
+            const {value,key} = data;
+            if(key==='sjccwz'){
+                this.updateWcData("sjwd",value);
+            }
+        }
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将上述样品预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "input",
+                        // options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                     text6: {
+                        label: "进行融解",
+                        type: "text",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+                    remark: {
+                        type: "input",
+                        fillType: "actFill",
+                    }
+
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/components/Template/StepComponents/xb/bpqr.vue

@@ -52,13 +52,43 @@ export default {
                         otherCode: "ccwzOther",
                     },
                     text3: {
-                        label: "冰冻时长为",
+                        label: "冰冻时长预计为",
                         type: "text",
                     },
                     sj: {
                         fillType: "actFill",
                         type: "input",
                     },
+                    text6:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text7:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2:{
+                        type:"button",
+                        buttonName:"结束",
+                    },
+                    text8: {
+                        type: "text",
+                        label: "。",
+                    }
                 }
             }]
             return config

src/lang/en.js

@@ -83,7 +83,7 @@ import systemLog from './en/system/systemLog'
 import storageLocation from './en/system/storageLocation'
 export default {
   system: {
-    name: 'WestChina-Frontier PharmaTech ELN',
+    name: 'WCFP Electronic Laboratory Notebook',
     title: 'HXHQ',
     tip: 'Prompt',
     logOut: 'Are You Sure To Log Out And Exit The System?',

src/lang/en/template/dl.js

@@ -61,7 +61,7 @@ export default {
     s9hhybh: 'S9混合液编号',
     s9hhyyjjrl: 'S9混合液预计加入量',
     pbsbh: 'PBS编号',
-    pbsryyjjrl: '0.2mol PBS溶液预计加入量',
+    pbsryyjjrl: 'PBS溶液预计加入量',
     jlzsl: '剂量组数量',
     wcButton: 'Finsh',
     jlzmc: '剂量组名称  ',

src/lang/en/template/lba.js

@@ -47,7 +47,7 @@ export default {
     dwbh: '动物编号',
     zzlx: '组织类型',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量'
+    ysyjrybjrl: '预设匀浆溶液加入量',
+    sjyjrybjrl: '实际匀浆溶液加入量'
   }
 }

src/lang/en/template/pcr.js

@@ -37,6 +37,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: 'Analysis Batch Number',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -75,6 +76,7 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
@@ -97,8 +99,15 @@ export default {
     yjyjry: '已加匀浆溶液',
     ypmc: '样品名称',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
+  },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
   },
   pcr012: {
     sjwj: '数据文件',

src/lang/en/template/sp.js

@@ -58,7 +58,10 @@ export default {
   sp007: {
     title: '生物样品分析样本处理表',
     ybsm: 'Sample Description',
-    bt: 'Title'
+    bt: 'Title',
+    clhxx: '处理后信息',
+    hjsj: '处理后样品放入进样环境时间',
+    cfwz: '存放位置'
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {

src/lang/zh.js

@@ -83,7 +83,7 @@ import storageLocation from './zh/system/storageLocation'
 
 export default {
   system: {
-    name: '华西海圻ELN系统',
+    name: '华西海圻实验室电子记录系统',
     title: '华西海圻管理系统',
     tip: '提示',
     logOut: '确认注销并退出系统吗？',

src/lang/zh/template/dl.js

@@ -62,7 +62,7 @@ export default {
     s9hhybh: 'S9混合液编号',
     s9hhyyjjrl: 'S9混合液预计加入量',
     pbsbh: 'PBS编号',
-    pbsryyjjrl: '0.2mol PBS溶液预计加入量',
+    pbsryyjjrl: 'PBS溶液预计加入量',
     jlzsl: '剂量组数量',
     wcButton: '完成',
     jlzmc: '剂量组名称  ',

src/lang/zh/template/lba.js

@@ -47,7 +47,7 @@ export default {
     dwbh: '动物编号',
     zzlx: '组织类型',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量'
+    ysyjrybjrl: '预设匀浆溶液加入量',
+    sjyjrybjrl: '实际匀浆溶液加入量'
   }
 }

src/lang/zh/template/pcr.js

@@ -36,6 +36,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: '处理批编号',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -74,9 +75,10 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
   },
    pcr009: {
     clsj: '处理时间',
@@ -99,6 +101,13 @@ export default {
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
   },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
+  },
   pcr012: {
     sjwj: '数据文件',
     hsndcdwjm: '核酸浓度测定文件名',

src/lang/zh/template/sp.js

@@ -58,7 +58,10 @@ export default {
   sp007: {
     title: '生物样品分析样本处理表',
     ybsm: '样本说明',
-    bt: '标题'
+    bt: '标题',
+    clhxx: '处理后信息',
+    hjsj: '处理后样品放入进样环境时间',
+    cfwz: '存放位置'
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {

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

@@ -385,7 +385,7 @@ export default {
               nddw: '',
               ly: 'ELN配制',
               sxrq: null,
-              kc: item.jzjrtj + header1.targetDiluentVolumeUnit,
+              kc: item.jzjrtj,
               kcdw: header1.targetDiluentVolumeUnit,
               syl: null,
               type: null, //生成的时候传null

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

@@ -663,6 +663,7 @@ export default {
     },
     //完成
     clickFinish() {
+      let that=this
       // 获取表单数据
       const { jzs, jlzsl, pxms, qsbh, stepTableFormData = [] } = this.getFilledFormData();
       // 初始化列配制数组
@@ -672,6 +673,7 @@ export default {
       columns.push({
         prop: 'jlzb',
         label: 'template.dl.dl006.jlzb',
+            width: 150,
         bodyType: 'input',
         bodyFillType: 'preFill', // 修复：原bodyTypeFillType拼写错误
       });
@@ -685,7 +687,7 @@ export default {
             bodyType: 'checkbox',
             isNeedCheck: true,
             bodyFillType: 'actFill', // 修复：actFill改为preFill，与数据填充类型匹配
-            width: 300,
+            width: 250,
             checkboxLabel:'',
             headerColumns: [
               {
@@ -732,9 +734,12 @@ export default {
         prop: 'gspcdqk',
         label: 'template.dl.dl006.gspcdqk',
         bodyType: 'input',
+            width: 150,
+
         bodyFillType: 'actFill', // 修复：原bodyTypeFillType拼写错误
       });
 
+      debugger
       // 关键修复1：先更新列配制，确保表格能识别字段
       this.rawCzxxColumns = [...columns]; // 解构赋值触发响应式更新
       this.$nextTick(() => { // 等待列配制更新完成后再赋值数据
@@ -753,6 +758,7 @@ export default {
             const rowData = {
               jlzb: stepTableFormData[doseIndex]?.jlzmc || '', 
               gspcdqk: '',
+              id:that.getuuid()
               // 初始化动态列字段，避免undefined
             };
             newDataSource.push(rowData);

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

@@ -471,6 +471,7 @@ export default {
 
     // 处理成像情况前序表单选择
     handleCxqkQxbdSelect(row) {
+      let that=this
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
 
@@ -494,10 +495,17 @@ export default {
         }
 
         // 2. 生成表格数据
-        const tableData = this.generateTableData(
+        const tableData1 = this.generateTableData(
           stepTableFormData_1,
           dynamicColumns.columnKeys
         )
+        let tmp=[]
+        _.forEach(tableData1,function(item){
+            let a=item
+            a.id=that.getuuid()
+            tmp.push(a)
+        })
+       const  tableData=tmp
         if (tableData.length === 0) {
           this.clearCxqkTable()
           return
@@ -521,7 +529,7 @@ export default {
       if (columnKeys.length === 0) {
         return null
       }
-
+debugger
       const columns = [
         {
           label: 'template.dl.dl008.jlzb',

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

@@ -586,6 +586,7 @@ export default {
 
     // 处理结果信息前序表单选择
     handleJgxxQxbdSelect(row, savedYqsyData) {
+      let that=this
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
 
@@ -614,10 +615,19 @@ export default {
         }
 
         // 2. 生成表格数据
-        const tableData = this.generateJgxxTableData(
+        const tableData1 = this.generateJgxxTableData(
           stepTableFormData_1,
           dynamicColumns.columnKeys
         )
+
+          let tmp=[]
+        _.forEach(tableData1,function(item){
+            let a=item
+            a.id=that.getuuid()
+            tmp.push(a)
+        })
+        const  tableData=tmp
+
         if (tableData.length === 0) {
           this.clearJgxxTable()
           return

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

@@ -216,22 +216,6 @@ export default {
             }
           }
         },
-        {
-          type: 'cellItem',
-          label: 'template.dl.dl010.jprq',
-          config: {
-            startDate: {
-              label: 'template.dl.dl010.jprqKssj',
-              type: 'input',
-              disabled: true
-            },
-            endDate: {
-              label: 'template.dl.dl010.jprqJssj',
-              type: 'input',
-              disabled: true
-            }
-          }
-        }
       ]
     },
     // 采集信息列表

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

@@ -289,7 +289,7 @@ export default {
       this.$nextTick(() => {
         this.$refs[refConf.pyxx]?.updateFormData(
           'pytjText',
-          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%',
           { isUpdateRecord: false, signData: null }
         )
       })

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

@@ -273,7 +273,7 @@ export default {
       this.$nextTick(() => {
         this.$refs[refConf.pyxx]?.updateFormData(
           'pytjText',
-          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%',
           { isUpdateRecord: false, signData: null }
         )
       })

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

@@ -29,6 +29,7 @@
 
           <LineLabel label="template.dl.dl015.xbxx" />
           <BaseInfoFormPackage
+            fieldItemLabel="template.dl.dl015.xbxx"
             :ref="refConf.xbInfo"
             :formConfig="xbInfoFormConfig"
             :formData="formData"
@@ -38,6 +39,7 @@
           <!-- 换液情况 -->
           <LineLabel label="template.dl.dl015.hyqk" />
           <CustomTable
+            fieldItemLabel="template.dl.dl015.hyqk"
             :columns="hyqkColumns"
             :ref="refConf.hyqk"
             @onRegentSubmit="(e) => onRegentSubmit(e)"

src/views/business/comps/template/comps/gsp/GSP015.vue

@@ -15,84 +15,126 @@
 					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
 						@click="onAdd('ybsmDataList')">新增</el-button>
 					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
-						@click="onExport">导出</el-button>
-					<div v-for="(item, index) in formData.ybsmDataList" :key="item.id" class="template-form-item">
-						<div class="config-header">
-							<div></div>
-							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ybsmDataList')">
-								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
-									icon="el-icon-delete">{{
-										$t('template.common.deleteBtn')
-									}}</el-button>
-							</el-popconfirm>
-						</div>
-						<BaseInfoFormPackage fieldItemLabel="取样进样信息" :ref="`ybsmFormPackageRef${index}`"
-							@clickButton="(e,d,key,formFields) => handleClickButton(e,d,key,formFields,index)"
-							:formConfig="ybsmFormConfig" :formData="item" />
-						<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
-							:showOperation="fillType === 'actFill' || fillType === 'preFill'"
-							:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
-							fieldItemLabel="取样进样信息" :formData="item">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'qy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-						<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
-							fieldItemLabel="取样进样信息" @blur="(e) => onHandleTableBlur(e, index, 'jyTableRef')"
-							:showOperation="fillType === 'actFill'" :showAddRow="false"
-							:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'jy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-					</div>
+						@click="onExportXqjyxx">导出</el-button>
+					<vue-html2pdf :show-layout="true" pdf-content-width="100%" pdf-format="a2" :pdf-quality="2"
+						:float-layout="false" pdf-orientation="landscape" :paginate-elements-by-height="0"
+						:enable-download="false" :preview-modal="false" filename="取样进样信息" :html-to-pdf-options="{
+							margin: [10, 5, 10, 5], // 格式: [上, 右, 下, 左] (单位: mm)
+							// 或者使用对象格式
+							// margin: { top: 20, right: 15, bottom: 20, left: 15 },
+							filename: 'document.pdf',
+							image: {
+								type: 'jpeg',
+								quality: 2
+							},
+							enableLinks: false,
+							html2canvas: {
+								scale: 2,
+								useCORS: true
+							},
+							jsPDF: {
+								unit: 'mm',           // 单位: mm
+								format: 'a2',          // 纸张大小
+								orientation: 'landscape' // 方向
+							}
+						}" ref="html2PdfXqjyxx" @beforeDownload="handleBeforeDownload" @progress="onProgressXqjyxx">
+						<section slot="pdf-content">
+							<div v-for="(item, index) in formData.ybsmDataList" :key="item.id"
+								class="template-form-item">
+								<div class="config-header">
+									<div></div>
+									<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ybsmDataList')">
+										<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+											icon="el-icon-delete">{{
+												$t('template.common.deleteBtn')
+											}}</el-button>
+									</el-popconfirm>
+								</div>
+								<BaseInfoFormPackage fieldItemLabel="取样进样信息" :ref="`ybsmFormPackageRef${index}`"
+									@clickButton="(e, d, key, formFields) => handleClickButton(e, d, key, formFields, index)"
+									:formConfig="ybsmFormConfig" :formData="item" />
+								<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
+									:showOperation="fillType === 'actFill' || fillType === 'preFill'"
+									:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
+									fieldItemLabel="取样进样信息" :formData="item">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'qy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+								<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
+									fieldItemLabel="取样进样信息" @blur="(e) => onHandleTableBlur(e, index, 'jyTableRef')"
+									:showOperation="fillType === 'actFill'" :showAddRow="false"
+									:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'jy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+							</div>
+						</section>
+					</vue-html2pdf>
 					<LineLabel label="二次稀释信息" />
 					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
 						@click="onAdd('ecDataList')">新增</el-button>
 					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
-						@click="onExport('ec')">导出</el-button>
-					<div v-for="(item, index) in formData.ecDataList" :key="item.id" class="template-form-item">
-						<div class="config-header">
-							<div></div>
-							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ecDataList')">
-								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
-									icon="el-icon-delete">{{
-										$t('template.common.deleteBtn')
-									}}</el-button>
-							</el-popconfirm>
-						</div>
-						<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
-							:formConfig="ecFormConfig" :formData="item" />
-						<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
-							fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
-							:showOperation="fillType === 'preFill' || fillType === 'actFill'"
-							@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'jy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-					</div>
+						@click="onExportEcxsxx()">导出</el-button>
+					<vue-html2pdf :show-layout="true" pdf-content-width="100%" pdf-format="a2" :pdf-quality="2"
+						:float-layout="false" pdf-orientation="landscape" :paginate-elements-by-height="0"
+						:enable-download="false" :preview-modal="false" filename="二次稀释信息" :html-to-pdf-options="{
+							margin: [10, 5, 10, 5], // 格式: [上, 右, 下, 左] (单位: mm)
+							// 或者使用对象格式
+							// margin: { top: 20, right: 15, bottom: 20, left: 15 },
+							filename: 'document.pdf',
+							image: {
+								type: 'jpeg',
+								quality: 2
+							},
+							enableLinks: false,
+							html2canvas: {
+								scale: 2,
+								useCORS: true
+							},
+							jsPDF: {
+								unit: 'mm',           // 单位: mm
+								format: 'a2',          // 纸张大小
+								orientation: 'landscape' // 方向
+							}
+						}" ref="html2PdfEcxsxx" @beforeDownload="handleBeforeDownload" @progress="onProgressEcxsxx">
+						<section slot="pdf-content">
+							<div v-for="(item, index) in formData.ecDataList" :key="item.id" class="template-form-item">
+								<div class="config-header">
+									<div></div>
+									<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ecDataList')">
+										<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+											icon="el-icon-delete">{{
+												$t('template.common.deleteBtn')
+											}}</el-button>
+									</el-popconfirm>
+								</div>
+								<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
+									:formConfig="ecFormConfig" :formData="item" />
+								<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
+									fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
+									:showOperation="fillType === 'preFill' || fillType === 'actFill'"
+									@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'jy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+							</div>
+						</section>
+					</vue-html2pdf>
 					<Step :ref="`stepRef`" :formData="formData.stepData || []"></Step>
 
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
@@ -108,6 +150,7 @@
 import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion";
 
+import VueHtml2pdf from 'vue-html2pdf'
 import LineLabel from "@/components/Template/LineLabel";
 import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
@@ -118,7 +161,9 @@ import { getuuid, justUpdateFilledFormData } from "@/utils/index";
 import { isCommonUnit } from "@/utils/conTools";
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
+import { getToken } from "@/utils/auth"
 import moment from "moment";//时间处理
+import { studyFormFill_exportTbByFileUrl } from "@/api/business/study/studyFormFill"
 import { getBaseInfoFormConfig, getRemarkFormConfig, getYbsmFormConfig, getQyTableColumns, getJyTableColumns, getEcFormConfig } from "../../formConfig/gsp/gsp015";
 const refConfig = {
 	baseInfoRef: "baseInfoRef",
@@ -128,7 +173,7 @@ const refConfig = {
 const compRefs = Object.values(refConfig);
 export default {
 	name: "SP0021",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion },
+	components: { BaseInfoFormPackage, LineLabel, VueHtml2pdf, TableList, Step, CustomTable, TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -170,56 +215,122 @@ export default {
 		return {
 			refConfig,
 			currentIndex: -1,
+			appTitle: process.env.VUE_APP_TITLE,
+			baseUrl: process.env.VUE_APP_FILE_DOMAIN,
+			uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
 		};
 	},
 	mounted() {
 
 	},
 	methods: {
-		onConfigComplete(e,type){
-			const {rowData,headerSelectFields} = e;
+		//获取文件blog
+		async handleBeforeDownload({ html2pdf, options, pdfContent }) {
+			this.$modal.loading()
+			// 1. 使用 html2pdf 手动构建 PDF，并获取底层的 jsPDF 实例
+			const pdf = await html2pdf()
+				.set(options)      // 应用你的配制选项
+				.from(pdfContent)  // 指定 PDF 内容
+				.toPdf()           // 转换为 PDF
+				.get('pdf');       // 获取 jsPDF 实例
+
+			// 2. 从 jsPDF 实例中输出 Blob 对象
+			const blob = pdf.output('blob');
+
+			// 3. 将 Blob 上传到你的服务器
+			await this.uploadPdfToServer(blob);
+
+			// 注意：如果你还想让文件自动下载，可以在这里调用 .save()
+			// pdf.save('my-document.pdf');
+		},
+		//上传到服务器
+		async uploadPdfToServer(blob) {
+			let that=this
+			const formData = new FormData();
+			formData.append('file', blob, 'hxhq-export-form.pdf');
+			try {
+				const response = await fetch(this.uploadFileUrl, {
+					method: 'POST',
+					headers: {
+						Authorization: "Bearer " + getToken(),
+					},
+					body: formData
+				});
+				// 检查响应状态
+				if (!response.ok) {
+					// 如果响应不成功，可以尝试获取错误信息
+					const errorData = await response.json().catch(() => ({}));
+					throw new Error(errorData.message || `HTTP error! status: ${response.status}`);
+				}
+				// 获取 JSON 数据
+				const data = await response.json();
+				// console.log('返回的JSON数据:', data);
+				if (data.code == 200) {
+					studyFormFill_exportTbByFileUrl(
+						{
+							url: data.data.url,
+							studyFormFillId:that.formData.id,
+							version: that.appTitle,
+							lang: that.$store.getters.language.split("_")[0]
+						}
+					).then(response => {
+						window.open(that.baseUrl + response.msg)
+					}).finally(() => {
+						this.$modal.closeLoading()
+					})
+				} else {
+					this.$modal.msgError(data.msg)
+					this.$modal.closeLoading()
+				}
+			} catch (error) {
+				this.$modal.msgError("导出失败，稍后再试")
+				this.$modal.closeLoading()
+			}
+		},
+		onConfigComplete(e, type) {
+			const { rowData, headerSelectFields } = e;
 			let params = {
 				studySubjectId: this.formData.studySubjectId,
 				studyId: this.formData.studyId,
 				studyFormId: this.formData.id,
 			};
-			if(type === 'qy'){
-				 params = {
+			if (type === 'qy') {
+				params = {
 					...params,
-					bh:rowData.qybh,//编号
-					nd:rowData.sjzjnd,//浓度
-					nddw:headerSelectFields.sjzjnddw,//浓度单位
-					kc:rowData.sjqyl,//库存
-					kcdw:headerSelectFields.sjqydw,//库存单位
+					bh: rowData.qybh,//编号
+					nd: rowData.sjzjnd,//浓度
+					nddw: headerSelectFields.sjzjnddw,//浓度单位
+					kc: rowData.sjqyl,//库存
+					kcdw: headerSelectFields.sjqydw,//库存单位
 				}
-			}else if(type === 'jy'){
-				 params = {
+			} else if (type === 'jy') {
+				params = {
 					...params,
-					bh:rowData.jybh,//编号
-					nd:rowData.sjjynd,//浓度
-					nddw:headerSelectFields.sjjynddw,//浓度单位
-					kc:rowData.ztj,//库存
-					kcdw:headerSelectFields.ztjdw,//库存单位
+					bh: rowData.jybh,//编号
+					nd: rowData.sjjynd,//浓度
+					nddw: headerSelectFields.sjjynddw,//浓度单位
+					kc: rowData.ztj,//库存
+					kcdw: headerSelectFields.ztjdw,//库存单位
 				}
 			}
 			this.configCompleteRequest(params)
 		},
-		onPrintTag(e,index){
-			console.log(e,index,"onPrintTag")
+		onPrintTag(e, index) {
+			console.log(e, index, "onPrintTag")
 		},
-		handleClickButton(item,signData,key,formFields,index){
+		handleClickButton(item, signData, key, formFields, index) {
 			const ref = this.$refs[`ybsmFormPackageRef${index}`][0];
-			if(key === "startButton"){
-				ref.updateFormData("qysj",moment().format("YYYY/MM/DD HH:mm:ss"),{ isUpdateRecord: true, signData })
-			}else if(key === "endButton"){
+			if (key === "startButton") {
+				ref.updateFormData("qysj", moment().format("YYYY/MM/DD HH:mm:ss"), { isUpdateRecord: true, signData })
+			} else if (key === "endButton") {
 				const qysj = formFields.qysj;
-				if(!qysj){
+				if (!qysj) {
 					this.$message.error("请先记录开始时间");
 					return;
 				}
-				const subQysj = qysj.substr(0,19)
+				const subQysj = qysj.substr(0, 19)
 				const endTime = moment().format("YYYY/MM/DD HH:mm:ss");
-				ref.updateFormData("qysj",`${subQysj} ~ ${endTime}`,{ isUpdateRecord: true, signData })
+				ref.updateFormData("qysj", `${subQysj} ~ ${endTime}`, { isUpdateRecord: true, signData })
 			}
 		},
 		onHandleTableBlur(e, index, refName) {
@@ -234,7 +345,7 @@ export default {
 				const { bdtjdw, qytjdw, jytjdw, qynddw, ztjdw, sjjynddw } = headerSelectFields || {};
 
 				//将标定体积的单位转换成和终体积单位一致再计算；
-			
+
 
 				if (!!bdtj && !!qytj) {
 					const transBdtj = volumeConverter.convert(bdtj + bdtjdw, ztjdw);//转换后的标定体积
@@ -277,8 +388,43 @@ export default {
 			this.addEcTableRow(index, "jyTableRef");
 
 		},
-		onExport() {
-
+		//生成进度
+		onProgressXqjyxx(progress) {
+			console.log(`生成进度: ${progress}%`)
+			this.removePageBreak()
+			if (progress == 100) {
+				this.$modal.closeLoading()
+			} else {
+				this.$modal.loading()
+			}
+		},
+		//移除分页空白
+		removePageBreak() {
+			document.querySelectorAll('.html2pdf__page-break').forEach(el => {
+				el.remove()
+			})
+		},
+		onExportXqjyxx() {
+			this.$modal.loading()
+			setTimeout(() => {
+				this.$refs.html2PdfXqjyxx.generatePdf()
+			}, 200);
+		},
+		//生成进度
+		onProgressEcxsxx(progress) {
+			console.log(`生成进度: ${progress}%`)
+			this.removePageBreak()
+			if (progress == 100) {
+				this.$modal.closeLoading()
+			} else {
+				this.$modal.loading()
+			}
+		},
+		onExportEcxsxx() {
+			this.$modal.loading()
+			setTimeout(() => {
+				this.$refs.html2PdfEcxsxx.generatePdf()
+			}, 200);
 		},
 		//删除样本说明
 		deleteConfig(item, type = "ybsmDataList") {

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

@@ -144,6 +144,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{

src/views/business/comps/template/comps/pcr/PCR005.vue

@@ -148,6 +148,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -187,7 +200,7 @@ export default {
 				},
 				{
 					type: "cellItem",
-					label: 'template.common.configurationTime',
+					label: 'template.pcr.pcr005.clsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',

src/views/business/comps/template/comps/pcr/PCR008.vue

@@ -127,6 +127,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -320,12 +333,12 @@ export default {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
 						console.log(item)
-						let lzzcz = item.lzzcz
+						let lzzgz = item.lzzgz
 						let cjgz = item.cjgz
 						let tabZzzl;
 						// 组织重量 =  连组织称重 减去 采集管重
-						if(lzzcz && cjgz) {
-							let temp = subTj([lzzcz, cjgz], [content.headerSelectFields.lzzczUnit, content.headerSelectFields.cjgzUnit])
+						if(lzzgz && cjgz) {
+							let temp = subTj([lzzgz, cjgz], [content.headerSelectFields.lzzgzUnit, content.headerSelectFields.cjgzUnit])
 							let zzzl = temp.total
 							let zzzlUnit = temp.unit
 							tabZzzl = volumeConverter.convert(zzzl + zzzlUnit, content.headerSelectFields.zzzlUnit)

src/views/business/comps/template/comps/pcr/PCR010.vue

@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -258,8 +271,8 @@ export default {
 						let cqzl = item.cqzl * bs
 						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
+						let ysyjryjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjryjrlUnit)
+						tableList[i].ysyjryjrl = ysyjryjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);

src/views/business/comps/template/comps/pcr/PCR011.vue

@@ -58,7 +58,7 @@ import { EventBus } from "@/utils/eventBus";
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
-import { getPCR010Config } from "../../formConfig/PCRTableConfig.js";
+import { getPCR011Config } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
@@ -74,7 +74,7 @@ export default {
 	},
 	computed: {
 		tableStepColumns() {
-			return getPCR010Config(this);
+			return getPCR011Config(this);
 		},
 		// 配制条件
 		storageFormConfig() {
@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -177,7 +190,7 @@ export default {
 					type: 'step',
 					config: {
 						yjry: {
-							label: 'template.pcr.pcr010.yjry',
+							label: 'template.pcr.pcr011.sj',
 							type: 'input',
 							fillType: 'preFill',
 							subType: 'sj',
@@ -185,17 +198,7 @@ export default {
 							subFillType: 'actFill',
 							maxlength: 20
 						},
-						bs: {
-							label: 'template.pcr.pcr010.bs',
-							type: 'inputNumber',
-							fillType: 'actFill',
-							maxlength: 20
-						},
-						dztpbh: {
-							label: 'template.pcr.pcr010.dztpbh',
-							type: 'yq',
-							fillType: 'actFill',
-						},
+
 					}
 				}
 			]
@@ -216,7 +219,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称'], 'PCR分析组织匀浆表-常规导入模板')
+			this.exportExcel(['样品名称'], 'PCR分析核酸提取样品处理表导入模板')
 		},
 		showImportExcelDialog() {
 			this.$refs.ImportExcelDialog.show()
@@ -249,18 +252,19 @@ export default {
 		updateTable() {
 			let content = this.getFilledFormData();
 
-			let bs = content.bs
 			content
 			if (this.fillType === "actFill") {
 				let tableList = content.stepTableFormData
 				if (tableList && tableList.length > 0) {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
-						let cqzl = item.cqzl * bs
-						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
+						let temp = subTj([item.ysjyztj, item.sjypjytj], [content.headerSelectFields.ysjyztjUnit, content.headerSelectFields.sjypjytjUnit])
+
+						let yssjjrtj = temp.total
+						let yssjjrtjUnit = temp.unit
+						yssjjrtj = volumeConverter.convert(yssjjrtj + yssjjrtjUnit, content.headerSelectFields.yssjjrtjUnit)
+						tableList[i].yssjjrtj = yssjjrtj
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);

src/views/business/comps/template/comps/pcr/PCR012.vue

@@ -130,6 +130,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{

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

@@ -46,6 +46,14 @@ export default {
 	name: "SP001",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
 	mixins: [templateMixin],
+	provide() {
+		return {
+			getMybh: ()=>{
+				const data = this.$refs['stepFormPackageRef'].getFilledFormData()
+				return {mybh:data.targetCode+data.targetCodeSn,maxVolume:data.targetActVolume,maxVolumeUnit:data.targetActVolumeUnit}
+			}
+		}
+	},
 	props: {
 		fillType: {
 			type: String,

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

@@ -18,10 +18,15 @@
 						ref="ybRef" :formConfig="ybFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					
 					<BaseInfoFormPackage fieldItemLabel="template.lba.lba003.fj" label="template.lba.lba003.fj"
 						ref="fjRef" :formConfig="getFjFormConfig" :formData="formData" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.sp.sp007.clhxx" label="template.sp.sp007.clhxx"
+					ref="clhxxRef" :formConfig="clhxxConfig" :formData="formData" @clickButton="handleClickButton" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+					ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				
 				</div>
 			</div>
@@ -41,7 +46,8 @@ import { getLatestSn } from '@/api/template';
 import { EventBus } from "@/utils/eventBus";
 import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es';
-import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig} from "../../formConfig/sp/SP007";
+import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig,getClhxxFormConfig} from "../../formConfig/sp/SP007";
+import moment from "moment";
 
 export default {
 	name: "SP007",
@@ -74,6 +80,10 @@ export default {
 		getFjFormConfig() {
 			return getfjFormConfig(this);
 		},
+		//处理后信息
+		clhxxConfig() {
+			return getClhxxFormConfig(this);
+		},
 		
 	},
 	data() {
@@ -84,6 +94,10 @@ export default {
 	mounted() {
 	},
 	methods: {
+		// 点击按钮
+		handleClickButton(item,signData){
+			this.$refs.clhxxRef.updateFormData("hjsj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		},
 		//打印标签
 		printTag() {
 			const printConfig = this.getBasePrintConfig();
@@ -96,11 +110,11 @@ export default {
 	
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"]);
 			return content;
 		},
 		getResource() {

src/views/business/comps/template/formConfig/PCRTableConfig.js

@@ -785,12 +785,12 @@ export const getPCR008Config = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: 'template.pcr.pcr008.lzzcz',
-      prop: 'lzzcz',
+      label: 'template.pcr.pcr008.lzzgz',
+      prop: 'lzzgz',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'lzzczUnit',
+      headerSelectKey: 'lzzgzUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -954,12 +954,12 @@ export const getPCR010Config = ($this) => {
       bodySubPlaceholder: 'template.common.xswsPlaceholder'
     },
     {
-      label: 'template.pcr.pcr009.ysyjrybjrl',
-      prop: 'ysyjrybjrl',
+      label: 'template.pcr.pcr009.ysyjryjrl',
+      prop: 'ysyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'ysyjrybjrlUnit',
+      headerSelectKey: 'ysyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -975,17 +975,82 @@ export const getPCR010Config = ($this) => {
       headerSelectTo: 'actStartSolutionVolumeUnit'
     },
     {
-      label: 'template.pcr.pcr009.sjyjrybjrl',
-      prop: 'sjyjrybjrl',
+      label: 'template.pcr.pcr009.sjyjryjrl',
+      prop: 'sjyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'sjyjrybjrlUnit',
+      headerSelectKey: 'sjyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      copyFrom: 'ysyjrybjrl', //复制哪个字段
+      copyFrom: 'ysyjryjrl', //复制哪个字段
       bodyMaxlength: 10
     }
   ]
 }
+
+// PCR010
+export const getPCR011Config = ($this) => {
+  return [
+    {
+      label: 'template.pcr.pcr010.ypmc',
+      prop: 'ypmc',
+      width: 280,
+      bodyType: 'input',
+      fillType: 'preFill',
+      otherCode: 'bhOther',
+      bodyFillType: 'preFill'
+    },
+    {
+      label: 'template.pcr.pcr011.ysjyztj',
+      prop: 'ysjyztj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'ysjyztjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'preFill',
+      bodyMaxlength: 10,
+      bodyDisabled: true,
+    },
+    {
+      label: 'template.pcr.pcr011.sjypjytj',
+      prop: 'sjypjytj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjypjytjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+     {
+      label: 'template.pcr.pcr011.yssjjrtj',
+      prop: 'yssjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'yssjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+    {
+      label: 'template.pcr.pcr011.sjsjjrtj',
+      prop: 'sjsjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjsjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+  ]
+}
+

src/views/business/comps/template/formConfig/gsp/gsp015.js

@@ -115,21 +115,21 @@ export const getQyTableColumns = ($this) => {
         {
             label: '取样编号',
             prop: 'qybh',
-            width: 280,
+            width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
         },
         {
             label: '制剂编号',
             prop: 'zjbh',
-            width: 280,
+            width: 200,
             bodyType: 'gsp',
             bodyFillType: 'actFill',
         },
         {
             label: '预设制剂浓度',
             prop: 'yszjnd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'yszjnddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -140,7 +140,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际制剂浓度',
             prop: 'sjzjnd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjzjnddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -176,7 +176,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '预设取样量',
             prop: 'ysqyl',
-            width: 280,
+            width: 200,
             headerSelectKey: 'ysqyldw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -188,7 +188,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际取样量',
             prop: 'sjqyl',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjqydw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -206,21 +206,21 @@ export const getJyTableColumns = ($this) => {
         {
             label: '进样编号',
             prop: 'jybh',
-            width: 280,
+            width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
         },
         {
             label: '取样编号',
             prop: 'qybh',
-            width: 280,
+            width: 200,
             bodyType: 'gsp',
             bodyFillType: 'actFill',
         },
         {
             label: '取样浓度',
             prop: 'qynd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'qynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -230,7 +230,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '取样体积',
             prop: 'qytj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'qytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -240,7 +240,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '标定体积',
             prop: 'bdtj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'bdtjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -250,7 +250,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '进样体积',
             prop: 'jytj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'jytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -260,7 +260,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '稀释倍数',
             prop: 'xsbs',
-            width: 280,
+            width: 200,
             bodyType: 'inputNumber',
             bodyFillType: 'actFill',
             bodySubType: "inputNumber",
@@ -273,7 +273,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '终体积',
             prop: 'ztj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'ztjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -289,7 +289,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '实际进样浓度',
             prop: 'sjjynd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjjynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),

src/views/business/comps/template/formConfig/paralleAndLadderConfig.js

@@ -568,18 +568,44 @@ export const getBaseInfoFormConfig = ($this) => {
               maxlength: 50
             }
           }
-        : {
-            studyMc: {
-              label: 'template.common.testName',
-              type: 'input',
-              disabled: true
-            },
-            studySn: {
-              label: 'template.common.testNumber',
-              type: 'input',
-              disabled: true
+        : isLba
+          ? {
+              studyMc: {
+                label: 'template.common.testName',
+                type: 'input',
+                disabled: true
+              },
+              studySn: {
+                label: 'template.common.testNumber',
+                type: 'input',
+                disabled: true
+              },
+              methodCode: {
+                label: 'template.common.methodCode',
+                type: 'input',
+                fillType: 'preFill',
+                maxlength: 50
+              },
+              versionNum: {
+                label: 'template.common.versionNumber',
+                type: 'inputNumber',
+                fillType: 'preFill',
+                prepend: 'V',
+                maxlength: 50
+              }
+            }
+          : {
+              studyMc: {
+                label: 'template.common.testName',
+                type: 'input',
+                disabled: true
+              },
+              studySn: {
+                label: 'template.common.testNumber',
+                type: 'input',
+                disabled: true
+              }
             }
-          }
     },
     {
       type: 'conditionItem',

src/views/business/comps/template/formConfig/sp/SP007.js

@@ -158,3 +158,30 @@ export const getfjFormConfig = () => {
     }
   ]
 }
+//处理后信息
+export const getClhxxFormConfig = ($this) => {
+  return [
+    {
+      type: 'cellItem',
+      config: {
+        hjsj: {
+          label: 'template.sp.sp007.hjsj',
+          type: 'input',
+          fillType: 'actFill',
+          maxlength: 200,
+          subType: 'button',
+          subKey: 'hjsjButton',
+          buttonName: 'template.yp.yp002.hqsj',
+          disabled: true,
+          subDisabled: $this.fillType !== 'actFill'
+        },
+        cfwz: {
+          label: 'template.sp.sp007.cfwz',
+          type: 'input',
+          fillType: 'actFill',
+          maxlength: 100
+        }
+      }
+    }
+  ]
+}

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

@@ -73,7 +73,8 @@ export default {
     'business_dl_uav', // 毒理-紫外照射操作记录表-UVA-DL023
     'business_pcr_fxffypzbb', //PCR-编号-分析方法学样品制备表
     'business_dl_xbx', //毒理-紫外照射操作记录表-细胞系
-    'business_dl_dwzs' //毒理-紫外照射操作记录表-动物种属
+    'business_dl_dwzs', //毒理-紫外照射操作记录表-动物种属
+    'business_dl_sjqqtqk' //毒理-细胞收集/低渗及固定操作记录表-收集前其他情况
   ],
   props: {
     templateData: {
@@ -433,7 +434,7 @@ export default {
       })
       const validFormData = await Promise.all(refs).catch((err) => {
         // this.$message.error(err);
-        if (err &&err.errorType && err.errorType === 'step') {
+        if (err && err.errorType && err.errorType === 'step') {
           this.$message.error('请添加步骤')
           return
         }

src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue

@@ -119,7 +119,10 @@ export default {
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.$emit('callback')
+      if(response.code == 200) {
+        this.$emit('callback')
+        this.cancel()
+      }
     },
     // 提交上传文件
     submitFileForm() {

src/views/business/resource/gsp/comps/rkjl/Xz.vue

@@ -54,8 +54,8 @@
           <!-- 有效期 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
-              <el-date-picker v-model="form.yxq" type="date" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" :placeholder="$t('form.placeholderInput')">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd  HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
           </el-col>

src/views/business/storageLocation/comps/StorageLocationImport.vue

@@ -119,7 +119,10 @@ export default {
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.$emit('callback')
+      if(response.code == 200) {
+        this.$emit('callback')
+        this.cancel()
+      }
     },
     // 提交上传文件
     submitFileForm() {

src/views/business/study/comp/wzlb/bacteriaList.vue

@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">

src/views/business/study/comp/wzlb/cellList.vue

@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">