Merge branch 'master' into zhangteng

.gitignore

@@ -18,6 +18,7 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+.history
 
 package-lock.json
 yarn.lock

src/components/Template/CustomTable.vue

@@ -539,7 +539,7 @@ export default {
 			if (this.templateFillType !== 'actFill') {
 				return
 			}
-			this.$emit("beforeReagentSubmit", { selectData: data, callback, key: col.prop, rowData: row })
+			this.$emit("beforeReagentSubmit", { selectData: data, callback, key: col.prop, rowData: row,headerSelectFields: this.headerSelectFields })
 		},
 		onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex) {
 			this.headerFields[`${colIndex}_${headerIndex}`] = inputValue;
@@ -563,7 +563,7 @@ export default {
 			// 	return
 			// }
 			this.updateDataSourceByRowIndex(rowIndex, { [key]: inputValue, [`selectInfo_${key}`]: data.selectInfo })
-			this.$emit("onRegentSubmit", { selectInfo: data, key, col, rowIndex, colIndex, rowData: row })
+			this.$emit("onRegentSubmit", { selectInfo: data, key, col, rowIndex, colIndex, rowData: row,headerSelectFields: this.headerSelectFields })
 		},
 		isShowAddRos() {
 			if (this.showAddRow !== undefined) {

src/components/Template/SelectTable.vue

@@ -12,6 +12,7 @@
                 <el-form-item>
                     <el-button type="primary" @click="onSearch">{{$t('form.search')}}</el-button>
                     <el-button @click="reset">{{ $t('form.reset') }}</el-button>
+                    <el-button type="success" @click="gotoYq" v-if="showYqButton" :disabled="isDisabled">{{ $t('form.jzyqk') }}</el-button>
                 </el-form-item>
             </el-form>
             <el-table :data="dataSource" :row-key="(row) => row.id" @selection-change="handleSelectionChange">
@@ -85,6 +86,10 @@ export default {
             type: [String,Number],
             default: "",
         },
+        showYqButton: {//是否显示跳转仪器库按钮
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -102,6 +107,14 @@ export default {
             dataSource: []
         }
     },
+    computed: {
+        isDisabled() {
+            if (!this.localSelectedId) {
+                return true;
+            }
+            return false;
+        }
+    },
     watch: {
         selectedId: {
             immediate: true,
@@ -169,6 +182,13 @@ export default {
             this.localSelectedRows = selection;
             this.$emit("radioSelect","", selection);
         },
+        gotoYq() {
+            if(!this.localSelectedId){
+                this.$message.warning('请选择仪器')
+                return;
+            }
+            window.open(`http://172.21.10.168:9999/#/hx_business/use_record?yqCode=${this.localSelectedId}`,'_blank');
+        },
     }
 
 }

src/lang/en.js

@@ -134,7 +134,9 @@ export default {
     operationSuccess: 'Operation Successful',
     OperationFailed: 'Operation Failed',
 
-    selectMember: 'Select User'
+    selectMember: 'Select User',
+
+    jzyqk: 'Jump to Instrument Library'
   },
   login: {
     title: 'Welcome',

src/lang/en/template/dl.js

@@ -6,9 +6,9 @@ const common = {
   czsj: 'Operation Time',
   kssj: 'Start Time',
   jssj: 'End Time',
-  sysj: 'Test Reagent Information',
-  sjmc: 'Solution Name',
-  bh: 'Item Number',
+  sysj: 'Study Reagent',
+  sjmc: 'Reagent Name',
+  bh: 'ID',
   ph: 'Batch Number',
   ndhlcd: 'Concentration/Content/Purity',
   ly: 'Source',
@@ -17,10 +17,10 @@ const common = {
   yqmc: 'Instrument Name',
   yqxh: 'Instrument Model',
   yqbh: 'Instrument ID',
-  xccsjzjdrq: 'Next Test/Calibration/Verification Date',
+  xccsjzjdrq: 'Test/Calibration/Verification Date',
   xbxx: 'Cell Information',
-  qxbd: 'Previous Form',
-  bltj: 'Exposure Conditions',
+  qxbd: 'Preceding Form',
+  bltj: 'Exposure Condition',
   czbz: 'Operation Workflow',
   bz: 'Comment',
   mc: 'Name',
@@ -75,8 +75,8 @@ export default {
   dl007: {
     ...common,
     czxx: 'Operation Information',
-    pykssj: 'Cultivation Start Time',
-    pyjssj: 'Cultivation End Time',
+    pykssj: 'Incubation Start Time',
+    pyjssj: 'Incubation End Time',
     jsButton: 'End',
     yqsyxxEmpty:
       'Instrument usage information has not been filled in, please fill in before submitting'
@@ -85,11 +85,11 @@ export default {
     ...common,
     cxqk: 'Imaging Status',
     wrqk: 'Contamination Status',
-    jlzb: 'Dosage / Dosage Group',
-    jzbh1: 'Strain Number',
-    jzbh2: 'Strain Number',
-    jzbh3: 'Strain Number',
-    jzbh4: 'Strain Number',
+    jlzb: 'Dose Group',
+    jzbh1: 'Strain ID',
+    jzbh2: 'Strain ID',
+    jzbh3: 'Strain ID',
+    jzbh4: 'Strain ID',
     yqsyxxEmpty:
       'Instrument usage information has not been filled in, please fill in before submitting',
     cxqkEmpty:
@@ -97,16 +97,16 @@ export default {
   },
   dl009: {
     ...common,
-    clxx: 'Processing Information',
+    clxx: 'Treatment Condition',
     clbh: 'Processing Number',
-    cltj: 'Processing Conditions',
-    jgxx: 'Result Information',
-    qxbd: 'Previous Form',
-    jlzb: 'Dosage / Dosage Group',
-    jzbh: 'Strain Number',
+    cltj: 'Treatment Condition',
+    jgxx: 'Result',
+    qxbd: 'Preceding Form',
+    jlzb: 'Dose Group',
+    jzbh: 'Strain ID',
     czqk: 'Precipitation Status',
     bjjt: 'Background Lawn',
-    jls: 'Colony Count',
+    jls: 'Colony Number',
     czqkDesc:
       'Precipitation codes: "P-" = "None"; "P+" = "Slight"; "P++" = "Moderate"; "P+++" = "Severe".',
     bjjtDesc:
@@ -120,91 +120,91 @@ export default {
   },
   dl010: {
     ...common,
-    dwzs: 'Species',
+    dwzs: 'Animal Species',
     cjdd: 'Collection Location',
-    zpdd: 'Slide Preparation Location',
+    zpdd: 'Slide Preparing Location',
     cjbw: 'Collection Site',
-    jprq: 'Dissection Date',
+    jprq: 'Anatomy Date',
     jprqKssj: 'Start Time',
     jprqJssj: 'End Time',
-    sjmc: 'Solution Name',
-    bh: 'Item Number',
+    sjmc: 'Reagent Name',
+    bh: 'ID',
     ph: 'Batch Number',
-    ndhlcd: 'Concentration or Range',
+    ndhlcd: 'Concentration/Content/Purity',
     ly: 'Source',
     sxr: 'Expiration Date',
-    yqsybh: 'Instrument Usage Number',
+    yqsybh: 'Instrument ID',
     mc: 'Name',
     zcqk: 'Status/Condition/Performance',
     sjxx: 'Collection Information',
     rqxz: 'Container Selection',
     xzmb: 'Download Template',
     dr: 'Import',
-    dwbh: 'Animal Number',
-    yslhnzsjyjrl: 'Preset 0.9% Sodium Chloride Injection Volume',
-    sjlhnzsjyjrl: 'Actual 0.9% Sodium Chloride Injection Volume',
-    sjgs: 'Bone Marrow Collection',
-    sj: 'Collection',
+    dwbh: 'Animal ID',
+    yslhnzsjyjrl: 'Expected Volume of 0.9% Sodium Chloride Injection',
+    sjlhnzsjyjrl: 'Actual Volume of 0.9% Sodium Chloride Injection',
+    sjgs: 'Collect Bone Marrow',
+    sj: 'Collect',
     gusui: 'Bone Marrow',
-    lx: 'Centrifugation',
-    ysjrxq: 'Preset Serum Addition',
-    sjjrxq: 'Actual Serum Addition',
+    lx: 'Centrifuge',
+    ysjrxq: 'Expected Added Serum',
+    sjjrxq: 'Actual Added Serum',
     dwxb: 'Gender',
     dwzl: 'Animal Species',
-    xcqkxzjd: 'Next Test/Calibration/Verification Date',
+    xcqkxzjd: 'Test/Calibration/Verification Date',
     sjsj: 'Collection Time'
   },
   dl011: {
     ...common,
-    fxbz: 'Resuscitation Steps',
-    pyxx: 'Culture Information',
+    fxbz: 'Revival Step',
+    pyxx: 'Incubation Information',
     xbxx: 'Cell Information',
     xbmc: 'Cell Name',
-    xbdcbh: 'Cell Cryopreservation Number',
-    fshxbbh: 'Cell Number After Resuscitation',
-    fshxbyjtj: 'Expected Cell Volume After Resuscitation',
-    fshxbsjtj: 'Actual Cell Volume After Resuscitation',
-    pyxbh: 'Incubator Number',
-    pytjText: 'Culture Conditions',
-    pykssj: 'Culture Start Time',
+    xbdcbh: 'Cell Cryopreservation ID',
+    fshxbbh: 'Revival Cell ID',
+    fshxbyjtj: 'Expected Recovered Cell Volume',
+    fshxbsjtj: 'Actual Recovered Cell Volume',
+    pyxbh: 'Incubator ID',
+    pytjText: 'Incubation Condition',
+    pykssj: 'Incubation Start Time',
     pykssjButton: 'Start',
     bqdy: 'Label Print',
-    gcbz:'View Remark',
-    czrqm:'Signed By',
-    czrqmsj:'Date',
-    xbfshzk:'Post-thaw cell condition'
+    gcbz: 'ObservationComment',
+    czrqm: 'Operator Signature',
+    czrqmsj: 'Operator Signature Date',
+    xbfshzk: 'Post-Revival Cell Status'
   },
   dl012: {
     ...common,
-    zbbz: 'Preparation Steps',
-    pyxx: 'Culture Information',
+    zbbz: 'Preparation Step',
+    pyxx: 'Incubation Information',
     xbxx: 'Cell Information',
     xbmc: 'Cell Name',
-    xbzbqbh: 'Cell Number Before Preparation',
-    zbxbs: 'Number of Cells Prepared',
-    zbhxbbh: 'Cell Number After Preparation',
-    zbhxbyjtj: 'Expected Cell Volume After Preparation',
-    zbhxbsjtj: 'Actual Cell Volume After Preparation',
-    pyxbh: 'Incubator Number',
-    pytjText: 'Culture Conditions',
-    pykssj: 'Culture Start Time',
+    xbzbqbh: 'Cell ID before Preparation',
+    zbxbs: 'Number of Prepared Cells',
+    zbhxbbh: 'Prepared Cell ID',
+    zbhxbyjtj: 'Expected Cell Volume after Preparation',
+    zbhxbsjtj: 'Actual Cell Volume after Preparation',
+    pyxbh: 'Incubator ID',
+    pytjText: 'Incubation Condition',
+    pykssj: 'Incubation Start Time',
     pykssjButton: 'Start'
   },
   dl013: {
     ...common,
     cdxx: 'Measurement Information',
     xbmc: 'Cell Name',
-    xbbh: 'Cell Number',
+    xbbh: 'Cell ID',
     xbxytj: 'Cell Suspension Volume',
-    sjmcdptj: 'Actual Volume per Drop (ul)',
+    sjmcdptj: 'Actual Volume',
     cdcs: 'Measurement Times',
-    pjxbmd: 'Average Cell Density',
-    xsbs: 'Dilution Factor',
-    xbmd: 'Cell Density (cells/ml)',
-    zsg: 'Upper Left Grid (cells)',
-    ysg: 'Upper Right Grid (cells)',
-    zxg: 'Lower Left Grid (cells)',
-    yxg: 'Lower Right Grid (cells)',
+    pjxbmd: 'Average Density of Cell',
+    xsbs: 'Dilution Ratio',
+    xbmd: 'Cell Density',
+    zsg: 'Upper Left Grid（Number）',
+    ysg: 'Upper Right Grid（Number）',
+    zxg: 'Bottom Left Grid（Number）',
+    yxg: 'Bottom Right Grid（Number）',
     cdxxTime: 'Time {index}',
     addCdxx: 'Add',
     yqsyxxEmpty:
@@ -214,28 +214,28 @@ export default {
   },
   dl014: {
     ...common,
-    gyzjxx: 'Dose Formulation Check-in',
+    gyzjxx: 'Dosage Form Information',
     wzly: 'Material Source',
     xbmc: 'Cell Name',
-    jlzpzxx: 'Dose Group Preparation Information',
+    jlzpzxx: 'Dose Formulation Information',
     addJlz: 'Add Dose Group',
-    pxpb: 'Parallel Bottles',
-    sftjs9: 'Add S9',
-    s9hhybh: 'S9 Mix Number',
-    jlzzs: 'Dose Group Quantity',
+    pxpb: 'Number of Replicate Flasks',
+    sftjs9: 'Whether to add S9',
+    s9hhybh: 'S9 Mixture ID',
+    jlzzs: 'Number of Dose Group',
     jlzzmc: 'Dose Group Name',
     pyy: 'Culture Medium',
-    jlzb: 'Dosage / Dosage Group',
-    xybh: 'Suspension Number',
-    gysqgc: 'Pre-dose Observation',
-    ysplyjrl: 'Preset Culture Medium Volume',
-    sjplyjrl: 'Actual Culture Medium Volume',
-    yss9hhyjrl: 'Preset S9 Mix Volume',
-    sjs9hhyjrl: 'Actual S9 Mix Volume',
-    gspbh: 'Test Article Number',
-    ysgspjrl: 'Preset Test Article Volume',
-    sjgspjrl: 'Actual Test Article Volume',
-    gyhzqk: 'Post-dose Status',
+    jlzb: 'Dose Group',
+    xybh: 'Suspension ID',
+    gysqgc: 'Observation before dosing',
+    ysplyjrl: 'Expected Volume of Culture Medium Added',
+    sjplyjrl: 'Actual Volume of Culture Medium Added',
+    yss9hhyjrl: 'Expected Volume of S9 Mixture Added',
+    sjs9hhyjrl: 'Actual Volume of S9 Mixture Added',
+    gspbh: 'Test Item ID',
+    ysgspjrl: 'Expected Amount of Test Item Added',
+    sjgspjrl: 'Actual Amount of Test Item Added',
+    gyhzqk: 'Precipitation Status after Dosing',
     qrButton: 'Confirm',
     wcButton: 'Complete',
     yqsyxxEmpty:
@@ -244,14 +244,14 @@ export default {
   dl015: {
     ...common,
     hyqk: 'Medium Change Status',
-    jlzb: 'Dosage / Dosage Group',
-    xybh: 'Suspension Number',
-    hyqszqk: 'Growth Status',
-    hyqcdjqk: 'Precipitation Before Medium Change',
-    hyqqtqk: 'Other Conditions Before Medium Change',
-    qqpyy: 'Discard Culture Medium',
+    jlzb: 'Dose Group',
+    xybh: 'Suspension ID',
+    hyqszqk: 'Growth Status before Medium Change',
+    hyqcdjqk: 'Precipitation Status before Fluid Change',
+    hyqqtqk: 'Other Condition before Fluid Change',
+    qqpyy: 'Decant the Culture Medium',
     pbsxd: 'PBS Wash',
-    pyybrl: 'Culture Medium Volume Added'
+    pyybrl: 'Culture Medium Supplement Volume'
   },
   dl016: {
     xbxx: '细胞信息',

src/lang/en/template/gsp.js

@@ -53,34 +53,34 @@ export default {
     kspz: 'Start Configuring',
     pzkssj: 'Start Date',
     pzjssj: 'End Date',
-    sywzbhph: '试验物质编号/批号',
-    yrybhph: '源溶液编号/批号',
+    sywzbhph: 'Test Item ID/Batch Number',
+    yrybhph: 'Source Solution ID/Batch Number',
     yrymc: 'Source Solution Name',
-    yryyjtj: '源溶液预计体积',
-    yrysjtj: '源溶液实际体积',
-    yryyjnd: '源溶液预计浓度',
-    yrysjnd: '源溶液实际浓度',
-    yryxs: '源溶液系数',
-    sywzmc: '试验物资名称',
-    sywzzsxs: '试验物资折算系数',
-    sywzyjclz: '试验物质预计称量值',
-    sywzsjclz: '试验物质实际称量值',
-    rjbhph: '溶剂编号/批号',
+    yryyjtj: 'Expected Volume of Source Solution',
+    yrysjtj: 'Actual Volume of Source Solution',
+    yryyjnd: 'Expected Concentration of Source Solution',
+    yrysjnd: 'Actual Concentration of Source Solution',
+    yryxs: 'Source Solution Coefficient',
+    sywzmc: 'Test Item Name',
+    sywzzsxs: 'Test Item Refraction Coefficient',
+    sywzyjclz: 'Test Item Expected Weight',
+    sywzsjclz: 'Test Item Actual Weight',
+    rjbhph: 'Solution ID/Batch Number',
     rjmc: 'Solvent Name',
-    rjyjtj: '溶剂预计体积',
-    rjsjtj: '溶剂实际体积'
+    rjyjtj: 'Solution Expected Volume',
+    rjsjtj: 'Solution Actual Volume'
   },
   gsp007: {
-    bzqx: '标准曲线'
+    bzqx: 'Standard Curve'
   },
   gsp009: {
-    xtsyx: '系统适应性',
-    ypbh: '样品编号',
+    xtsyx: 'System Suitability',
+    ypbh: 'Sample ID',
     xz: 'Select',
-    zw: '作为系统适应性样品'
+    zw: 'System Suitability Sample '
   },
   gsp011: {
-    cl: '残留',
-    zw: '作为残留样品'
+    cl: 'Residual',
+    zw: 'Residual Sample '
   }
 }

src/lang/en/template/pcr.js

@@ -4,7 +4,6 @@ export default {
   pcr001: {}, //用的SP001
   // PCR分析工作液制备表
   pcr002: {
-    title: 'PCR分析工作液制备表',
     qsyry: 'Source Solution',
     ysqsyrynd: 'Expected Concentration of Source Solution',
     mbryyxzq: 'Validity Period of Target Solution',
@@ -37,82 +36,82 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: 'Analysis Batch Number',
-    clsj: '处理时间',
-    ypmc: '样品名称',
-    ypcsnd: '样品初始浓度',
-    sxbs: '稀释倍数',
-    ysypxytj: '预设样品吸样体积',
-    sjypxytj: '实际样品吸样体积',
-    ysxsyxytj: '预设稀释液吸样体积',
-    sjxsyxytj: '实际稀释液吸样体积',
-    ypznd: '样品终浓度',
+    clsj: 'Work Time',
+    ypmc: 'Sample Name',
+    ypcsnd: 'Initial Concentration of Sample',
+    sxbs: 'Dilution Factor',
+    ysypxytj: 'Expected Sample Extraction Volume',
+    sjypxytj: 'Actual Sample Extraction Volume',
+    ysxsyxytj: 'Expected Volume of Diluent',
+    sjxsyxytj: 'Actual Volume of Diluent',
+    ypznd: 'Final Sample Concentration',
     fj: 'Attachment',
   },
   pcr007: {
-    dztpbh: '电子天平编号',
-    ypmc: '样品名称',
+    dztpbh: 'Electronic Balance ID',
+    ypmc: 'Sample Name',
     cyqypgsjyjtjtj: '采样前样品管试剂预计添加体积',
     cyqypgsjsjtjtj: '采样前样品管试剂实际添加体积',
-    cjgzl: '采集管重量',
+    cjgzl: 'Collecting Tube weight',
     czsj: '称重时间',
     clpbh: 'Analysis Batch Number',
-    ypmc: '样品名称',
-    ypcsnd: '样品初始浓度',
-    sxbs: '稀释倍数',
-    ysypxytj: '预设样品吸样体积',
-    sjypxytj: '实际样品吸样体积',
-    ysxsyxytj: '预设稀释液吸样体积',
-    sjxsyxytj: '实际稀释液吸样体积',
-    ypznd: '样品终浓度',
+    ypmc: 'Sample Name',
+    ypcsnd: 'Initial Concentration of Sample',
+    sxbs: 'Dilution Factor',
+    ysypxytj: 'Expected Sample Extraction Volume',
+    sjypxytj: 'Actual Sample Extraction Volume',
+    ysxsyxytj: 'Expected Volume of Diluent',
+    sjxsyxytj: 'Actual Volume of Diluent',
+    ypznd: 'Final Sample Concentration',
     fj: 'Attachment',
   },
   pcr008: {
-    czb: '称重表',
+    czb: 'Weighing table',
     clsj: 'Work Time',
-    yjry: '匀浆溶液',
-    bs: '倍数',
-    yjyjry: '已加匀浆溶液',
-    dztpbh: '电子天平编号',
-    ypmc: '样品名称',
-    cjgz: '采集管重',
-    lzzcz: '连组织称重',
+    yjry: 'Homogenized Solution',
+    bs: 'Multiple',
+    yjyjry: 'Homogenized Solution Added',
+    dztpbh: 'Electronic Balance ID',
+    ypmc: 'Sample Name',
+    cjgz: 'Collecting Tube weight',
+    lzzcz: 'Tissue and Container Weight',
     lzzgz: '连组织管重',
-    zzzl: '组织重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    zzzl: 'Tissue Weight',
+    ysyjrybjrl: 'Expected Volume of Homogenized Solution',
+    sjyjrybjrl: 'Actual Volume of Homogenized Solution',
   },
   pcr009: {
     clsj: 'Work Time',
-    yjry: '匀浆溶液',
-    bs: '倍数',
-    yjyjry: '已加匀浆溶液',
-    ypmc: '样品名称',
-    zzz: '组织重',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    yjry: 'Homogenized Solution',
+    bs: 'Multiple',
+    yjyjry: 'Homogenized Solution Added',
+    ypmc: 'Sample Name',
+    zzz: 'Tissue Weight',
+    ysyjrybjrl: 'Expected Volume of Homogenized Solution',
+    sjyjrybjrl: 'Actual Volume of Homogenized Solution',
   },
   pcr010: {
     clsj: 'Work Time',
-    dztpbh: '电子天平编号',
-    yjry: '匀浆溶液',
-    bs: '倍数',
-    yjyjry: '已加匀浆溶液',
-    ypmc: '样品名称',
-    cqzl: '称取重量',
-    ysyjryjrl: '预设匀浆溶液加入量',
-    sjyjryjrl: '实际匀浆溶液加入量',
+    dztpbh: 'Electronic Balance ID',
+    yjry: 'Homogenized Solution',
+    bs: 'Multiple',
+    yjyjry: 'Homogenized Solution Added',
+    ypmc: 'Sample Name',
+    cqzl: 'Take Weight',
+    ysyjryjrl: 'Expected Volume of Homogenized Solution',
+    sjyjryjrl: 'Actual Volume of Homogenized Solution',
   },
   pcr011: {
-    sj: '试剂',
-    ysjyztj: '预设加样总体积',
-    sjypjytj: '实际样品加样体积',
-    yssjjrtj: '预设试剂加入体积',
-    sjsjjrtj: '实际试剂加入体积',
+    sj: 'Reagent',
+    ysjyztj: 'Pre set total Sample Volume',
+    sjypjytj: 'Actual Volume of Sample added',
+    yssjjrtj: 'Pre set reagent addition Volume',
+    sjsjjrtj: 'Actual Volume of reagents added',
   },
   pcr012: {
-    sjwj: '数据文件',
-    hsndcdwjm: '核酸浓度测定文件名',
-    hsndcdwjlj: '核酸浓度测定文件路径',
+    sjwj: 'Data file',
+    hsndcdwjm: 'Nucleic Acid Concentration Measurement File Name',
+    hsndcdwjlj: 'Nucleic Acid Concentration Measurement File Directory',
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {

src/lang/zh.js

@@ -130,7 +130,9 @@ export default {
     operationSuccess: '操作成功',
     OperationFailed: '操作失败',
 
-    selectMember: '选择成员'
+    selectMember: '选择成员',
+
+    jzyqk: '跳转仪器库'
   },
   login: {
     title: '欢迎登录系统',

src/lang/zh/template/pcr.js

@@ -4,7 +4,6 @@ export default {
   pcr001: {}, //用的SP001
   // PCR分析工作液制备表
   pcr002: {
-    title: 'PCR分析工作液制备表',
     mbrybh: '目标溶液编号',
     qsrybh: '起始溶液编号',
     ysqsrytj: '预设起始溶液体积',

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

@@ -190,7 +190,7 @@ export default {
         },
         {
           type: 'cellItem',
-          label: '操作时间',
+          label: 'template.dl.czsj',
           config: {
             startDate: {
               label: 'template.dl.dl011.kssj',

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

@@ -352,7 +352,7 @@ export default {
           label: 'template.dl.dl014.xybh',
           prop: 'xybh',
           width: 180,
-          bodyType: 'sj',
+          bodyType: 'xb',
           bodyFillType: 'actFill'
         },
         {

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

@@ -56,6 +56,8 @@
 								<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
 									:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 									:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
+									@beforeReagentSubmit="(e) => beforeReagentSubmit(e, index)"
+									@onRegentSubmit="(e) => onRegentSubmit(e, index)"
 									fieldItemLabel="取样进样信息" :formData="item">
 									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
@@ -229,11 +231,97 @@ export default {
 		}
 	},
 	methods: {
-		handleUpdateCode(){
-			const refs = ["jyTableRef"]
-			const {ecDataList = [],ybsmDataList= []} = this.fromData;
+		beforeReagentSubmit(data, index) {
+			const { selectData, callback, key, headerSelectFields } = data;
+			const {selectInfo = {}} = selectData;
+			const {nddw} = selectInfo;
+			const {sjzjnddw} = headerSelectFields;
+			 if (
+				key === 'zjbh' &&
+				!isCommonUnit(nddw, [sjzjnddw])
+			) {
+				//选择起始源溶液需要同步更新table的变更记录。
+				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。')
+			}
+		},
+		onRegentSubmit(e, index) {
+			const {selectInfo,headerSelectFields} = e;
+			const {nd,nddw} = selectInfo.selectInfo;
+			const {sjzjnddw} = headerSelectFields;
+			const jyTableInfo = this.$refs[`jyTableRef${index}`][0].getFilledFormData();
+			const jyHeaderSelectFields = jyTableInfo.headerSelectFields;
+			const {qynddw} = jyHeaderSelectFields;
+			const sjnd = convertConcentration.convert(nd + nddw, sjzjnddw);//转换后的取样浓度
+			const transQynd = convertConcentration.convert(nd + nddw, qynddw);//转换后的取样浓度
+			const parseSjnd = parseFloat(sjnd.toFixed(4));
+			const parseQynd = parseFloat(transQynd.toFixed(4));
+
+
+			this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex,{sjzjnd:parseSjnd})
+			this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(e.rowIndex,{qynd:parseQynd})
+		},
+		async handleUpdateCode(){
+			const {ecDataList = [],ybsmDataList= []} = this.formData;
+			const codes = [];
+			let flag = false;
+			ybsmDataList.map((item,index) => {
+				const {stepTableFormData = [],jyStepTableFormData = []} = item;
+				stepTableFormData.map((step,sIndex) => {
+					if(step.qybhCode){
+						flag = true;
+					}
+					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybh:step.qybh})
+					codes.push({ pre: step.qybh, type: 1 ,id:`stepTableFormData_${step.qybh}_${index}_${sIndex}`,});
+	
+				});
+				jyStepTableFormData.map((step,sIndex) => {
+					if(step.jybhCode){
+						flag = true;
+					}
+					codes.push({ pre: step.jybh, type: 1 ,id:`jyStepTableFormData_${step.jybh}_${index}_${sIndex}`,});
+				});
+				
+			});
+			ecDataList.map((item,index) => {
+				const {stepTableFormData} = item;
+				stepTableFormData.map((step,sIndex) => {
+					if(step.jybhCode){
+						flag = true;
+					}
+					codes.push({ pre: step.jybh, type: 1 ,id:`ecStepTableFormData_${step.jybh}_${index}_${sIndex}`,});	
+				});
+			});
+			if(flag){
+				return;
+			}
 			
-			console.log(this.formData,"fff")
+			const result = await this.getLatestSnArr(codes)
+			codes.map((item,index)=>{
+				item.sn = result[index]
+			})
+			ybsmDataList.map((item,index)=>{
+				const {stepTableFormData = [],jyStepTableFormData = []} = item;
+				stepTableFormData.map((step,sIndex) => {
+					const id = `stepTableFormData_${step.qybh}_${index}_${sIndex}`;
+					const o = codes.find((item) => item.id === id) ||{};
+					this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybhCode:o.sn})
+				});
+				jyStepTableFormData.map((step,sIndex) => {
+					const id = `jyStepTableFormData_${step.jybh}_${index}_${sIndex}`;
+					const o = codes.find((item) => item.id === id) ||{};
+					this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+				});
+			})
+			ecDataList.map((item,index) => {
+				const {stepTableFormData} = item;
+				stepTableFormData.map((step,sIndex) => {
+					const id = `ecStepTableFormData_${step.jybh}_${index}_${sIndex}`;
+					const o = codes.find((item) => item.id === id) ||{};
+					this.$refs[`ecTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+				});
+			})
+			this.justUpdateFilledFormData();
+		
 		},
 		//获取文件blog
 		async handleBeforeDownload({ html2pdf, options, pdfContent }) {

src/views/business/comps/template/dialog/SelectInstrumentDialog.vue

@@ -6,6 +6,7 @@
             :studyFormId = "studyFormId"
             :listApi="listApi"
             :selectedCode="selectedCode"
+            :showYqButton="true"
             @radioSelect="handleSelect"/>
 
         <div class="other-reagent">

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

@@ -7,7 +7,7 @@ export const getSjSearchForm = () => {
     bh: {
       label: 'page.business.resource.sj.sjbh'
     },
-    studyName: {
+    studySn: {
       label: 'page.business.resource.sj.sssy'
     }
   }
@@ -49,7 +49,7 @@ export const getXbSearchForm = () => {
     bh: {
       label: 'page.business.resource.sj.bh'
     },
-    studyMc: {
+    studySn: {
       label: 'page.business.resource.sj.sssy'
     }
   }
@@ -86,7 +86,7 @@ export const getSjColumns = () => {
       label: 'page.business.resource.sj.sxr'
     },
     {
-      prop: 'studyName',
+      prop: 'studySn',
       label: 'page.business.resource.sj.sssy'
     }
   ]
@@ -179,7 +179,7 @@ export const getXbColumns = () => {
       label: 'page.business.resource.sj.sxr'
     },
     {
-      prop: 'studyName',
+      prop: 'studySn',
       label: 'page.business.resource.sj.sssy'
     }
   ]
@@ -281,7 +281,7 @@ export const getXjColumns = () => {
       label: 'page.business.resource.sj.sxr'
     },
     {
-      prop: 'studyName',
+      prop: 'studySn',
       label: 'page.business.resource.sj.sssy'
     }
   ]
@@ -295,7 +295,7 @@ export const getXjSearchForm = () => {
     bh: {
       label: 'page.business.resource.sj.bh'
     },
-    studyName: {
+    studySn: {
       label: 'page.business.resource.sj.sssy'
     }
   }

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

@@ -88,10 +88,14 @@ export const getYbsmFormConfig = ($this) => {
                     disabled: true,
                     subType:"button",
                     subKey: "startButton",
+                    subFillType: 'actFill',
+                    subDisabled: false,
                     buttonName:"开始",
                     thirdType: 'button',
                     showSub:$this.fillType === 'actFill',
                     showThird:$this.fillType === 'actFill',
+                    thirdDisabled: false,
+                    thirdFillType: 'actFill',
                     thirdKey: 'endButton',
                     thirdButtonName:"结束",
                 },
@@ -118,15 +122,19 @@ export const getQyTableColumns = ($this) => {
             width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
-            subBodyType:"span",
-            subBodyKey: "qybhCode",
+            bodySubType:"span",
+            bodySubKey: "qybhCode",
         },
         {
             label: '制剂编号',
             prop: 'zjbh',
             width: 200,
-            bodyType: 'gsp',
-            bodyFillType: 'actFill',
+            bodyType: 'input',
+            bodyFillType: 'preFill',
+            bodySubType: 'mix',
+            bodySubKey: "zjbhCode",
+            bodySubFillType: 'actFill',
+
         },
         {
             label: '预设制剂浓度',
@@ -142,6 +150,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际制剂浓度',
             prop: 'sjzjnd',
+            bodyDisabled: true,
             width: 200,
             headerSelectKey: 'sjzjnddw',
             fillType: "preFill",
@@ -164,10 +173,10 @@ export const getQyTableColumns = ($this) => {
             width: 180,
             bodyType: 'select',
             bodyOptions: $this.getDictOptions('business_qywz'),
-            bodyFillType: 'actFill',
+            bodyFillType: 'preFill',
         },
         {
-            label: '预设取样位置',
+            label: '实际取样位置',
             prop: 'sjqywz',
             width: 180,
             bodyType: 'select',
@@ -211,20 +220,22 @@ export const getJyTableColumns = ($this) => {
             width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
-            subBodyType:"span",
-            subBodyKey: "jybhCode",
+            bodySubType:"span",
+            bodySubKey: "jybhCode",
         },
         {
             label: '取样编号',
             prop: 'qybh',
             width: 200,
-            bodyType: 'gsp',
+            bodyType: 'input',
+            bodyDisabled: true,
             bodyFillType: 'actFill',
         },
         {
             label: '取样浓度',
             prop: 'qynd',
             width: 200,
+            bodyDisabled: true,
             headerSelectKey: 'qynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -235,6 +246,7 @@ export const getJyTableColumns = ($this) => {
             label: '取样体积',
             prop: 'qytj',
             width: 200,
+            bodyDisabled: true,
             headerSelectKey: 'qytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),

src/views/business/resource/sj/comps/Xq.vue

@@ -94,7 +94,7 @@
             </div>
             <div class="right">
               <div class="right-title">{{ $t('page.business.resource.sj.bdsssy') }}</div>
-              <el-input type="text" :value="form.studyName" maxlength="50" disabled />
+              <el-input type="text" :value="form.studySn" maxlength="50" disabled />
             </div>
           </div>
           <div class="pal">

src/views/business/resource/sj/list.vue

@@ -98,7 +98,7 @@
           <el-table-column :label="$t('page.business.resource.sj.gg')" align="center" prop="gg" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.ly')" align="center" prop="ly" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.ssbm')" align="center" prop="deptName" width="150px" />
-          <el-table-column :label="$t('page.business.resource.sj.sssy')" align="center" prop="studyName" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.sssy')" align="center" prop="studySn" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.ph')" align="center" prop="ph" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.yxzq')" align="center" prop="yxzq" width="150px" >
             <template slot-scope="scope">

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

@@ -20,8 +20,8 @@
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 所属试验 -->
-          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'" prop="studyName">
-            <el-input v-model="queryParams.studyName" clearable @change="handleQuery"
+          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'" prop="studySn">
+            <el-input v-model="queryParams.studySn" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 失效日 -->
@@ -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="studyName" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studySn" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
@@ -102,6 +102,7 @@ export default {
         bh: null,
         startDate: null,
         endDate: null,
+        studySn: '',
       },
     }
   },

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

@@ -20,8 +20,8 @@
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 所属试验 -->
-          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'"  prop="studyName">
-            <el-input v-model="queryParams.studyName" clearable @change="handleQuery"
+          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'"  prop="studySn">
+            <el-input v-model="queryParams.studySn" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 失效日 -->
@@ -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="studyName" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studySn" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
@@ -98,6 +98,7 @@ export default {
         mc: null,
         jyzt: null,
         studyId: null,
+        studySn: '',
         zjzt: null,
         bh: null,
         startDate: null,

src/views/index.vue

@@ -195,21 +195,22 @@ export default {
         display: flex;
         flex-direction: row;
         justify-content: space-between;
+        align-items: center;
         border-bottom: 1px solid #eee;
         margin-bottom: 10px;
         padding-bottom: 5px;
         font-size: 12px;
         cursor: pointer;
         .notice-title{
-          flex-shrink: 0;
+          flex-grow: 1;
+          flex-wrap: wrap;
           .notice-dot{
             margin-right: 2px;
             margin-top: 5px;
           }
         }
         .notice-date{
-          flex-grow: 1;
-          text-align: right;
+          flex-shrink: 0;
         }
       }
     }