diff --git a/src/api/orderManagement/allocationMessQuery.js b/src/api/orderManagement/allocationMessQuery.js new file mode 100644 index 00000000..0e54c1da --- /dev/null +++ b/src/api/orderManagement/allocationMessQuery.js @@ -0,0 +1,13 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/yieldOrder/pageAllocation', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; diff --git a/src/api/orderManagement/exceptionOrder.js b/src/api/orderManagement/exceptionOrder.js new file mode 100644 index 00000000..13fd3468 --- /dev/null +++ b/src/api/orderManagement/exceptionOrder.js @@ -0,0 +1,39 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/yieldOrder/pageException', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +//批量关闭 +export const closeBatchs = ids => { + return request({ + url: '/blade-desk/order/yieldOrder/closeBatch', + method: 'post', + data: ids, + }); +}; +//批量合格校验 +export const confirmBatch = ids => { + return request({ + url: '/blade-desk/order/yieldOrder/confirmBatch', + method: 'post', + data: ids, + }); +}; +//批量合格校验 +export const edit = ids => { + return request({ + url: '/blade-desk/order/yieldOrder/update', + method: 'post', + data: ids, + }); +}; + diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js new file mode 100644 index 00000000..f2e1e1a9 --- /dev/null +++ b/src/api/orderManagement/planYieIdOrder.js @@ -0,0 +1,72 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/yieldOrder/page', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + // 修改 +export const update = row => { + return request({ + url: '/blade-desk/order/yieldOrder/update', + method: 'post', + data: row, + }); +}; + + +// 获取详情 +export const getassayContentDeatils = (params) => { + return request({ + url: `/blade-desk/order/yieldOrder/detail`, + method: 'get', + params, + }); +}; + +//批量关闭 +export const closeBatchs = ids => { + return request({ + url: '/blade-desk/order/yieldOrder/closeBatch', + method: 'post', + data: ids, + }); +}; + + + // 优先级 + export const updatePreference = row => { + return request({ + url: '/blade-desk/order/yieldOrder/updatePreference', + method: 'post', + data: row, + }); +}; + +//下发玻璃 +export const saveGlassCake = data => { + return request({ + url: `/blade-desk/order/yieldPlan/saveGlassCake/${data.yieldPlanId}`, + method: 'post', + data: data, + }); +}; +//工艺路线 +export const getFirstProcess = id => { + return request({ + url: '/blade-desk/order/yieldPlan/getFirstProcess/'+id, + method: 'get', + + }); +}; + + + + + diff --git a/src/api/orderManagement/sinTerPlanOrder.js b/src/api/orderManagement/sinTerPlanOrder.js new file mode 100644 index 00000000..fa502bcb --- /dev/null +++ b/src/api/orderManagement/sinTerPlanOrder.js @@ -0,0 +1,40 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/yieldPlan/page', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + // 修改 +export const update = row => { + return request({ + url: '/blade-desk/order/yieldPlan/update', + method: 'post', + data: row, + }); +}; + + +// 获取详情 +export const getassayContentDeatils = (params) => { + return request({ + url: `/blade-desk/order/yieldPlan/detail`, + method: 'get', + params, + }); +}; + +//批量关闭 +export const closeBatchs = ids => { + return request({ + url: '/blade-desk/order/plateGoodsRecord/closeBatch', + method: 'post', + data: ids, + }); +}; diff --git a/src/api/productionManagement/addRequirements.js b/src/api/productionManagement/addRequirements.js new file mode 100644 index 00000000..fd6a0828 --- /dev/null +++ b/src/api/productionManagement/addRequirements.js @@ -0,0 +1,47 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/plateGoodsApply/page', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; +//新增 +export const add = row => { + return request({ + url: '/blade-desk/order/plateGoodsApply/save', + method: 'post', + data: row, + }); +}; +// 修改 +export const update = row => { + return request({ + url: '/blade-desk/order/plateGoodsRecord/update', + method: 'post', + data: row, + }); +}; +//批量审核 +export const confirmBatch = row => { + return request({ + url: '/blade-desk/order/plateGoodsApply/confirmBatch', + method: 'post', + data: row, + }); +}; +// 获取详情 +export const getOrderMoldPlanCaDeatils = (params) => { + return request({ + url: `/blade-desk/order/plateGoodsApply/detail`, + method: 'get', + params, + }); +}; + + diff --git a/src/api/productionManagement/assayedContent.js b/src/api/productionManagement/assayedContent.js new file mode 100644 index 00000000..bd5fd825 --- /dev/null +++ b/src/api/productionManagement/assayedContent.js @@ -0,0 +1,33 @@ +import request from '@/axios'; +//列表接口 +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/order/assayContent/page', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; +//新增 +export const add = row => { + return request({ + url: '/blade-desk/order/assayContent/save', + method: 'post', + data: row, + }); +}; + + +// 获取详情 +export const getassayContentDeatils = (params) => { + return request({ + url: `/blade-desk/order/assayContent/detail`, + method: 'get', + params, + }); +}; + + diff --git a/src/axios.js b/src/axios.js index 87ce9501..8fa1afed 100644 --- a/src/axios.js +++ b/src/axios.js @@ -110,8 +110,13 @@ axios.interceptors.response.use( } //获取状态信息 const status = res.data.error_code || res.data.code || res.status; + const code = res.data.error_code || res.data.code || res.status; const statusWhiteList = website.statusWhiteList || []; const message = res.data.msg || res.data.error_description || '系统错误'; + //防止项目中使用res.code接入的判断 + if (code) { + res.code = code; + } //如果在白名单里则自行catch逻辑处理 if (statusWhiteList.includes(status)) return Promise.reject(res); diff --git a/src/views/orderManagement/allocationMessQuery.vue b/src/views/orderManagement/allocationMessQuery.vue index 992ae918..92c66891 100644 --- a/src/views/orderManagement/allocationMessQuery.vue +++ b/src/views/orderManagement/allocationMessQuery.vue @@ -1,1813 +1,1819 @@ diff --git a/src/views/orderManagement/components/exception/dataMissing.vue b/src/views/orderManagement/components/exception/dataMissing.vue index 4ce40d65..88579456 100644 --- a/src/views/orderManagement/components/exception/dataMissing.vue +++ b/src/views/orderManagement/components/exception/dataMissing.vue @@ -1,1475 +1,1533 @@ + - diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue index 9f1935fa..9b4413c2 100644 --- a/src/views/orderManagement/components/exception/deliveryDate.vue +++ b/src/views/orderManagement/components/exception/deliveryDate.vue @@ -1,1460 +1,1493 @@ diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index 40116344..b9e206d5 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -1,1544 +1,1536 @@ diff --git a/src/views/orderManagement/components/exception/resourceMissing.vue b/src/views/orderManagement/components/exception/resourceMissing.vue index f66c110c..f31bda5f 100644 --- a/src/views/orderManagement/components/exception/resourceMissing.vue +++ b/src/views/orderManagement/components/exception/resourceMissing.vue @@ -1,1507 +1,1540 @@ diff --git a/src/views/orderManagement/components/lookProcess.vue b/src/views/orderManagement/components/lookProcess.vue index 9a0525f1..fdaff36c 100644 --- a/src/views/orderManagement/components/lookProcess.vue +++ b/src/views/orderManagement/components/lookProcess.vue @@ -1,194 +1,230 @@ diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue index 9baed5d6..5eb88299 100644 --- a/src/views/orderManagement/components/orderUpdateDailog.vue +++ b/src/views/orderManagement/components/orderUpdateDailog.vue @@ -1,233 +1,269 @@ - \ No newline at end of file + diff --git a/src/views/orderManagement/components/priorityDialog.vue b/src/views/orderManagement/components/priorityDialog.vue index c110cbbe..14ebe1e3 100644 --- a/src/views/orderManagement/components/priorityDialog.vue +++ b/src/views/orderManagement/components/priorityDialog.vue @@ -1,9 +1,9 @@ diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index 8f97c8ad..e9e85bf8 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -71,20 +71,25 @@ @closeDialog="closeDialog" > - - + + @closeDialog="closeDialog" + > - + @@ -99,23 +104,26 @@ import { remove, update, } from '@/api/system/role'; + +import { getList,closeBatchs } from '@/api/orderManagement/sinTerPlanOrder'; import { mapGetters } from 'vuex'; import { validatenull } from '@/utils/validate'; import rushDialog from './components/rushDialog.vue'; import batchDialog from './components/batchDialog.vue'; import basicImport from '@/components/basic-import/main.vue'; -import lookProcess from './components/lookProcess.vue' +import lookProcess from './components/lookProcess.vue'; export default { components: { rushDialog, batchDialog, basicImport, - lookProcess + lookProcess, }, data() { return { - isShowImport: false, + id:null, + isShowImport: false, inBatchesOpen: false, platingSmallOpen: false, planOrderArr: [], @@ -190,7 +198,7 @@ export default { column: [ { label: '计划单号', - prop: 'plannedOrderNo1', + prop: 'ypCode', search: true, sortable: true, width: 150, @@ -200,14 +208,14 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入计划单号', trigger: 'blur', }, ], }, { label: '零件号', - prop: 'plannedOrderNo2', + prop: 'partCode', search: true, sortable: true, width: 180, @@ -218,14 +226,14 @@ export default { rules: [ { required: true, - message: '请输入角色名称', + message: '请输入零件号', trigger: 'blur', }, ], }, { label: '产品型号', - prop: 'plannedOrderNo3', + prop: 'productType', search: false, sortable: true, disabled: true, @@ -236,14 +244,14 @@ export default { rules: [ { required: false, - message: '请输入角色名称', + message: '请输入产品型号', trigger: 'blur', }, ], }, { label: '产品名称', - prop: 'partName', + prop: 'productName', search: false, sortable: true, disabled: true, @@ -331,7 +339,7 @@ export default { }, { label: '生产数量', - prop: 'poQty', + prop: 'ypQty', search: false, sortable: true, width: 120, @@ -348,7 +356,7 @@ export default { }, { label: '面积(d㎡)', - prop: 'poArea', + prop: 'ypArea', search: false, sortable: true, width: 120, @@ -449,7 +457,7 @@ export default { }, { label: '已交付数量', - prop: 'createCount1', + prop: 'deliveryQty', search: false, sortable: true, hide: true, @@ -459,7 +467,7 @@ export default { }, { label: '未交付数量', - prop: 'createCount', + prop: 'undeliveredQty', search: false, sortable: true, hide: true, @@ -470,7 +478,7 @@ export default { { label: '状态', - prop: 'curStatusText', + prop: 'status', search: true, sortable: true, span: 12, @@ -595,7 +603,7 @@ export default { methods: { // 点击导入按钮 handleImport() { - this.isShowImport = true + this.isShowImport = true; }, // 批量接收 batchReceiving() { @@ -615,29 +623,36 @@ export default { // }); }); }, - // 批量关闭 - batchClose() { - // 检查是否选择了数据 - if (this.selectionList.length === 0) { - this.$message.warning('请选择至少一条数据'); - return; + // 批量关闭 + batchClose() { + // 检查是否选择了数据 + if (this.selectionList.length === 0) { + this.$message.warning('请选择至少一条数据'); + return; + } + this.$confirm('确定将选择数据批量关闭?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + const ids = this.selectionList.map(item => item.id).join(','); + closeBatchs({ ...{ ids }, ...this.approveForm }).then(res => { + if (res.code === 200) { + this.$message.success('审核成功'); } - this.$confirm('确定将选择数据批量关闭?', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }) - .then(() => { - // return remove(row.id); - }) - .then(() => { - // this.onLoad(this.page); - // this.$message({ - // type: 'success', - // message: '操作成功!', - // }); - }); - }, + }); + this.$refs.crud.toggleSelection(); + this.onLoad(this.page); // return remove(row.id); + }) + .catch(() => { + // this.onLoad(this.page); + // this.$message({ + // type: 'success', + // message: '操作成功!', + // }); + }); + }, // 加急 rushFn() { this.isRushOpen = true; @@ -645,7 +660,7 @@ export default { closeDialog() { this.isRushOpen = false; this.isBatchOpen = false; - this.isOpen = false + this.isOpen = false; }, inBatchesFn(row) { this.rowItem = row; @@ -655,6 +670,7 @@ export default { this.platingSmallOpen = true; }, lookProcessRoute(row) { + this.id=row.id this.isOpen = true; this.rowItem = row; }, @@ -847,7 +863,7 @@ export default { }); }, - onLoad(page, params = {}) { + async onLoad(page, params = {}) { this.loading = true; this.data = [ { @@ -1907,8 +1923,22 @@ export default { }, ]; this.page.total = this.data.length; - // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - // this.data = res.data.data.records; + this.query.sureType=1; + try { + const res = await getList( + page.currentPage, + page.pageSize, + + Object.assign(params, this.query) + ); + if (res.code) { + this.data = res.data.data.records; + this.page.total = res.data.data.total; + this.selectionClear(); + } + } catch (err) { + console.log(err); + } this.loading = false; // this.page.total = res.data.data.total // this.selectionClear(); diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue index f48385b5..68ed7d17 100644 --- a/src/views/orderManagement/sinTerPlanOrder.vue +++ b/src/views/orderManagement/sinTerPlanOrder.vue @@ -59,27 +59,33 @@ - - + + @closeDialog="closeDialog" + > - + diff --git a/src/views/productionManagement/coatingMaterial.vue b/src/views/productionManagement/coatingMaterial.vue index 3b7cbd9a..f01c84e2 100644 --- a/src/views/productionManagement/coatingMaterial.vue +++ b/src/views/productionManagement/coatingMaterial.vue @@ -1,13 +1,19 @@ diff --git a/src/views/productionManagement/components/addDialog.vue b/src/views/productionManagement/components/addDialog.vue index 36f90c17..43e58fd9 100644 --- a/src/views/productionManagement/components/addDialog.vue +++ b/src/views/productionManagement/components/addDialog.vue @@ -1,1151 +1,154 @@ \ No newline at end of file + diff --git a/src/views/productionManagement/components/addQuantity.vue b/src/views/productionManagement/components/addQuantity.vue index 2f64cad0..56ceae2d 100644 --- a/src/views/productionManagement/components/addQuantity.vue +++ b/src/views/productionManagement/components/addQuantity.vue @@ -16,7 +16,7 @@ 3天 7天 30天 - 全部 + 全部 @@ -85,6 +85,7 @@ export default { }, data() { return { + radio:3, addForm: {}, tableData: [], ruleForm: { diff --git a/src/views/productionManagement/components/assDialog.vue b/src/views/productionManagement/components/assDialog.vue new file mode 100644 index 00000000..52fbf592 --- /dev/null +++ b/src/views/productionManagement/components/assDialog.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/productionManagement/components/coatingAddDialog.vue b/src/views/productionManagement/components/coatingAddDialog.vue index 39144eaf..bc2d00f2 100644 --- a/src/views/productionManagement/components/coatingAddDialog.vue +++ b/src/views/productionManagement/components/coatingAddDialog.vue @@ -1,180 +1,189 @@ - \ No newline at end of file + diff --git a/src/views/productionManagement/components/coatingMater/addRequirements.vue b/src/views/productionManagement/components/coatingMater/addRequirements.vue index f16bf8f7..57cec0da 100644 --- a/src/views/productionManagement/components/coatingMater/addRequirements.vue +++ b/src/views/productionManagement/components/coatingMater/addRequirements.vue @@ -1,26 +1,36 @@