eln_TD
/
eln_web
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix: [模板管理] 试剂结算

lkf
memorylkf 2 months ago
parent
8bb74f2d09
commit
7e4ba1d612
9 changed files with 639 additions and 27 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
  2. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
  3. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
  4. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
  5. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
  6. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
  7. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
  8. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
  9. +71
    -3
      src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "CBYDB", name: "CBYDB",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "CBYHGZYWDX", name: "CBYHGZYWDX",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue View File

@ -69,7 +69,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "JZXY", name: "JZXY",
@ -322,6 +322,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: item.kbjzbh,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -335,16 +399,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "QXWDX", name: "QXWDX",
@ -335,6 +335,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -348,16 +412,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "RXJZXY", name: "RXJZXY",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "XSKKX", name: "XSKKX",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "XZXHTYX", name: "XZXHTYX",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "ZDYBS", name: "ZDYBS",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 71
- 3
src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue View File

@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
export default { export default {
name: "CBYDB", name: "CBYDB",
@ -334,6 +334,70 @@ export default {
//配置的试剂 //配置的试剂
let item = tableList[i] let item = tableList[i]
//使用的
tmpResource.push({
mc: null,
bh: item.sjry,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjryxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
tmpResource.push({
mc: null,
bh: content.subJz,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjjzxql,
type: null,
elnType: this.product,
syldw:content.headerSelectFields.sjjzxqlUnit,
yxzq:null,
yxzqdw:null,
})
//分装的
let fzTotal = 0//分装总量
if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){
for(let j=0;j<item.fzsj.fzList.length;j++){
let fzItem = item.fzsj.fzList[j]
tmpResource.push({
mc: null,
bh: item.fzsj.mybh+fzItem.subCode,
ph: null,
ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
nd: item.hhwznd,
nddw: content.headerSelectFields.hhwzndUnit,
ly: 'ELN配制',
sxrq: null,
kc: fzItem.num,
kcdw: item.fzsj.dw,
syl: null,
type: null,
elnType: this.product,
syldw:item.fzsj.dw,
yxzq:null,
yxzqdw:null,
})
fzTotal=addDecimals(fzTotal,fzItem.num)
}
}
//生成的
const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit]) const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
tmpResource.push({ tmpResource.push({
@ -347,16 +411,20 @@ export default {
sxrq: null, sxrq: null,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null, type: null,
elnType: this.product, elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null, yxzq:null,
yxzqdw:null, yxzqdw:null,
}) })
} }
} }
} }
debugger
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

Write Preview
Loading…
Cancel
Save