diff --git a/src/components/dialogCom/lookProcess.vue b/src/components/dialogCom/lookProcess.vue index 5badf88..0593a74 100644 --- a/src/components/dialogCom/lookProcess.vue +++ b/src/components/dialogCom/lookProcess.vue @@ -96,6 +96,7 @@ export default { label: '零件名称', prop: 'partName', search: false, + width: 170, }, { label: '一级工艺计划(A)号', @@ -152,6 +153,7 @@ export default { // }); }, cancel() { + this.setCrewShow = false; this.$emit('cancel', false); }, onLoad() { @@ -160,7 +162,9 @@ export default { }, mounted() { this.setCrewShow = this.isOpen - } -}; + console.log(this.isOpen,90) + console.log(this.setCrewShow,80) + }, +} diff --git a/src/views/orderManagement/allocationMessQuery.vue b/src/views/orderManagement/allocationMessQuery.vue index 7349228..586b4ba 100644 --- a/src/views/orderManagement/allocationMessQuery.vue +++ b/src/views/orderManagement/allocationMessQuery.vue @@ -8,7 +8,7 @@ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> - + - @@ -64,7 +64,7 @@ import rushDialog from './components/rushDialog.vue' import batchDialog from './components/batchDialog.vue' export default { components: { - + // rushDialog, // batchDialog }, @@ -127,10 +127,10 @@ export default { searchShowBtn: false, excelBtn: true, showOverflowTooltip: true, - addBtnIcon: ' ', - viewBtnIcon: ' ', - delBtnIcon: ' ', - editBtnIcon: ' ', + addBtnIcon: ' ', + viewBtnIcon: ' ', + delBtnIcon: ' ', + editBtnIcon: ' ', gridBtn: false, searchLabelPosition: 'left', searchLabelPosition: 'left', @@ -140,322 +140,322 @@ export default { gridBtn: false, searchMenuPosition: 'right', align: 'center', - menu:false, + menu: false, column: [ { - label: '配套单号', - prop: 'poCode', - search: true, - sortable: true, - width: 150, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '父件号', - prop: 'partCode', - search: false, - sortable: true, - width: 180, - span: 12, - headerAlign: 'center', - align: 'center', - - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '型号', - prop: 'productType', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '生产标识', - prop: 'partName', - search: false, - sortable: true, - disabled: true, - span: 12, - width: 150, - headerAlign: 'center', - align: 'left', - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '需求日期', - prop: 'plate', - search: false, - sortable: true, - disabled: true, - span: 12, - width: 150, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '父件批次', - prop: 'plate', - search: false, - sortable: true, - width: 120, - display: false, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '父件配套数', - prop: 'prodIdent', - search: false, - sortable: true, - width: 120, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '配套序号', - prop: 'useDept', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '主制部门', - prop: 'poQty', - search: true, - sortable: true, - width: 120, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划标记', - prop: 'poArea', - search: false, - sortable: true, - width: 120, - span: 12, - disabled: true, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - - { - label: '制造订单号', - prop: 'demandDate', - search: false, - sortable: true, - width: 150, - span: 12, - headerAlign: 'center', - align: 'center', + label: '配套单号', + prop: 'poCode', + search: true, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '父件号', + prop: 'partCode', + search: false, + sortable: true, + width: 180, + span: 12, + headerAlign: 'center', + align: 'center', + + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '型号', + prop: 'productType', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产标识', + prop: 'partName', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + align: 'left', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '需求日期', + prop: 'plate', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '父件批次', + prop: 'plate', + search: false, + sortable: true, + width: 120, + display: false, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '父件配套数', + prop: 'prodIdent', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '配套序号', + prop: 'useDept', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '主制部门', + prop: 'poQty', + search: true, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划标记', + prop: 'poArea', + search: false, + sortable: true, + width: 120, + span: 12, + disabled: true, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + + { + label: '制造订单号', + prop: 'demandDate', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划员', + prop: 'planUser', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '调度员', + prop: 'dispatcher', + search: false, + sortable: true, + searchLabelWidth: 100, + width: 170, + span: 12, + type: "date", + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '配套日期', + prop: 'releaseDate', + search: true, + sortable: true, + span: 24, + type: 'textarea', + width: 150, + headerAlign: 'center', + align: 'left', + type: 'date', + searchRange: true, + startPlaceholder: '开始时间', + endPlaceholder: "结束时间", + + }, + { + label: '保管员', + prop: 'createName1', + search: false, + sortable: true, + span: 12, + headerAlign: 'center', + align: 'center', + width: 150, + + }, + { + label: '条码序号', + prop: 'index', + search: false, + sortable: true, + span: 12, + headerAlign: 'center', + align: 'center', + width: 150, + + }, + { + label: '计划部门', + prop: 'planPart', + search: false, + sortable: true, + span: 12, + headerAlign: 'center', + align: 'center', + width: 150, + + }, + + + { + label: '物料标识', + prop: 'materialCode', + search: false, + sortable: true, + span: 12, + headerAlign: 'center', + align: 'center', + width: 150, + + + }, + { + label: '备注', + prop: 'memo', + search: false, + sortable: true, + span: 12, + headerAlign: 'center', + align: 'center', + width: 150, + + }, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划员', - prop: 'planUser', - search: false, - sortable: true, - width: 120, - span: 12, - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '调度员', - prop: 'releaseDate', - search: false, - sortable: true, - searchLabelWidth: 100, - width: 170, - span: 12, - type: "date", - headerAlign: 'center', - align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '配套日期', - prop: 'memo', - search: true, - sortable: true, - span: 24, - type: 'textarea', - width: 150, - headerAlign: 'center', - align: 'left', - type:'date', - searchRange:true, - startPlaceholder: '开始时间', - endPlaceholder: "结束时间", - - }, - { - label: '保管员', - prop: 'createName', - search: false, - sortable: true, - span: 12, - headerAlign: 'center', - align: 'center', - width: 150, - - }, - { - label: '条码序号', - prop: 'createName', - search: false, - sortable: true, - span: 12, - headerAlign: 'center', - align: 'center', - width: 150, - - }, - { - label: '计划部门', - prop: 'createName', - search: false, - sortable: true, - span: 12, - headerAlign: 'center', - align: 'center', - width: 150, - - }, - - { - label: '物料标识', - prop: 'createName', - search: false, - sortable: true, - span: 12, - headerAlign: 'center', - align: 'center', - width: 150, - - - }, - { - label: '备注', - prop: 'createName', - search: false, - sortable: true, - span: 12, - headerAlign: 'center', - align: 'center', - width: 150, - - }, - - ], }, data: [], - isRushOpen:false,//加急弹框 - isBatchOpen:false,//分批处理 + isRushOpen: false,//加急弹框 + isBatchOpen: false,//分批处理 }; }, computed: { @@ -529,10 +529,10 @@ export default { }); }, // 加急 - rushFn(){ + rushFn() { this.isRushOpen = true }, - closeDialog(){ + closeDialog() { this.isRushOpen = false this.isBatchOpen = false }, @@ -829,6 +829,7 @@ export default { "deptTypeTitle": "厂", "keyValue": 47, "memo": null, + "materialCode":'20230208', "orders": "6", "parentDeptId": 41, "parentPath": null, @@ -968,6 +969,11 @@ export default { "keyValue": 41417, "memo": "同一批次,可提前交件", "partCode": "21E100-001-3900-E34", + "dispatcher": "0300092", + "releaseDate": "2023-03-07 00:00:00", + "createName1": "0300091", + "index": 0, + "planPart":'2', "partName": "LRMT振动机架底板", "planType": 1, "planUser": "0300092", diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue index c19008b..0da6262 100644 --- a/src/views/orderManagement/components/exception/dataMissing.vue +++ b/src/views/orderManagement/components/exception/dataMissing.vue @@ -219,7 +219,7 @@ export default { }, { label: '镀种小类', - prop: 'plate', + prop: 'plate1', search: false, sortable: true, width: 120, @@ -389,11 +389,16 @@ export default { methods: { // 关闭订单 - claseOrder() { - this.$confirm('确定将选择订单数据批量关闭?', { + claseOrder(){ + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请选择至少一条数据'); + return; + } + this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -447,6 +452,7 @@ export default { this.loading = true; this.data = [ { + id:1, "alreadyBranchQty": 500.0, "bsPlatingSmall": { "bpsId": 5, @@ -1200,6 +1206,7 @@ export default { "wcName": null }, { + id:2, "alreadyBranchQty": 200.0, "bsPlatingSmall": { "bpsId": 5, diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue index 3bed364..9f1935f 100644 --- a/src/views/orderManagement/components/exception/deliveryDate.vue +++ b/src/views/orderManagement/components/exception/deliveryDate.vue @@ -204,7 +204,7 @@ export default { }, { label: '镀种小类', - prop: 'plate', + prop: 'plate1', search: false, sortable: true, width: 120, @@ -376,10 +376,15 @@ export default { methods: { // 关闭订单 claseOrder() { - this.$confirm('确定将选择订单数据批量关闭?', { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请至少选择一条数据!') + return; + } + this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -665,6 +670,7 @@ export default { "planType": 1, "planUser": "3500371", "plate": "Ct.P", + "plate1": "Ct", "poArea": 0.0, "poCode": "WO-P22120483", "poId": 58382, diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index 4e93a88..4011634 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -204,7 +204,7 @@ export default { }, { label: '镀种小类', - prop: 'plate', + prop: 'plate1', search: false, sortable: true, width: 120, @@ -426,10 +426,15 @@ export default { methods: { // 合规检验 complianceCheck(){ + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请选择至少一条数据'); + return; + } this.$confirm('确定将选择数据进行合规检验?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -444,10 +449,15 @@ export default { }, // 关闭订单 claseOrder() { - this.$confirm('确定将选择订单数据批量关闭?', { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请选择至少一条数据'); + return; + } + this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -735,6 +745,7 @@ export default { "planType": 1, "planUser": "3500371", "plate": "Ct.P", + "plate1": "Ct11", "poArea": 0.0, "poCode": "WO-P22120483", "poId": 58382, diff --git a/src/views/orderManagement/components/exception/resourceMissing.vue b/src/views/orderManagement/components/exception/resourceMissing.vue index 6c353ef..f66c110 100644 --- a/src/views/orderManagement/components/exception/resourceMissing.vue +++ b/src/views/orderManagement/components/exception/resourceMissing.vue @@ -206,7 +206,7 @@ export default { }, { label: '镀种小类', - prop: 'plate', + prop: 'plateSubType', search: false, sortable: true, width: 120, @@ -392,12 +392,17 @@ export default { }, methods: { - // 合规检验 + // 合规检验 complianceCheck(){ + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请选择至少一条数据'); + return; + } this.$confirm('确定将选择数据进行合规检验?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -412,10 +417,15 @@ export default { }, // 关闭订单 claseOrder() { - this.$confirm('确定将选择订单数据批量关闭?', { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请选择至少一条数据'); + return; + } + this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -707,6 +717,7 @@ export default { "planType": 1, "planUser": "3500371", "plate": "Ct.P", + "plateSubType": "P", "poArea": 0.0, "poCode": "WO-P22120483", "poId": 58382, diff --git a/src/views/orderManagement/components/lookProcess.vue b/src/views/orderManagement/components/lookProcess.vue new file mode 100644 index 0000000..9a0525f --- /dev/null +++ b/src/views/orderManagement/components/lookProcess.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/views/orderManagement/components/mold/addMoldDailog.vue b/src/views/orderManagement/components/mold/addMoldDailog.vue index adf7832..c188d12 100644 --- a/src/views/orderManagement/components/mold/addMoldDailog.vue +++ b/src/views/orderManagement/components/mold/addMoldDailog.vue @@ -1,118 +1,147 @@ + - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/orderManagement/components/mold/moldRecord.vue b/src/views/orderManagement/components/mold/moldRecord.vue index f3951cf..ca39d79 100644 --- a/src/views/orderManagement/components/mold/moldRecord.vue +++ b/src/views/orderManagement/components/mold/moldRecord.vue @@ -499,6 +499,7 @@ export default { "createTime": "2024-01-25 16:06:40", "erpWoCode": null, "keeper": { + "userName": "崔殿龙", "accountId": 602, "card": null, "createTime": "2023-04-06", @@ -554,7 +555,7 @@ export default { "partCode": "21E6-002-4245-B1", "partName": "外购插座部件", "planType": "21E6-002-4245-B1", - "planTypeName": null, + "planTypeName": 1, "poId": null, "quaLevel": "11", "quantity": 1, diff --git a/src/views/orderManagement/components/mold/moldRequire.vue b/src/views/orderManagement/components/mold/moldRequire.vue index f7475a4..dfaee44 100644 --- a/src/views/orderManagement/components/mold/moldRequire.vue +++ b/src/views/orderManagement/components/mold/moldRequire.vue @@ -152,7 +152,7 @@ export default { }, { label: '工装号', - prop: 'poCode', + prop: 'toolingNo', search: true, sortable: true, span: 12, @@ -219,10 +219,15 @@ export default { methods: { // 关闭需求 closeNeed() { - this.$confirm('确定将选择需求关闭?', { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.error('请至少选择一条数据!') + return; + } + this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'error', }) .then(() => { // return remove(row.id); @@ -480,6 +485,9 @@ export default { "plate": "Ep.Ni3b", "poArea": 0.0, "poCode": "WO-2211134240", + "poCode1": "4240", + "poCode2": "40", + "toolingNo" :"888", "poId": 43933, "poQty": 104, "primaryCraft": "4(封接、表、涂色带)-库2", diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue index 7dfcf8b..9baed5d 100644 --- a/src/views/orderManagement/components/orderUpdateDailog.vue +++ b/src/views/orderManagement/components/orderUpdateDailog.vue @@ -53,7 +53,7 @@ - + diff --git a/src/views/orderManagement/components/priorityDialog.vue b/src/views/orderManagement/components/priorityDialog.vue index 8989184..c110cbb 100644 --- a/src/views/orderManagement/components/priorityDialog.vue +++ b/src/views/orderManagement/components/priorityDialog.vue @@ -51,8 +51,23 @@ export default { closeDialog(){ this.openShow = false this.$emit('closeDialog'); + }, + submit() { + if (!this.form.value1) { + this.$message.warning('请选择优先级'); + return; + } + this.$emit('submitPriority', { + priority: this.form.value1 + }); + this.closeDialog(); } - } + }, + + watch:{ + showDialog(val){ + this.openShow = val + } } } \ No newline at end of file diff --git a/src/views/orderManagement/components/sinTerYieIdDialog.vue b/src/views/orderManagement/components/sinTerYieIdDialog.vue new file mode 100644 index 0000000..c110cbb --- /dev/null +++ b/src/views/orderManagement/components/sinTerYieIdDialog.vue @@ -0,0 +1,73 @@ + + + \ No newline at end of file diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue index 8a981d9..2f91d8a 100644 --- a/src/views/orderManagement/planYieIdOrder.vue +++ b/src/views/orderManagement/planYieIdOrder.vue @@ -32,14 +32,14 @@ @@ -54,7 +54,15 @@ - + + + @@ -72,7 +80,7 @@ import { } from '@/api/system/role'; import { mapGetters } from 'vuex'; import { validatenull } from '@/utils/validate'; - +import lookProcess from './components/lookProcess.vue' // import rushDialog from './components/rushDialog.vue' // import batchDialog from './components/batchDialog.vue' import orderUpdateDailog from './components/orderUpdateDailog.vue' @@ -80,9 +88,10 @@ import priorityDialog from './components/priorityDialog.vue' export default { components: { orderUpdateDailog, - priorityDialog + priorityDialog, // rushDialog, // batchDialog + lookProcess }, data() { return { @@ -170,14 +179,14 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入计划单号', trigger: 'blur', }, ], }, { label: '生产单号', - prop: 'poCode', + prop: 'str0', search: true, sortable: true, width: 150, @@ -187,14 +196,14 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入生产单号', trigger: 'blur', }, ], }, { label: '零件号', - prop: 'partCode', + prop: 'str1', search: true, sortable: true, width: 180, @@ -205,14 +214,14 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入零件号', trigger: 'blur', }, ], }, { label: '批次号', - prop: 'poCode', + prop: 'str2', search: true, sortable: true, width: 150, @@ -222,7 +231,7 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入批次号', trigger: 'blur', }, ], @@ -240,14 +249,14 @@ export default { rules: [ { required: false, - message: '请输入角色名称', + message: '请输入产品型号', trigger: 'blur', }, ], }, { label: '产品名称', - prop: 'partName', + prop: 'productName', search: false, sortable: true, disabled: true, @@ -258,14 +267,14 @@ export default { rules: [ { required: false, - message: '请输入角色名称', + message: '请输入产品名称', trigger: 'blur', }, ], }, { label: '流程卡号', - prop: 'poCode', + prop: 'poCode1', search: true, sortable: true, width: 150, @@ -282,7 +291,7 @@ export default { }, { label: '流转编号', - prop: 'poCode', + prop: 'poCode2', search: true, sortable: true, width: 150, @@ -306,6 +315,21 @@ export default { span: 12, headerAlign: 'center', align: 'center', + type: 'select', + dicData: [ + { + label: '一级', + value: '1', + }, + { + label: '二级', + value: '2', + }, + { + label: '三级', + value: '3', + }, + ], rules: [ { required: true, @@ -314,6 +338,7 @@ export default { }, ], }, + { label: '镀种', prop: 'plate', @@ -425,7 +450,7 @@ export default { prop: 'demandDate', search: false, sortable: true, - width: 150, + width: 180, span: 12, headerAlign: 'center', align: 'center', @@ -507,8 +532,6 @@ export default { }, ], }, - - { label: '订单状态', prop: 'curStatusText', @@ -521,11 +544,11 @@ export default { headerAlign: 'center', align: 'center', dicData: [{ - value: 2, - label: '已退回' + value: 1, + label: '已下发' }, { - value: 4, - label: '已派工' + value: 2, + label: '未下发' }, { value: 5, label: '加工中' @@ -604,6 +627,9 @@ export default { priorityFn() { this.isPriorityOpen = true }, + handlePrioritySubmit(data) { + this.$message.success(`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}`); + }, // 修改 updateFn() { this.isUpdateOpen = true @@ -628,6 +654,11 @@ export default { }, // 批量关闭 batchClose() { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.warning('请选择至少一条数据'); + return; + } this.$confirm('确定将选择数据批量关闭?', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -653,6 +684,7 @@ export default { this.isBatchOpen = false this.isUpdateOpen = false this.isPriorityOpen = false + this.isOpen = false }, inBatchesFn(row) { this.rowItem = row; @@ -1129,11 +1161,17 @@ export default { "plate": "Ct.Ocd", "poArea": 18.3376140803, "poCode": "WO-2212149345", + "str0": "12212149345", + "str1": "22212149345", + "str2": "49345", + "poCode1": "22121249345", + "poCode2": "2212149322245", "poId": 41417, "poQty": 5, "primaryCraft": "库1-2(机加)-4(表)-库2", "priority": 1, "prodIdent": "JII", + "orderPriority":1, "prodLine": "test", "productType": "LRMT", "releaseDate": "2022-12-28 09:07:31", @@ -1400,6 +1438,8 @@ export default { }, { id: 3, + "orderType": 2, // 石墨模订单 + "glassPlateIssuedStatus": null, // 非烧结订单,玻璃饼下发状态为空 "alreadyBranchQty": 3.0, "bsPlatingmedium": { "bpsId": 5, @@ -1652,6 +1692,8 @@ export default { }, { id: 4, + "orderType": 0, // 烧结订单 + "glassPlateIssuedStatus": 0, // 烧结订单,玻璃饼下发状态为未下发 "alreadyBranchQty": 1.0, "bsPlatingSmall": { "bpsId": 6, diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index ac5837a..d3bd37e 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -29,8 +29,8 @@ - - \ No newline at end of file + \ No newline at end of file