feat:[模板管理][update]

src/components/Template/operation/TableOpertaion.vue

@@ -8,10 +8,10 @@
 
         </el-popconfirm>
         <template v-if="fillType === 'actFill'">
-            <el-button type="text" size="small" @click="onSubPackage">分装</el-button>
-            <el-button type="text" size="small" @click="onStartConfig">开始配制</el-button>
-            <el-button type="text" size="small" @click="onConfigComplete">配制完成</el-button>
-            <el-button type="text" size="small" @click="()=>onPrintTag()">打印标签</el-button>
+            <el-button v-if="showFz" type="text" size="small" @click="onSubPackage">分装</el-button>
+            <el-button v-if="showKspz" type="text" size="small" @click="onStartConfig">开始配制</el-button>
+            <el-button v-if="showPzwc" type="text" size="small" @click="onConfigComplete">配制完成</el-button>
+            <el-button v-if="showDybq" type="text" size="small" @click="()=>onPrintTag()">打印标签</el-button>
         </template>
     </div>
 </template>
@@ -40,6 +40,26 @@ export default {
             type: String,
             default: "preFill",
         },
+        //是否显示分装
+        showFz: {
+            type: Boolean,
+            default: true,
+        },
+        //是否显示开始配制
+        showKspz: {
+            type: Boolean,
+            default: true,
+        },
+        //是否显示配制完成
+        showPzwc: {
+            type: Boolean,
+            default: true,
+        },
+        //是否显示打印标签
+        showDybq: {
+            type: Boolean,
+            default: true,
+        },
     },
 
     mounted() {
@@ -92,6 +112,9 @@ export default {
         onConfigComplete() {
             const actConfig = this.getColumnConfig();
             const cloneRow = JSON.parse(JSON.stringify(this.innerRow));
+            if(cloneRow.hasOwnProperty("_checked")){
+                delete cloneRow._checked;
+            }
             const isComplete = Object.values({...actConfig,...cloneRow}).every((val)=>{
                 // 0 算有值
                 if (val === 0) return true;

src/lang/en/template/gsp.js

@@ -68,6 +68,9 @@ export default {
     rjyjtj:'溶剂预计体积',
     rjsjtj:'溶剂实际体积',
   },
+  gsp007:{
+    bzqx:'标准曲线',
+  },
   gsp009: {
     xtsyx: '系统适应性',
     ypbh: '样品编号',

src/lang/zh/template/gsp.js

@@ -68,6 +68,9 @@ export default {
     rjyjtj:'溶剂预计体积',
     rjsjtj:'溶剂实际体积',
   },
+  gsp007:{
+    bzqx:'标准曲线',
+  },
   gsp009: {
     xtsyx: '系统适应性',
     ypbh: '样品编号',

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

@@ -34,9 +34,14 @@
 							:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
 							fieldItemLabel="取样进样信息" :formData="item">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="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)">
-								</TableOpertaionDelete>
+								</TableOpertaion>
 							</template>
 						</CustomTable>
 						<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
@@ -44,9 +49,14 @@
 							:showOperation="fillType === 'actFill'" :showAddRow="false"
 							:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="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)">
-								</TableOpertaionDelete>
+								</TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -72,9 +82,14 @@
 							:showOperation="fillType === 'preFill' || fillType === 'actFill'"
 							@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="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)">
-								</TableOpertaionDelete>
+								</TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -91,7 +106,7 @@
 
 <script>
 import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
-import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete";
+import TableOpertaion from "@/components/Template/operation/TableOpertaion";
 
 import LineLabel from "@/components/Template/LineLabel";
 import TableList from "@/components/Template/Table";
@@ -113,7 +128,7 @@ const refConfig = {
 const compRefs = Object.values(refConfig);
 export default {
 	name: "SP0021",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -161,8 +176,38 @@ export default {
 
 	},
 	methods: {
+		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 = {
+					...params,
+					bh:rowData.qybh,//编号
+					nd:rowData.sjzjnd,//浓度
+					nddw:headerSelectFields.sjzjnddw,//浓度单位
+					kc:rowData.sjqyl,//库存
+					kcdw:headerSelectFields.sjqydw,//库存单位
+				}
+			}else if(type === 'jy'){
+				 params = {
+					...params,
+					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")
+		},
 		handleClickButton(item,signData,key,formFields,index){
-			const {} = item;
 			const ref = this.$refs[`ybsmFormPackageRef${index}`][0];
 			if(key === "startButton"){
 				ref.updateFormData("qysj",moment().format("YYYY/MM/DD HH:mm:ss"),{ isUpdateRecord: true, signData })

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

@@ -8,6 +8,8 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp"
+						v-if="isGsp" />
 					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage v-if="isSp" fieldItemLabel="template.common.storageCondition"
@@ -25,7 +27,7 @@
 						</CustomTable>
 					</div>
 					<LineLabel :label="getOperationStepsLabel()" />
-					<div v-if="fillType === 'preFill' && !isPcr234" class="mt-20">
+					<div v-if="fillType === 'preFill' && !isPcr234 && !isGsp" class="mt-20">
 						<el-button type="primary" @click="handleAddConfig('paralleConfigs')">{{
 							$t('template.common.xzpxpz')
 						}}</el-button>
@@ -33,6 +35,11 @@
 							$t('template.common.xzjtpz')
 						}}</el-button>
 					</div>
+					<div v-else-if="fillType === 'preFill' && isGsp" class="mt-20">
+						<el-button type="primary" @click="handleAddConfig('ladderConfigs')">{{
+							$t('template.common.addBtn')
+						}}</el-button>
+					</div>
 					<!-- 阶梯配制区域 -->
 					<div v-for="(ladderConfig, ladderIndex) in formData.ladderConfigs"
 						:key="'ladder_' + ladderConfig.id">
@@ -54,6 +61,7 @@
 							:configType="'paralle'" :ref="`paralleRef_${paralleIndex}`"
 							:fieldItemLabel="'template.common.pxpz'"
 							:showHeader="!isPcr234"
+							:showHeaderLabel="!isGsp"
 							@deleteConfig="deleteConfig('paralleConfigs', paralleConfig)" :fillType="fillType" />
 					</div>
 					<template v-if="sn === 'LBA005' || sn === 'ADA005'">
@@ -208,7 +216,8 @@ export default {
 			targetAcSolutionFromTable: true,//是否从表格中获取实际原始溶液浓度
 			currentRowData: {},//当前点击的行数据
 			isLba: labArr.includes(this.sn),
-			isSp: sn.includes('SP'),//是否是色谱
+			isSp: sn.startsWith('SP'),//是否是色谱
+			isGsp: sn.startsWith('GSP'),//是否是供试品
 			isPcr234: pcr234Arr.includes(this.sn),//是否是PCR234
 		};
 	},
@@ -230,6 +239,7 @@ export default {
 			const obj = {
 				"LBA005": "template.lba.lba005.bzqxpz",//标准曲线配制
 				"ADA005": "template.lba.lba005.bzqxpz",//标准曲线配制
+				"GSP007": "template.gsp.gsp007.bzqx",//标准曲线
 				// "LBA007": "template.lba.lba005.bzqxpz",//
 			}
 			return obj[this.sn] || 'template.common.operationSteps';//操作步骤

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

@@ -1,7 +1,9 @@
 <template>
 	<div class="template-form-item">
 		<div class="config-header" v-if="showHeader">
-			<div>{{ $t(fieldItemLabel) }}</div>
+			<div>
+				<span v-if = "showHeaderLabel">{{ $t(fieldItemLabel) }}</span>
+			</div>
 			<el-popconfirm title="确认删除当前配置？" @confirm="deleteConfig">
 				<el-button slot="reference" v-if="fillType === 'preFill'" type="text" icon="el-icon-delete" >{{
 					$t('template.common.deleteBtn')
@@ -57,6 +59,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		showHeaderLabel: {//是否显示标题
+			type: Boolean,
+			default: true,
+		},
 		fillType: {
 			type: String,
 			default: '',

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

@@ -43,22 +43,23 @@ const optionsCode = {
     PCR002: 'business_pcr_gzy',
     PCR003: 'business_pcr_fxbzqxzbb',
     PCR004: 'business_pcr_fxzkypzbb',
-    GSP007:"",
-    PCR013:"",
-    LBA005:"",
-    LBA007:"",
-    ADA005:"",
-    ADA007:"",
+    GSP007:"",//GSP007是输入框
+    PCR013:"business_pcr_fxffypzbb",
+    LBA005:"business_lba_ptjhbzqx_zkpx",
+    LBA007:"business_lba_ptjhfxyp",
+    ADA005:"business_ada_kyktzkyp",
+    ADA007:"business_ada_kyktffxyp",
   }
 
 // 阶梯配置表格列配置
 export const getLadderColumnsConfig = ($this) => {
-  const dic = optionsCode[$this.sn] || 'business_sp_nbgzy'
+  const dic = optionsCode[$this.sn] || 'business_sp_nbgzy';
+  const mbryType = $this.sn === "GSP007"?"input":"select"
   return [
     {
       label: 'template.sp.sp00456.mbrybh',
       prop: 'targetSolutionCode',
-      bodyType: 'select',
+      bodyType: mbryType,
       bodyOptions: $this.getDictOptions(dic),
       bodySubType: 'span',
       bodySubKey: 'subTargetSolutionCode',
@@ -534,11 +535,12 @@ export const getBaseInfoFormConfig = ($this) => {
   const sn = $this.sn
   const labArr = ['LBA005', 'LBA007','ADA005','ADA007']
   const isLba = labArr.includes(sn)
-  const isSp = sn.includes('SP')//是否是色谱
+  const isSp = sn.startsWith('SP')//是否是色谱
   return [
     {
       type: 'cardItem',
-      config: {
+      config: isSp?
+      {
         studyMc: {
           label: 'template.common.testName',
           type: 'input',
@@ -563,6 +565,19 @@ export const getBaseInfoFormConfig = ($this) => {
           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/mixins/templateMixin.js

@@ -60,6 +60,11 @@ export default {
 		'business_zpdd', // 制片地点
 		'business_cjbw', // 制片部位
 		'business_qywz', // 取样位置
+
+		'business_lba_ptjhbzqx_zkpx', // lba005
+		'business_lba_ptjhfxyp', // lba007
+		'business_ada_kyktzkyp', // ada005
+		'business_ada_kyktffxyp', // ada007
 	],
 	props: {
 		templateData: {
@@ -479,7 +484,7 @@ export default {
 					actSolutionConcentrationPrecision: 3, //小数点精度默认为3
 					targetDiluentVolumePrecision: 3, //小数点精度默认为3
 					targetStartSolutionVolumePrecision: 3, //小数点精度默认为3
-					targetSolutionCode: `STD${Number(codeSTD) - index}`
+					targetSolutionCode: `CA-WS-STD${Number(codeSTD) - index}`
 				}))
 				this.$refs.stepTableRef.updateDataSource(arr)
 			} else if (key === 'targetStartSolution' || key === 'subTargetStartSolution') {