diff --git a/src/api/processManagement/procepssPlanning.js b/src/api/processManagement/procepssPlanning.js index 39f6dc91..63a2ee4c 100644 --- a/src/api/processManagement/procepssPlanning.js +++ b/src/api/processManagement/procepssPlanning.js @@ -30,4 +30,13 @@ export const periodOfValidity = params => { method: 'get', params, }); +}; + +// 获取跳转链接 /dsPart/getPdmDocLink +export const getPdmDocLink = params => { + return request({ + url: '/blade-desk/dsPart/getPdmDocLink', + method: 'get', + params, + }); }; \ No newline at end of file diff --git a/src/api/productionManagement/workReportingManagement.js b/src/api/productionManagement/workReportingManagement.js index 3f1b84c4..123e03dc 100644 --- a/src/api/productionManagement/workReportingManagement.js +++ b/src/api/productionManagement/workReportingManagement.js @@ -56,4 +56,26 @@ export const shiftTransfer = (data) => { method: 'post', data:data }); +}; + +// 订单调整 列表 +export const queryUnfinished = (current, size,params) => { + return request({ + url: '/blade-desk/disTasking/queryUnfinished', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 订单调整处理 +export const markComplete = (data) => { + return request({ + url: '/blade-desk/disTasking/markComplete', + method: 'post', + data:data + }); }; \ No newline at end of file diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue index cb56d8e5..e2e56f2c 100644 --- a/src/views/processManagement/components/processMainte/partDetails.vue +++ b/src/views/processManagement/components/processMainte/partDetails.vue @@ -28,9 +28,9 @@
- +
- 基本信息 + 基本信息
- 子件信息 + 子件信息
{ + console.log(99999,res) + window.open(res.data.data) + }) }, cancel() { this.showPartDetails = false; diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue index 67c229f4..fc9468e0 100644 --- a/src/views/processManagement/taskProcessing.vue +++ b/src/views/processManagement/taskProcessing.vue @@ -49,12 +49,7 @@ v-if="scope.row.taskStatus == 2" >完成 - 转派 + 转派 + { + console.log(99999, res); + window.open(res.data.data); + }); + }, // 新增任务 addFn() { this.isTestOpen = true; @@ -499,3 +506,10 @@ export default { }, }; + diff --git a/src/views/productionManagement/shortageApplication/components/declareAdd.vue b/src/views/productionManagement/shortageApplication/components/declareAdd.vue index 115dc70b..9fff5500 100644 --- a/src/views/productionManagement/shortageApplication/components/declareAdd.vue +++ b/src/views/productionManagement/shortageApplication/components/declareAdd.vue @@ -302,11 +302,13 @@ export default { partCode: row.prtno, //零件号 batchNo: row.splcode, //批次号 quaLevel: row.prtlotno, //生产标识 - quantity: row.quantity, //数量 + quantity: Number(row.quantity), //数量 remark: row.remark, //备注 keeper: row.warctlr, //保管员 planMan: row.schemer, //计划员 locationNo: row.warlocno, //库位 + deptNo:row.deptno, + warnNo:row.warno, }); }); diff --git a/src/views/productionManagement/workReportingManagement/components/orderReporting.vue b/src/views/productionManagement/workReportingManagement/components/orderReporting.vue new file mode 100644 index 00000000..5fc5bba0 --- /dev/null +++ b/src/views/productionManagement/workReportingManagement/components/orderReporting.vue @@ -0,0 +1,326 @@ + + + +d \ No newline at end of file diff --git a/src/views/productionManagement/workReportingManagement/components/wordReporting.vue b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue index 6274bbda..fd4940ed 100644 --- a/src/views/productionManagement/workReportingManagement/components/wordReporting.vue +++ b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue @@ -50,7 +50,46 @@ 详情 - + + @@ -106,11 +145,7 @@