feat(打印):客户标签自定义值配置增强校验
This commit is contained in:
parent
19df462613
commit
6e879e54a3
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="execution">
|
||||
<input-select-dialog
|
||||
:modal-obj="shopOrderDialogObj"p
|
||||
:modal-obj="shopOrderDialogObj"
|
||||
:modal-fetch-fun="shopOrderDialogFetchFun"
|
||||
:before-loading-fun="changeShopOrderType"
|
||||
:modal-show.sync="shopOrderDialogVisible"
|
||||
|
||||
@ -79,7 +79,8 @@ import {fetchList as fetchLabelTemplateList} from '@/api/mes/print/print-label-t
|
||||
import {getByCode as getLabelCategory} from '@/api/mes/print/labelCategory'
|
||||
import { clearValidate } from '@/util/util'
|
||||
import { showLoading, hideLoading } from '@/const/loading'
|
||||
import {changeTemplate} from "@/api/mes/print/sales-order-line-label-value-config";
|
||||
import {changeTemplate, soLineValueSetExists} from "@/api/mes/print/sales-order-line-label-value-config";
|
||||
import {reprint} from "@/api/mes/print/print";
|
||||
|
||||
export default {
|
||||
components: {},
|
||||
@ -144,20 +145,7 @@ export default {
|
||||
let me = this;
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
let param = {
|
||||
labelTempleCode: me.mainForm.labelTempleCode,
|
||||
configItem: me.mainForm.configItem,
|
||||
salesOrderLineBo: me.mainForm.salesOrderLineBo
|
||||
};
|
||||
// 处理响应成功后的操作
|
||||
showLoading()
|
||||
changeTemplate(param).then(response => {
|
||||
hideLoading()
|
||||
this.doConfirm()
|
||||
}).catch(() => {
|
||||
hideLoading()
|
||||
})
|
||||
|
||||
this.checkValueSetExists(me.mainForm);
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -170,6 +158,48 @@ export default {
|
||||
doConfirm() {
|
||||
this.$emit('doConfirm', this.mainForm)
|
||||
this.closeForm()
|
||||
},
|
||||
checkValueSetExists(row) {
|
||||
let me = this;
|
||||
let param = {
|
||||
soNumber: row.soNumber,
|
||||
soLineId: row.soLineId
|
||||
}
|
||||
showLoading()
|
||||
soLineValueSetExists(param).then((response) => {
|
||||
hideLoading()
|
||||
if(response.data.data && response.data.data.configItem === row.configItem) {
|
||||
me.$confirm('当前订单行已配置对应的值集,修改模版后将清除对应的数据,是否确认修改?', '提示', {
|
||||
confirmButtonText: this.$t('common.confirm'),
|
||||
cancelButtonText: this.$t('common.cancel'),
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
me.doChangeConfirm(row)
|
||||
})
|
||||
} else {
|
||||
me.doChangeConfirm(row)
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
hideLoading()
|
||||
})
|
||||
},
|
||||
doChangeConfirm(row) {
|
||||
let me = this;
|
||||
let param = {
|
||||
labelTempleCode: row.labelTempleCode,
|
||||
configItem: row.configItem,
|
||||
salesOrderLineBo: row.salesOrderLineBo
|
||||
};
|
||||
// 处理响应成功后的操作
|
||||
showLoading()
|
||||
changeTemplate(param).then(response => {
|
||||
hideLoading()
|
||||
me.doConfirm()
|
||||
}).catch(() => {
|
||||
hideLoading()
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
@ -235,6 +235,7 @@ import {remote} from '@/api/admin/dict'
|
||||
import {showLoading, hideLoading} from "@/const/loading";
|
||||
import labelTemplateChange from '@/views/mes/print/customer-label/content/label-template-change.vue'
|
||||
import fieldValueSet from '@/views/mes/print/customer-label/content/field-value-set.vue'
|
||||
import {reprint} from "@/api/mes/print/print";
|
||||
|
||||
export default {
|
||||
name: 'customer-label',
|
||||
@ -392,11 +393,12 @@ export default {
|
||||
updateSoLineTemplate(row) {
|
||||
for(let i = 0; i < this.tableData.length; i++) {
|
||||
let data = this.tableData[i]
|
||||
if(data.salesOrderLineBo === row.salesOrderLineBo) {
|
||||
if(data.salesOrderLineBo === row.salesOrderLineBo && data.configItem === row.configItem) {
|
||||
data.labelTempleCode = row.labelTempleCode
|
||||
data.labelCategoryName = row.labelCategoryName
|
||||
data.templateName = row.templateName
|
||||
data.labelCategoryId = row.labelCategoryId
|
||||
this.getValueSetList(row)
|
||||
break
|
||||
}
|
||||
}
|
||||
@ -430,6 +432,10 @@ export default {
|
||||
})
|
||||
},
|
||||
getValueSetList(row) {
|
||||
if(!row) {
|
||||
this.valueSetData = []
|
||||
return;
|
||||
}
|
||||
let param = {
|
||||
labelNumber: row.labelTempleCode,
|
||||
salesOrderLineBo: row.salesOrderLineBo,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user