diff --git a/src/api/labelSetting/com_add_update_label.js b/src/api/labelSetting/com_add_update_label.js new file mode 100644 index 0000000..8dfde84 --- /dev/null +++ b/src/api/labelSetting/com_add_update_label.js @@ -0,0 +1,7 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 插入打印标签的信息数据 +export const insertLabelSetting = data => createAPI('/label/setting/insertLabelSetting','post',data) + +// 修改打印标签的信息数据 +export const updateLabelSetting = data => createAPI('/label/setting/updateLabelSetting','post',data) diff --git a/src/api/labelSetting/label_setting.js b/src/api/labelSetting/label_setting.js new file mode 100644 index 0000000..b55c2cf --- /dev/null +++ b/src/api/labelSetting/label_setting.js @@ -0,0 +1,4 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 获取打印标签的信息数据 +export const getLabelSettingList = data => createAPI('/label/setting/getLabelSettingList','post',data) diff --git a/src/views/modules/labelSetting/com_add_update_label.vue b/src/views/modules/labelSetting/com_add_update_label.vue new file mode 100644 index 0000000..29e76f3 --- /dev/null +++ b/src/views/modules/labelSetting/com_add_update_label.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/src/views/modules/labelSetting/label_setting.vue b/src/views/modules/labelSetting/label_setting.vue new file mode 100644 index 0000000..9e37feb --- /dev/null +++ b/src/views/modules/labelSetting/label_setting.vue @@ -0,0 +1,500 @@ + + + + + + + + diff --git a/src/views/modules/yieldReport/com_separate_roll_with_split.vue b/src/views/modules/yieldReport/com_separate_roll_with_split.vue index 6d12d9c..298960b 100644 --- a/src/views/modules/yieldReport/com_separate_roll_with_split.vue +++ b/src/views/modules/yieldReport/com_separate_roll_with_split.vue @@ -634,9 +634,9 @@ export default { this.pageData.seqNo = scheduleData.seqNo; this.pageData.rollNo = scheduleData.rollNo; this.pageData.operatorId = operatorData.operatorId; - this.pageData.customerId = this.labels.noneData; + this.pageData.customerId = '无'; this.pageData.customerName = ''; - this.pageData.fgPartNo = this.labels.noneData; + this.pageData.fgPartNo = '无'; this.pageData.fgPartDesc = ''; this.pageData.supplierId = '*'; this.pageData.supplierName = ''; @@ -786,9 +786,9 @@ export default { //刷新报工的table表格 this.getCurrentPageTable(); //清空参数 - this.pageData.customerId = this.labels.noneData; + this.pageData.customerId = '无'; this.pageData.customerName = ''; - this.pageData.fgPartNo = this.labels.noneData; + this.pageData.fgPartNo = '无'; this.pageData.fgPartDesc = ''; this.pageData.supplierId = '*'; this.pageData.supplierName = '';