Browse Source

fix:[模板管理]sp001,sp002,sp003,sp00456

lkf
15881625488@163.com 2 months ago
parent
commit
4ea2168e51
3 changed files with 24 additions and 6 deletions
  1. +1
    -0
      src/views/business/comps/template/comps/sp/SP002.vue
  2. +10
    -4
      src/views/business/comps/template/comps/sp/SP003.vue
  3. +13
    -2
      src/views/business/comps/template/comps/sp/SP00456.vue

+ 1
- 0
src/views/business/comps/template/comps/sp/SP002.vue View File

@ -307,6 +307,7 @@ export default {
kc: content.targetActVolume, kc: content.targetActVolume,
kcdw: content.targetActVolumeUnit, kcdw: content.targetActVolumeUnit,
syl: null, syl: null,
type: null,
elnType: this.product, elnType: this.product,
syldw: content.targetActVolumeUnit, syldw: content.targetActVolumeUnit,
yxzq: content.effectivePeriod, yxzq: content.effectivePeriod,

+ 10
- 4
src/views/business/comps/template/comps/sp/SP003.vue View File

@ -52,9 +52,9 @@ import CustomTable from '@/components/Template/CustomTable.vue';
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { addTj } from "@/utils/calUnitTools";
import { addTj ,uniqeResource} from "@/utils/calUnitTools";
export default { export default {
name: "SWYPBQGZYZBB",
name: "SP003",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion }, components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },
mixins: [templateMixin], mixins: [templateMixin],
props: { props: {
@ -577,6 +577,8 @@ export default {
sxrq: content.expireDate, sxrq: content.expireDate,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: unit, syldw: unit,
yxzq: content.effectivePeriod, yxzq: content.effectivePeriod,
@ -595,6 +597,8 @@ export default {
sxrq: content.expireDate, sxrq: content.expireDate,
kc: item.fzsj.fzList[j].num, kc: item.fzsj.fzList[j].num,
kcdw: item.fzsj.dw, kcdw: item.fzsj.dw,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: item.fzsj.dw, syldw: item.fzsj.dw,
yxzq: content.effectivePeriod, yxzq: content.effectivePeriod,
@ -607,8 +611,10 @@ export default {
//使 //使
} }
this.resourceTmp = tmpResource
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
this.yqResourceTmp = stepResource.yqResource||[]
return content; return content;
}, },
async onSave() { async onSave() {

+ 13
- 2
src/views/business/comps/template/comps/sp/SP00456.vue View File

@ -111,7 +111,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
import { getExpireDate } from "@/utils/index.js"; import { getExpireDate } from "@/utils/index.js";
import moment from "moment"; import moment from "moment";
import { addTj } from "@/utils/calUnitTools";
import { addTj,uniqeResource } from "@/utils/calUnitTools";
import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js"; import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
export default { export default {
name: "SP00456", name: "SP00456",
@ -597,6 +597,8 @@ export default {
sxrq: ladderConfigs.expireDate, sxrq: ladderConfigs.expireDate,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: unit, syldw: unit,
yxzq: ladderConfigs.effectivePeriod, yxzq: ladderConfigs.effectivePeriod,
@ -616,6 +618,8 @@ export default {
sxrq: ladderConfigs.expireDate, sxrq: ladderConfigs.expireDate,
kc: fzsj.fzList[k].num, kc: fzsj.fzList[k].num,
kcdw: fzsj.dw, kcdw: fzsj.dw,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit, syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
yxzq: ladderConfigs.effectivePeriod, yxzq: ladderConfigs.effectivePeriod,
@ -644,6 +648,8 @@ export default {
sxrq: stepTableFormData[j].targetSolutionExpirationDate, sxrq: stepTableFormData[j].targetSolutionExpirationDate,
kc: total, kc: total,
kcdw: unit, kcdw: unit,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: unit, syldw: unit,
yxzq: stepTableFormData[j].targetSolutionCycle, yxzq: stepTableFormData[j].targetSolutionCycle,
@ -663,6 +669,8 @@ export default {
sxrq: paralleConfigs.expireDate, sxrq: paralleConfigs.expireDate,
kc: fzsj.fzList[k].num, kc: fzsj.fzList[k].num,
kcdw: fzsj.dw, kcdw: fzsj.dw,
type: null,
elnType: this.product,
syl: null, syl: null,
syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit, syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
yxzq: paralleConfigs.effectivePeriod, yxzq: paralleConfigs.effectivePeriod,
@ -674,7 +682,10 @@ export default {
} }
} }
} }
this.resourceTmp = tmpResource
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
this.yqResourceTmp = stepResource.yqResource||[]
return content; return content;
}, },
async onSave() { async onSave() {

Loading…
Cancel
Save