Browse Source

feat: [模板管理] 毒理下没有生成物的resource修改

ouqian
memorylkf 1 month ago
parent
commit
600db24da5
12 changed files with 13 additions and 204 deletions
  1. +1
    -11
      src/views/business/comps/template/comps/dl/DL007.vue
  2. +1
    -11
      src/views/business/comps/template/comps/dl/DL008.vue
  3. +1
    -11
      src/views/business/comps/template/comps/dl/DL009.vue
  4. +4
    -60
      src/views/business/comps/template/comps/dl/DL010.vue
  5. +1
    -16
      src/views/business/comps/template/comps/dl/DL013.vue
  6. +0
    -35
      src/views/business/comps/template/comps/dl/DL015.vue
  7. +0
    -13
      src/views/business/comps/template/comps/dl/DL016.vue
  8. +0
    -12
      src/views/business/comps/template/comps/dl/DL017.vue
  9. +0
    -13
      src/views/business/comps/template/comps/dl/DL018.vue
  10. +0
    -13
      src/views/business/comps/template/comps/dl/DL019.vue
  11. +3
    -9
      src/views/business/comps/template/comps/dl/DL024.vue
  12. +2
    -0
      src/views/business/comps/template/comps/yp/YP005.vue

+ 1
- 11
src/views/business/comps/template/comps/dl/DL007.vue View File

@ -280,17 +280,7 @@ export default {
return await this.validFormFields(refNames) return await this.validFormFields(refNames)
}, },
getResource() { getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = [] this.resourceTmp = []
return this.resourceTmp return this.resourceTmp
}, },

+ 1
- 11
src/views/business/comps/template/comps/dl/DL008.vue View File

@ -439,17 +439,7 @@ export default {
return await this.validFormFields(refNames) return await this.validFormFields(refNames)
}, },
getResource() { getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = [] this.resourceTmp = []
return this.resourceTmp return this.resourceTmp
}, },

+ 1
- 11
src/views/business/comps/template/comps/dl/DL009.vue View File

@ -550,17 +550,7 @@ export default {
return await this.validFormFields(refNames) return await this.validFormFields(refNames)
}, },
getResource() { getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = [] this.resourceTmp = []
return this.resourceTmp return this.resourceTmp
}, },

+ 4
- 60
src/views/business/comps/template/comps/dl/DL010.vue View File

@ -485,66 +485,10 @@ export default {
return await this.validFormFields(refsToValidate) return await this.validFormFields(refsToValidate)
}, },
getResource() { getResource() {
const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource()
// 使
this.resourceTmp = sjxxStepResource.sjResource || []
this.yqResourceTmp = sjxxStepResource.yqResource || []
//
const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData()
const sjxxList = sjxxTableData?.stepTableFormData || []
const headerSelectFields = sjxxTableData?.headerSelectFields || {}
// 0.9%
//
const sjxxResource = []
sjxxList.forEach((item) => {
// 0.9%
if (item.sjlhnzsjyjrl) {
sjxxResource.push({
mc: '0.9%氯化钠注射液', //
bh: null, //
ph: null, //
nd: null, //
nddw: null, //
ndz: null, //
ly: null, //
sxrq: null, //
kc: null, //
kcdw: null, //
type: 1, // 1使
syl: item.sjlhnzsjyjrl, // 使
syldw: headerSelectFields.sjlhnUnit || '', // 使
yxzq: null, //
yxzqdw: null //
})
}
//
if (item.sjjrxq) {
sjxxResource.push({
mc: '血清', //
bh: null, //
ph: null, //
nd: null, //
nddw: null, //
ndz: null, //
ly: null, //
sxrq: null, //
kc: null, //
kcdw: null, //
type: 1, // 1使
syl: item.sjjrxq, // 使
syldw: headerSelectFields.sjjrxqUnit || '', // 使
yxzq: null, //
yxzqdw: null //
})
}
})
//
return [...this.resourceTmp, ...sjxxResource]
const stepResource = this.$refs.sjxxStepRef.getStepResource()
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
return this.resourceTmp;
}, },
onRegentSubmit(e) { onRegentSubmit(e) {
// //

+ 1
- 16
src/views/business/comps/template/comps/dl/DL013.vue View File

@ -614,22 +614,7 @@ export default {
return await this.validFormFields(refsToValidate) return await this.validFormFields(refsToValidate)
}, },
getResource() { getResource() {
// 使
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
type: 'yq',
value: item.yqbh,
bh: item.yqbh,
mc: item.yqmc,
xh: item.yqxh,
jzrq: item.xccsjzjdrq
}))
this.yqResourceTmp = []
this.resourceTmp = [] this.resourceTmp = []
return this.resourceTmp return this.resourceTmp
}, },

