diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js index d9dfd58..09c6832 100644 --- a/src/api/orderManagement/planYieIdOrder.js +++ b/src/api/orderManagement/planYieIdOrder.js @@ -51,7 +51,7 @@ export const closeBatchs = ids => { return request({ url: '/blade-desk/order/yieldOrder/closeBatch', method: 'post', - data: ids, + params: ids, }); }; @@ -61,7 +61,7 @@ export const closeBatchs = ids => { return request({ url: '/blade-desk/order/yieldOrder/updatePreference', method: 'post', - data: row, + params: row, }); }; diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue index ae1ab66..3c80f72 100644 --- a/src/views/orderManagement/components/exception/dataMissing.vue +++ b/src/views/orderManagement/components/exception/dataMissing.vue @@ -122,7 +122,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 100, + menuWidth: 80, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -141,7 +141,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue index c361c4a..202d1d2 100644 --- a/src/views/orderManagement/components/exception/deliveryDate.vue +++ b/src/views/orderManagement/components/exception/deliveryDate.vue @@ -103,7 +103,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 100, + menuWidth: 80, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -116,13 +116,12 @@ export default { viewBtnIcon: ' ', delBtnIcon: ' ', editBtnIcon: ' ', - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchLabelPosition: 'left', searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index bb0fcef..364ad18 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -104,7 +104,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 100, + menuWidth: 80, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -123,7 +123,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/components/exception/resourceMissing.vue b/src/views/orderManagement/components/exception/resourceMissing.vue index 9c4af0e..a636229 100644 --- a/src/views/orderManagement/components/exception/resourceMissing.vue +++ b/src/views/orderManagement/components/exception/resourceMissing.vue @@ -113,7 +113,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 150, + menuWidth: 140, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -132,7 +132,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue index cb82e70..cf04c47 100644 --- a/src/views/orderManagement/components/orderUpdateDailog.vue +++ b/src/views/orderManagement/components/orderUpdateDailog.vue @@ -280,6 +280,7 @@ export default { update(this.formData).then(res => { console.log(res); if(res.data.code===200){ + this.$message.success('修改成功') this.openShow = false; this.$emit("closeDialog",true) diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue index c328197..1868b01 100644 --- a/src/views/orderManagement/planYieIdOrder.vue +++ b/src/views/orderManagement/planYieIdOrder.vue @@ -171,7 +171,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 160, + menuWidth: 140, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -189,7 +189,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index 02acdd4..048af92 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -172,7 +172,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 120, + menuWidth: 100, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -191,7 +191,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue index 4fb2a47..917b58a 100644 --- a/src/views/orderManagement/sinTerPlanOrder.vue +++ b/src/views/orderManagement/sinTerPlanOrder.vue @@ -157,7 +157,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 120, + menuWidth: 100, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -175,7 +175,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/orderManagement/sinTerYieIdOrder.vue b/src/views/orderManagement/sinTerYieIdOrder.vue index 32dc639..911fb61 100644 --- a/src/views/orderManagement/sinTerYieIdOrder.vue +++ b/src/views/orderManagement/sinTerYieIdOrder.vue @@ -214,7 +214,7 @@ export default { editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 160, + menuWidth: 140, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -233,7 +233,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', @@ -415,26 +415,38 @@ export default { align: 'center', type: 'select', dicData: [ - { - label: '烧结订单', - value: 0, - }, - { - label: '玻璃饼订单', - value: 1, - }, - { - label: '石墨模订单', - value: 2, - }, - { - label: '插针订单', - value: 3, - }, - { - label: '壳体订单', - value: 4, - }, + // YIELD_TYPE_1("热表订单", 12001), + // YIELD_TYPE_2("烧结订单", 12002), + // YIELD_TYPE_3("玻璃饼", 12003), + // YIELD_TYPE_4("壳体", 12004), + // YIELD_TYPE_5("插针", 12005), + // YIELD_TYPE_6("石墨模", 12006), + {label: '热表订单', value: 12001}, + {label: '烧结订单', value: 12002}, + {label: '玻璃饼', value: 12003}, + {label: '壳体', value: 12004}, + {label: '插针', value: 12005}, + {label: '石墨模', value: 12006} + // { + // label: '烧结订单', + // value: 0, + // }, + // { + // label: '玻璃饼订单', + // value: 1, + // }, + // { + // label: '石墨模订单', + // value: 2, + // }, + // { + // label: '插针订单', + // value: 3, + // }, + // { + // label: '壳体订单', + // value: 4, + // }, ], rules: [ { diff --git a/src/views/productionManagement/components/coatingAddDialog.vue b/src/views/productionManagement/components/coatingAddDialog.vue index e411c0d..2874618 100644 --- a/src/views/productionManagement/components/coatingAddDialog.vue +++ b/src/views/productionManagement/components/coatingAddDialog.vue @@ -133,6 +133,12 @@ export default { }; }, mounted() { + console.log('11111111111') + this.submitForm = {} + this.searchForm = { + materalType: 1, + } + this.tableData = [] this.getWorkCenterList() }, methods: { diff --git a/src/views/productionManagement/components/coatingMater/addRequirements.vue b/src/views/productionManagement/components/coatingMater/addRequirements.vue index ee6ea6e..ea25ecf 100644 --- a/src/views/productionManagement/components/coatingMater/addRequirements.vue +++ b/src/views/productionManagement/components/coatingMater/addRequirements.vue @@ -101,7 +101,7 @@ export default { labelWidth: 120, searchLabelWidth: 120, menu: true, - menuWidth: 70, + menuWidth: 80, dialogWidth: 600, dialogClickModal: false, searchEnter: true, @@ -113,7 +113,7 @@ export default { filterBtn: true, searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/productionManagement/components/coatingMater/assayedContent.vue b/src/views/productionManagement/components/coatingMater/assayedContent.vue index 5c22b7a..080189e 100644 --- a/src/views/productionManagement/components/coatingMater/assayedContent.vue +++ b/src/views/productionManagement/components/coatingMater/assayedContent.vue @@ -102,7 +102,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center', diff --git a/src/views/productionManagement/components/coatingMater/materialRequirements.vue b/src/views/productionManagement/components/coatingMater/materialRequirements.vue index 24fb0f3..407fa5b 100644 --- a/src/views/productionManagement/components/coatingMater/materialRequirements.vue +++ b/src/views/productionManagement/components/coatingMater/materialRequirements.vue @@ -35,7 +35,7 @@ 审核 - + @@ -129,7 +129,7 @@ export default { searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, - menuAlign: 'left', + menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', align: 'center',