Browse Source

feat:[模板管理][update]

ouqian
luojie 1 month ago
parent
commit
f11c1fead9
23 changed files with 39 additions and 30 deletions
  1. +1
    -1
      src/components/Template/Step.vue
  2. +7
    -8
      src/components/Template/StepFormPackage.vue
  3. +4
    -0
      src/components/Template/mixins/stepMixins.js
  4. +1
    -1
      src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
  5. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP001.vue
  6. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP002.vue
  7. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP003.vue
  8. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP004.vue
  9. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP005.vue
  10. +1
    -1
      src/views/business/comps/template/comps/gsp/GSP010.vue
  11. +1
    -1
      src/views/business/comps/template/comps/lba/LBA002.vue
  12. +1
    -1
      src/views/business/comps/template/comps/lba/LBA003.vue
  13. +1
    -1
      src/views/business/comps/template/comps/lba/LBA004.vue
  14. +1
    -1
      src/views/business/comps/template/comps/lba/LBA006.vue
  15. +1
    -1
      src/views/business/comps/template/comps/sp/SP001.vue
  16. +1
    -1
      src/views/business/comps/template/comps/sp/SP003.vue
  17. +1
    -1
      src/views/business/comps/template/comps/sp/SP008.vue
  18. +1
    -1
      src/views/business/comps/template/comps/sp/SP009.vue
  19. +1
    -1
      src/views/business/comps/template/formConfig/PCRTableConfig.js
  20. +1
    -1
      src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
  21. +1
    -1
      src/views/business/comps/template/formConfig/sp/SP0019.js
  22. +1
    -1
      src/views/business/comps/template/formConfig/sp/SP007.js
  23. +8
    -2
      src/views/business/comps/template/mixins/templateMixin.js

+ 1
- 1
src/components/Template/Step.vue View File

@ -5,7 +5,7 @@
<draggable v-model="steps" ghost-class="ghost" handle=".drag-handle" @end="onDragEnd" :animation="200">
<div v-for="(step, index) in steps" :key="step.id" class="step-list-item">
<div class="step-content">
<i class="el-icon-rank drag-handle" style="cursor: move; margin-right: 10px; margin-top: 6px;"></i>
<i class="el-icon-rank drag-handle" v-if="templateFillType === 'preFill'" style="cursor: move; margin-right: 10px; margin-top: 6px;"></i>
<span class="step-title">{{ index + 1 }}</span>
<HandleFormItem type="select" placeholder="请选择" class="step-type-select" :item="stepSelectConfig"
v-model="step.type" @change="onTypeChange(index)" />

+ 7
- 8
src/components/Template/StepFormPackage.vue View File

@ -4,25 +4,25 @@
<div v-for="(sItem, key) in item.config" class="step-item" :key="key">
<template v-if="sItem.type === 'input'">
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" @blur="onBlur(key, $event)"
:item="sItem" v-model="formFields[key]" :field-key="prefixKey+uuid + '_' + key"
:item="sItem" v-model="formFields[key]" :field-key="prefixKey+'_' + key"
@copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
:orange-bg="orangeBgFields[key]" />
</template>
<template v-else-if="sItem.type === 'inputNumber'">
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
type="inputNumber" @blur="onBlur(key, $event)" :item="sItem"
@input="onInputNumberChange(key, $event)" v-model="formFields[key]" @copy="onCopy(sItem, key)"
:error="errors[key]" @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
</template>
<template v-else-if="sItem.type === 'select'">
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
type="select" @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
@change="onSelectChange(key, $event, sItem.type)"
@copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
:orange-bg="orangeBgFields[key]" />
</template>
<template v-else-if="sItem.type === 'checkbox'">
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
type="checkbox" :item="sItem" v-model="formFields[key]"
@change="onSelectChange(key, $event, sItem.type)"
@copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
@ -36,7 +36,7 @@
</template>
<!-- 仪器instrumentsj(药剂) gsp(供试品) mix药剂/供试品/给药制剂 -->
<template v-else-if="isRegent(sItem)">
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
<HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+ '_' + key"
:type="sItem.type" :error="errors[key]"
@onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
@update:error="errors[key] = false" :item="getRegentItem(sItem)"
@ -55,7 +55,7 @@
<div v-show="isShowOther(formFields[key])" class="flex flex1">
<div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
<HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
<HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
:error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
:orange-bg="orangeBgFields[sItem.otherCode]" />
@ -72,7 +72,7 @@ import formPackageMixins from '@/components/Template/mixins/formPackageMixins.js
import ZLSubPackage from '@/components/Template/StepComponents/ZLSubPackage.vue'
import { isShowOther } from "@/utils/formPackageCommon.js";
import { EventBus } from "@/utils/eventBus";
import { getuuid,isRegent} from "@/utils/index.js";
import { isRegent} from "@/utils/index.js";
import moment from 'moment'
export default {
inject: ['templateFillType','templateData'],
@ -112,7 +112,6 @@ export default {
orangeBgFields: {},//
isShowOther,
currentClickKey: "",//key
uuid:getuuid(),
isRegent,
}
},

