diff --git a/src/lang/en/template/bl.js b/src/lang/en/template/bl.js
index 1f9f5d3..8b1ac02 100644
--- a/src/lang/en/template/bl.js
+++ b/src/lang/en/template/bl.js
@@ -4,7 +4,7 @@ export default {
fhsj: '复核时间',
ybsm: '样本说明',
smybh: '扫描仪编号',
- dwypbh: '动物/样品编号',
+ dwypbh: '动物/样本编号',
qprsbh: '切片/染色编号',
smryqrxx: '扫描人员确认信息',
ztblxjqrxx: '专题病理学家确认信息',
diff --git a/src/lang/zh/template/bl.js b/src/lang/zh/template/bl.js
index 1f9f5d3..8b1ac02 100644
--- a/src/lang/zh/template/bl.js
+++ b/src/lang/zh/template/bl.js
@@ -4,7 +4,7 @@ export default {
fhsj: '复核时间',
ybsm: '样本说明',
smybh: '扫描仪编号',
- dwypbh: '动物/样品编号',
+ dwypbh: '动物/样本编号',
qprsbh: '切片/染色编号',
smryqrxx: '扫描人员确认信息',
ztblxjqrxx: '专题病理学家确认信息',
diff --git a/src/views/business/comps/template/comps/bl/BL001.vue b/src/views/business/comps/template/comps/bl/BL001.vue
index de98507..4fe1a10 100644
--- a/src/views/business/comps/template/comps/bl/BL001.vue
+++ b/src/views/business/comps/template/comps/bl/BL001.vue
@@ -253,24 +253,24 @@ export default {
width: 280,
bodyOptions: this.ypmcTaOptions,
},
- {
- label: 'template.dj.dj003.cysj',
- prop: "cysj",
- bodyType: 'dateTimeRange',
- width: 450,
- bodyFillType: 'actFill'
- },
- {
- label: 'template.dj.dj003.sjbd',
- prop: "sjbd",
- bodyType: 'select',
- bodyOptions: [
- {value:1,label:'正常'},
- {value:0,label:'偏离'},
- ],
- bodyFillType: 'actFill',
- width: 180,
- },
+ // {
+ // label: 'template.dj.dj003.cysj',
+ // prop: "cysj",
+ // bodyType: 'dateTimeRange',
+ // width: 450,
+ // bodyFillType: 'actFill'
+ // },
+ // {
+ // label: 'template.dj.dj003.sjbd',
+ // prop: "sjbd",
+ // bodyType: 'select',
+ // bodyOptions: [
+ // {value:1,label:'正常'},
+ // {value:0,label:'偏离'},
+ // ],
+ // bodyFillType: 'actFill',
+ // width: 180,
+ // },
{
label: 'template.dj.dj003.yps',
prop: "yps",
@@ -293,7 +293,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'yjsj',
+ subKey: 'yjsjButton',
buttonName: 'template.dj.dj003.hqsj',
},
dsfs: {
@@ -351,7 +351,7 @@ export default {
// 点击按钮
handleClickButton(_item, signData) {
this.$refs.yjczxxRef.updateFormData(
- _item.subKey,
+ _item?.subKey?.replace("Button", ""),
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
diff --git a/src/views/business/comps/template/comps/bl/BL002.vue b/src/views/business/comps/template/comps/bl/BL002.vue
index 9ff31c5..038979e 100644
--- a/src/views/business/comps/template/comps/bl/BL002.vue
+++ b/src/views/business/comps/template/comps/bl/BL002.vue
@@ -158,22 +158,6 @@ export default {
}
}
},
- {
- type: 'cellItem',
- label: 'template.bl.bl002.fhsj',
- config: {
- startDate: {
- label: 'template.common.startTime',
- type: 'input',
- disabled: true
- },
- endDate: {
- label: 'template.common.endTime',
- type: 'input',
- disabled: true
- }
- }
- }
]
},
diff --git a/src/views/business/comps/template/comps/dj/DJ002.vue b/src/views/business/comps/template/comps/dj/DJ002.vue
index 2a98555..ae5b193 100644
--- a/src/views/business/comps/template/comps/dj/DJ002.vue
+++ b/src/views/business/comps/template/comps/dj/DJ002.vue
@@ -277,7 +277,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'yjsj',
+ subKey: 'yjsjButton',
buttonName: 'template.dj.dj003.hqsj',
},
dsfs: {
@@ -335,7 +335,7 @@ export default {
// 点击按钮
handleClickButton(_item, signData) {
this.$refs.yjczxxRef.updateFormData(
- _item.subKey,
+ _item?.subKey?.replace("Button", ""),
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
diff --git a/src/views/business/comps/template/comps/dj/DJ003.vue b/src/views/business/comps/template/comps/dj/DJ003.vue
index 99ef70f..eef69bc 100644
--- a/src/views/business/comps/template/comps/dj/DJ003.vue
+++ b/src/views/business/comps/template/comps/dj/DJ003.vue
@@ -233,7 +233,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'yjsj',
+ subKey: 'yjsjButton',
buttonName: 'template.dj.dj003.hqsj',
},
dsfs: {
@@ -287,7 +287,7 @@ export default {
// 点击按钮
handleClickButton(_item, signData) {
this.$refs.yjczxxRef.updateFormData(
- _item.subKey,
+ _item?.subKey?.replace("Button", ""),
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue
index abb327f..6deac9f 100644
--- a/src/views/business/comps/template/comps/dl/DL003.vue
+++ b/src/views/business/comps/template/comps/dl/DL003.vue
@@ -224,7 +224,8 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'jzkssj',
+ subKey: 'jzkssjButton',
+ subDisabled: this.fillType !== 'actFill',
buttonName: 'template.dl.dl003.ksButton',
},
jzjssj: {
@@ -233,7 +234,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'jzjssj',
+ subKey: 'jzjssjButton',
buttonName: 'template.dl.dl003.jsButton',
},
fssygbh: {
@@ -271,7 +272,7 @@ export default {
fillType: 'actFill',
type: 'input',
subType: 'button',
- subKey: 'pykssj',
+ subKey: 'pykssjButton',
buttonName: 'template.dl.dl003.ksButton',
},
@@ -343,7 +344,7 @@ export default {
// 点击按钮
handleClickButton(_item, signData) {
this.$refs.czInfoRef.updateFormData(
- _item.subKey,
+ _item?.subKey?.replace("Button", ""),
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
diff --git a/src/views/business/comps/template/comps/dl/DL004.vue b/src/views/business/comps/template/comps/dl/DL004.vue
index 9dd10c2..10fbfb9 100644
--- a/src/views/business/comps/template/comps/dl/DL004.vue
+++ b/src/views/business/comps/template/comps/dl/DL004.vue
@@ -196,7 +196,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'pykssj',
+ subKey: 'pykssjButton',
buttonName: 'template.dl.dl003.ksButton',
},
pyjssj: {
@@ -205,7 +205,7 @@ export default {
fillType: 'actFill',
maxlength: 200,
subType: 'button',
- subKey: 'pyjssj',
+ subKey: 'pyjssjButton',
buttonName: 'template.dl.dl003.jsButton',
},
}
@@ -259,7 +259,7 @@ export default {
// 点击按钮
handleClickButton(_item, signData) {
this.$refs.czInfoRef.updateFormData(
- _item.subKey,
+ _item?.subKey?.replace("Button", ""),
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
diff --git a/src/views/business/comps/template/comps/dl/DL005.vue b/src/views/business/comps/template/comps/dl/DL005.vue
index 5e69418..462533e 100644
--- a/src/views/business/comps/template/comps/dl/DL005.vue
+++ b/src/views/business/comps/template/comps/dl/DL005.vue
@@ -25,7 +25,7 @@
:formConfig="czInfoFormConfig"
:formData="formData"
/>
-
+
diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue
index 58b5268..ddc9eda 100644
--- a/src/views/business/comps/template/comps/dl/DL006.vue
+++ b/src/views/business/comps/template/comps/dl/DL006.vue
@@ -68,6 +68,7 @@
class="mt20"
fieldItemLabel="template.dl.dl006.czxx"
ref="czFormRef"
+ @onRegentSubmit="onRegentSubmit"
:formConfig="czFormConfig"
:formData="formData"
/>
@@ -96,6 +97,7 @@ import TableList from '@/components/Template/Table'
import Step from '@/components/Template/Step'
import templateMixin from '../../mixins/templateMixin'
import { formatNumberByDigits,justUpdateFilledFormData } from '@/utils/index.js'
+import { uniqeYqOne, uniqeResourceOne } from "@/utils/calUnitTools";
const refConf = {
base: 'baseInfoRef',
@@ -140,6 +142,7 @@ export default {
if(stepTableFormData_1.length>0){
this.clickFinish()
}
+ console.log(this.getFilledFormData())
},
computed: {
czxxColumns: {
@@ -287,7 +290,7 @@ export default {
fillType: 'preFill',
subType: 'button',
isClearForm: true,
- subKey: 'jlzsl',
+ subKey: 'jlzslButton',
buttonName: 'form.saveConfirm',
maxlength: 2,
},
@@ -472,17 +475,101 @@ export default {
return await this.validFormFields(refNames)
},
getResource() {
+ let content = this.getFilledFormData();
+ let tmpResource = []
+ let tmpYq = []
+ let addYq = []
+ let addResource = []
+ if (this.fillType === "actFill") {
+ let header1 = content.headerSelectFields
+ let table1 = content.stepTableFormData
+
+ // 如果添加了S9混合液，提取S9混合液编号
+ if (content.sftjs9 === 1 && content.s9hhybh) {
+ console.log('sbdhau1')
+ tmpResource.push({
+ mc: 'S9混合液',
+ bh: content.s9hhybh,
+ ph: null,
+ nd: null,
+ nddw: null,
+ ndz: null,
+ ly: null,
+ sxrq: null,
+ kc: null,
+ kcdw: null,
+ type: 1,
+ syl: content.s9hhyyjjrl || null,
+ syldw: content.s9hhyyjjrldw || null,
+ yxzq: null,
+ yxzqdw: null
+ })
+ }
+ //如果添加了PBS，提取PBS混合液编号
+ if (content.sftjs9 === 0 && content.pbsbh) {
+ tmpResource.push({
+ mc: 'PBS',
+ bh: content.pbsbh,
+ ph: null,
+ nd: null,
+ nddw: null,
+ ndz: null,
+ ly: null,
+ sxrq: null,
+ kc: null,
+ kcdw: null,
+ type: 1,
+ syl: content.pbsryyjrl || null,
+ syldw: content.pbsryyjrldw || null,
+ yxzq: null,
+ yxzqdw: null
+ })
+ }
+
+ if (table1 && table1.length > 0) {
+ for (let i = 0; i < table1.length; i++) {
+ tmpResource.push({
+ mc: '加液编号',
+ bh: table1[i].jybh,
+ ph: null,
+ nd: null,
+ nddw: null,
+ ndz: null,
+ ly: null,
+ sxrq: null,
+ kc: null,
+ kcdw: null,
+ type: 1,
+ syl: table1[i].ysjytj || null,
+ syldw: header1.ysjytjDw || null,
+ yxzq: null,
+ yxzqdw: null
+ })
+ }
+ }
+ tmpYq.push({
+ mc: content.pyxbhmc,
+ xh: content.pyxbhxh,
+ bh: content.pyxbh,
+ jzrq: content.pyxbhjzrq,
+ })
+ }
const stepResource = this.$refs.stepRef.getStepResource()
// 使用的试剂、仪器
- this.resourceTmp = stepResource.sjResource || []
- this.yqResourceTmp = stepResource.yqResource || []
+ addYq = [...stepResource.yqResource,...tmpYq]
+ addResource = [...stepResource.sjResource,...tmpResource]
+ this.resourceTmp = uniqeResourceOne(addResource) || []
+ this.yqResourceTmp = uniqeYqOne(addYq) || []
return this.resourceTmp
},
onRegentSubmit(e) {
- console.log(e,909090)
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
-
+ if (key == 'pyxbh') {
+ this.$refs.czFormRef.updateFormData('pyxbhmc', row.mc)
+ this.$refs.czFormRef.updateFormData('pyxbhxh', row.xh)
+ this.$refs.czFormRef.updateFormData('pyxbhjzrq', row.jzrq)
+ }
if (key === 'qxbd') {
this.$refs.czInfoRef.updateFormData('pykssj', row.startDate)
}