diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index 2adc75c..21c5e83 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -46,7 +46,6 @@ import GSP003 from "./comps/gsp/GSP003.vue"; import GSP004 from "./comps/gsp/GSP004.vue"; import GSP009 from "./comps/gsp/GSP009.vue"; import GSP010 from "./comps/gsp/GSP010.vue"; -import GSP011 from "./comps/gsp/GSP011.vue"; //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue"; @@ -84,7 +83,7 @@ export default { //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表 MJYLQSQD, SYWZPZJHB, DMYPPZJLB, //供试品 - GSP002, GSP003, GSP004,GSP009, GSP010,GSP011, + GSP002, GSP003, GSP004,GSP009, GSP010, //色谱 SP001, SP003, SP00456,SP007, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018, // PCR @@ -147,7 +146,7 @@ export default { 'GSP008': 'GSP002', 'GSP009': 'GSP009', 'GSP010': 'GSP010', - 'GSP011': 'GSP011', + 'GSP011': 'GSP009', 'GSP012': 'GSP002', 'GSP013': 'GSP002', 'GSP014': 'GSP002', diff --git a/src/views/business/comps/template/comps/gsp/GSP009.vue b/src/views/business/comps/template/comps/gsp/GSP009.vue index 5ed2526..1a7578d 100644 --- a/src/views/business/comps/template/comps/gsp/GSP009.vue +++ b/src/views/business/comps/template/comps/gsp/GSP009.vue @@ -12,7 +12,7 @@ - +
{{ $t('template.lba.lba004.xz') @@ -66,6 +66,10 @@ export default { type: String, default: 'preFill', }, + sn: { + type: String, + default: '', + }, }, computed: { // 备注表单配置 @@ -162,7 +166,7 @@ export default { type: "sj", fillType: "actFill", subType:"text", - subText:"template.gsp.gsp009.zw" + subText:this.sn=='GSP009'?'template.gsp.gsp009.zw':'template.gsp.gsp011.zw' }, } } diff --git a/src/views/business/comps/template/comps/gsp/GSP011.vue b/src/views/business/comps/template/comps/gsp/GSP011.vue deleted file mode 100644 index 6e25b66..0000000 --- a/src/views/business/comps/template/comps/gsp/GSP011.vue +++ /dev/null @@ -1,302 +0,0 @@ - - - - - \ No newline at end of file