Browse Source

feat:[模板管理][qxbdType]

ouqian
luojie 1 month ago
parent
commit
ef5da2578d
4 changed files with 12 additions and 0 deletions
  1. +3
    -0
      src/components/Template/CustomTable.vue
  2. +2
    -0
      src/components/Template/HandleFormItem.vue
  3. +1
    -0
      src/components/Template/mixins/formPackageMixins.js
  4. +6
    -0
      src/views/business/comps/template/dialog/SelectMixReagentDialog.vue

+ 3
- 0
src/components/Template/CustomTable.vue View File

@ -777,6 +777,9 @@ export default {
if (col.bodyDisabled) { if (col.bodyDisabled) {
item.disabled = col.bodyDisabled; item.disabled = col.bodyDisabled;
} }
if (col.qxbdType) {
item.qxbdType = col.qxbdType;
}
// checkboxLabel - // checkboxLabel -
const dynamicLabelKey = col.prop + 'Label'; const dynamicLabelKey = col.prop + 'Label';
if (currentItem && currentItem[dynamicLabelKey]) { if (currentItem && currentItem[dynamicLabelKey]) {

+ 2
- 0
src/components/Template/HandleFormItem.vue View File

@ -636,6 +636,8 @@ export default {
}; };
if (type === "mix") { if (type === "mix") {
params.mixType = true; params.mixType = true;
}else if(item.qxbdType){
params.qxbdType = item.qxbdType;
} }
} }
EventBus.$emit(eventName, params) EventBus.$emit(eventName, params)

+ 1
- 0
src/components/Template/mixins/formPackageMixins.js View File

@ -75,6 +75,7 @@ export default {
fillType: item.subFillType || item.fillType, fillType: item.subFillType || item.fillType,
parentLabel: item.label, parentLabel: item.label,
filledCodes: item.filledCodes, filledCodes: item.filledCodes,
qxbdType: item.qxbdType,
} }
}, },

+ 6
- 0
src/views/business/comps/template/dialog/SelectMixReagentDialog.vue View File

@ -99,6 +99,7 @@ export default {
mixType: false,// mixType: false,//
title:"选择试剂", title:"选择试剂",
currentType: '1',// currentType: '1',//
qxbdType:"",//
} }
}, },
computed: { computed: {
@ -119,6 +120,7 @@ export default {
this.currentType = type; this.currentType = type;
if(type==15){ if(type==15){
this.selectedCode = 'id' this.selectedCode = 'id'
this.qxbdType = data.qxbdType || '';
} }
this.mixType = mixType; this.mixType = mixType;
this.sourceFrom = sourceFrom; this.sourceFrom = sourceFrom;
@ -173,6 +175,10 @@ export default {
ndz: (row.nd||"")+(row.nddw||""), ndz: (row.nd||"")+(row.nddw||""),
type: Number(this.selectType), type: Number(this.selectType),
} }
if(this.qxbdType && row.templateSn !== this.qxbdType){
this.$message.error(`请选择正确前序表单`);
return
}
this.$emit('submit', selectedValue, row); this.$emit('submit', selectedValue, row);
// eventBus // eventBus
EventBus.$emit("onMixReagentSubmit", { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType }); EventBus.$emit("onMixReagentSubmit", { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType });

Loading…
Cancel
Save