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

fix:[模板管理]SP009

lkf
HanLong 2 months ago
parent
11ad6b896b
commit
a1408e6d21
2 changed files with 166 additions and 7 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +162
    -5
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP009.vue
  2. +4
    -2
      src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js

+ 162
- 5
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/SP009.vue View File

@ -78,7 +78,8 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
import { EventBus } from "@/utils/eventBus";
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 {
name: "SWYPFXRYPZB",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@ -379,6 +380,7 @@ export default {
type:1
})
}
const result = await getLatestSnArr(postSn)
if(result.code == 200){
for(let i=0;i<stepTableFormData_1.length;i++){
this.$refs.rongyeTableRef.updateDataSourceByRowIndex(i,{
@ -416,7 +418,73 @@ export default {
for(let i=0;i<tableList.length;i++){
//配置的试剂
let item = tableList[i]
console.log('表格item:'+JSON.stringify(item))
//使用的 实际溶液
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: 1,
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: 1,
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.preCode,
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])
tmpResource.push({
@ -430,10 +498,10 @@ export default {
sxrq: null,
kc: total,
kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null,
elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null,
yxzqdw:null,
})
@ -445,6 +513,92 @@ export default {
for(let i=0;i<tableList.length;i++){
//配置的试剂
let item = tableList[i]
console.log('表格item:'+JSON.stringify(item))
//使用的 实际溶液
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: 1,
elnType: this.product,
syldw:content.headerSelectFields.sjryxqlUnit,
yxzq:null,
yxzqdw:null,
})
// 工作液
tmpResource.push({
mc: null,
bh: content.subGzy,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjgzyxql,
type: 1,
elnType: this.product,
syldw:content.headerSelectFields.sjgzyxqlUnit,
yxzq:null,
yxzqdw:null,
})
// 稀释液
tmpResource.push({
mc: null,
bh: content.subXsy,
ph: null,
ndz: null,
nd: null,
nddw: null,
ly: 'ELN配制',
sxrq: null,
kc: null,
kcdw: null,
syl: item.sjxsyxql,
type: 1,
elnType: this.product,
syldw:content.headerSelectFields.sjxsyxqlUnit,
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.preCode,
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.sjryxql, item.sjgzyxql,item.sjxsyxql], [content.headerSelectFields_1.sjryxqlUnit, content.headerSelectFields_1.sjgzyxqlUnit,content.headerSelectFields_1.sjxsyxqlUnit])
tmpResource.push({
mc: null,
@ -457,16 +611,19 @@ export default {
sxrq: null,
kc: total,
kcdw: unit,
syl: null,
syl: fzTotal>0?fzTotal:null,
type: null,
elnType: this.product,
syldw:unit,
syldw:fzTotal>0?item.fzsj.dw:unit,
yxzq:null,
yxzqdw:null,
})
}
}
}
if(tmpResource.length>0){
tmpResource = uniqeResourceOne(tmpResource)
}
//使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 4
- 2
src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js View File

@ -118,13 +118,15 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
{
label: 'template.sp.sp008.bh',
prop: 'bh',
bodyType: 'select',
bodyType: selectKey === '' ? 'input' : 'select',
bodyOptions: $this.getDictOptions(selectKey),
otherCode: 'bhOther',
otherLabel: 'template.sp.sp016.bs',
bodySubType: 'span',
bodySubKey: 'bhCode',
bodyFillType: 'preFill',
width: 280,
myCodeFields: ['bh', 'bhCode'],
myCodeFields: ['bh', 'bhOther', 'bhCode'],
maxVolumeField: 'sjryxql,sjgzyxql,sjxsyxql', //分装的最大量字段
maxVolumeFieldUnit: 'sjryxqlUnit,sjgzyxqlUnit,sjxsyxqlUnit' //分装的最大量单位字段
},

Write Preview
Loading…
Cancel
Save