+ 4
- 0
src/components/Template/mixins/stepMixins.js View File

@ -8,6 +8,10 @@ export default {
formData: {
type: Object,
default: () => ({})
},
stepIndex: {
type: Number,
default: 0
}
},
methods: {

+ 1
- 1
src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue View File

@ -133,7 +133,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP001.vue View File

@ -132,7 +132,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP002.vue View File

@ -149,7 +149,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
}

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP003.vue View File

@ -155,7 +155,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP004.vue View File

@ -162,7 +162,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
}

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP005.vue View File

@ -157,7 +157,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/gsp/GSP010.vue View File

@ -112,7 +112,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/lba/LBA002.vue View File

@ -105,7 +105,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/lba/LBA003.vue View File

@ -90,7 +90,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/lba/LBA004.vue View File

@ -166,7 +166,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/comps/lba/LBA006.vue View File

@ -111,7 +111,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

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

@ -129,7 +129,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

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

@ -131,7 +131,7 @@ export default {
versionNum: {
label: "template.common.versionNumber",
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50,
},

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

@ -140,7 +140,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

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

@ -144,7 +144,7 @@ export default {
versionNum: {
label: 'template.common.versionNumber',
type: "inputNumber",
fillType: "actFill",
fillType: "preFill",
prepend: "V",
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/formConfig/PCRTableConfig.js View File

@ -453,7 +453,7 @@ export const getBaseInfoFormConfig = ($this) => {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
}

+ 1
- 1
src/views/business/comps/template/formConfig/paralleAndLadderConfig.js View File

@ -498,7 +498,7 @@ export const getBaseInfoFormConfig = ($this) => {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
}

+ 1
- 1
src/views/business/comps/template/formConfig/sp/SP0019.js View File

@ -22,7 +22,7 @@ export const getBaseInfoFormConfig = (formType) => {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
},

+ 1
- 1
src/views/business/comps/template/formConfig/sp/SP007.js View File

@ -22,7 +22,7 @@ export const getBaseInfoFormConfig = ($this) => {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
fillType: 'actFill',
fillType: 'preFill',
prepend: 'V',
maxlength: 50
},

+ 8
- 2
src/views/business/comps/template/mixins/templateMixin.js View File

@ -535,11 +535,17 @@ export default {
targetStartSolutionUnit:subTargetAcSolutionUnit,
headerSelectFields
}
if (isValueEmpty(targetAcSolution)) {
let initNd = 0;
if(rowIndex === 0){
initNd = targetAcSolution;
}else{
initNd = dataSource[rowIndex - 1].actSolutionConcentration;
}
if (isValueEmpty(initNd)) {
this.$message.error('请先选择起始源溶液')
return
} else {
const volResult = this.updateSjmbrynd(item, targetAcSolution,p)
const volResult = this.updateSjmbrynd(item, initNd,p)
if (!volResult) {
return
}

Loading…
Cancel
Save