+ 0
- 35
src/views/business/comps/template/comps/dl/DL015.vue View File

@ -327,43 +327,8 @@ export default {
}, },
getResource() { getResource() {
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData()
const hyqkList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || [] this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || [] this.yqResourceTmp = stepResource.yqResource || []
//
// Set
const xybhSet = new Set()
const sjResourceFromHyqk = []
hyqkList.forEach((item) => {
if (item.xybh && !xybhSet.has(item.xybh)) {
xybhSet.add(item.xybh)
sjResourceFromHyqk.push({
mc: '细胞悬液',
bh: item.xybh,
ph: null,
nd: null,
nddw: null,
ndz: null,
ly: null,
sxrq: null,
kc: null,
kcdw: null,
type: 1,
syl: item.pyybrl || null,
syldw: item.pyybrl ? 'mL' : null,
yxzq: null,
yxzqdw: null
})
}
})
this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
return this.resourceTmp return this.resourceTmp
}, },
onRegentSubmit(e) { onRegentSubmit(e) {

+ 0
- 13
src/views/business/comps/template/comps/dl/DL016.vue View File

@ -267,21 +267,8 @@ export default {
getResource() { getResource() {
//使 //使
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
// const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || [] this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || [] this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
console.log('回显填写完成的表单数据==============',this.resourceTmp);
return this.resourceTmp; return this.resourceTmp;
}, },
// //

+ 0
- 12
src/views/business/comps/template/comps/dl/DL017.vue View File

@ -369,20 +369,8 @@ export default {
getResource() { getResource() {
//使 //使
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
const hyqkData = this.$refs.stepTableRef?.getFilledFormData()
const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || [] this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || [] this.yqResourceTmp = stepResource.yqResource || []
const sjResourceFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
return this.resourceTmp; return this.resourceTmp;
}, },
// //

+ 0
- 13
src/views/business/comps/template/comps/dl/DL018.vue View File

@ -331,22 +331,9 @@ export default {
return content; return content;
}, },
getResource() { getResource() {
//使
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || [] this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || [] this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
return this.resourceTmp; return this.resourceTmp;
}, },
// //

+ 0
- 13
src/views/business/comps/template/comps/dl/DL019.vue View File

@ -297,21 +297,8 @@ export default {
getResource() { getResource() {
//使 //使
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
// const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || [] this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || [] this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
console.log('回显填写完成的表单数据==============',this.resourceTmp);
return this.resourceTmp; return this.resourceTmp;
}, },
// //

+ 3
- 9
src/views/business/comps/template/comps/dl/DL024.vue View File

@ -9,7 +9,7 @@
<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo" <BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" /> ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
<!-- 仪器使用信息 --> <!-- 仪器使用信息 -->
<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
<LineLabel label="template.dl.dl024.xbpyxx" /> <LineLabel label="template.dl.dl024.xbpyxx" />
<!-- 操作记录 --> <!-- 操作记录 -->
@ -261,14 +261,8 @@ export default {
return content; return content;
}, },
getResource() { getResource() {
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
//
this.resourceTmp = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = []
this.yqResourceTmp = []
return this.resourceTmp; return this.resourceTmp;
}, },
// //

+ 2
- 0
src/views/business/comps/template/comps/yp/YP005.vue View File

@ -173,6 +173,8 @@ export default {
bodySubKey:"startBtn", bodySubKey:"startBtn",
showBodySub:this.fillType === "actFill", showBodySub:this.fillType === "actFill",
width: 280, width: 280,
bodyDisabled:true,
bodySubDisabled:false,
}] }]
}, },
}, },

Loading…
Cancel
Save