diff --git a/api/request2.js b/api/request2.js index 366316b1..c5199580 100644 --- a/api/request2.js +++ b/api/request2.js @@ -1323,38 +1323,38 @@ export function getUnPlannedIssueJobDetail(id) { } /** - * 计划外出库 承接 + * 计划外出库任务 承接 * @param {*} id * */ export function takeUnPlannedIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/unplannedissue-job-main/accept?id=" + id, method: "put", data: {}, }); } /** - * 计划外出库 放弃承接 + * 计划外出库任务 放弃承接 * @param {*} id * */ export function cancleTakeUnPlannedIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/unplannedissue-job-main/abandon?id=" + id, method: "put", data: {}, }); } /** - * 计划外出库 提交 + * 计划外出库任务 提交 * @param {*} params */ export function unPlannedIssueJobSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit", + url: baseApi + "/wms/unplannedissue-job-main/abandon", method: "put", data: params, }); @@ -1911,13 +1911,13 @@ export function getTransferReceiptJobDetail(id) { /** - * 调拨入库 承接 + * 调拨入库任务 承接 * @param {*} id * */ export function takeTransferReceiptJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/transferreceipt-job-main/accept?id=" + id, method: "put", data: {}, }); @@ -1930,7 +1930,7 @@ export function takeTransferReceiptJob(id) { */ export function cancleTakeTransferReceiptJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/transferreceipt-job-main/abandon?id=" + id, method: "put", data: {}, }); @@ -1938,13 +1938,13 @@ export function cancleTakeTransferReceiptJob(id) { /** - * 调拨入库 任务提交 + * 调拨入库任务 提交 * @param {*} 任务id * */ export function transferReceiptJobSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit", + url: baseApi + "/wms/transferreceipt-job-main/execute", method: "put", data: params, }); @@ -1993,40 +1993,40 @@ export function getTransferIssueJobDetail(id) { } /** - * 调拨出库 承接 + * 调拨出库任务 承接 * @param {*} id * */ export function takeTransferIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/transferissue-job-main/accept?id=" + id, method: "put", data: {}, }); } /** - * 调拨出库 放弃承接 + * 调拨出库任务 放弃承接 * @param {*} id * */ export function cancleTakeTransferIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, + url: baseApi + "/wms/transferissue-job-main/abandon?id=" + id, method: "put", data: {}, }); } /** - * 调拨出库 任务提交 + * 调拨出库任务 提交 * @param {*} 任务id * */ export function transferIssueJobSubmit(params) { return request({ - url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id, - method: "post", + url: baseApi + "/wms/transferissue-job-main/execute", + method: "put", data: params, }); } @@ -2295,6 +2295,7 @@ export function getProductionReturnRequestDetail(id) { }); } + /** * 生产退料申请 处理 * @param {*} id diff --git a/pages.json b/pages.json index 9c37edb4..4494521a 100644 --- a/pages.json +++ b/pages.json @@ -944,7 +944,7 @@ { "path": "pages/transfer/job/receiptJob", "style": { - "navigationBarTitleText": "调拨接收任务", + "navigationBarTitleText": "调拨入库任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -970,7 +970,7 @@ { "path": "pages/transfer/job/receiptDetail", "style": { - "navigationBarTitleText": "调拨接收详情", + "navigationBarTitleText": "调拨入库详情", "enablePullDownRefresh": false } @@ -978,14 +978,14 @@ { "path": "pages/transfer/record/receiptRecord", "style": { - "navigationBarTitleText": "调拨接收记录", + "navigationBarTitleText": "调拨入库记录", "enablePullDownRefresh": true } }, { "path": "pages/transfer/job/issueJob", "style": { - "navigationBarTitleText": "调拨发货任务", + "navigationBarTitleText": "调拨出库任务", "enablePullDownRefresh": true, "titleNView": { "buttons": [{ @@ -1009,14 +1009,14 @@ { "path": "pages/transfer/record/deliverRecord", "style": { - "navigationBarTitleText": "调拨发出记录", + "navigationBarTitleText": "调拨出库记录", "enablePullDownRefresh": true } }, { "path": "pages/transfer/job/issueDetail", "style": { - "navigationBarTitleText": "调拨发出详细", + "navigationBarTitleText": "调拨出库详细", "enablePullDownRefresh": true } }, @@ -1231,20 +1231,7 @@ } }, - - - - - - //productPutawayDetail - // { - // "path": "test/winScanStandardTest", - // "style": { - // "navigationBarTitleText": "扫描控件测试", - // "enablePullDownRefresh": false - // } - // }, { "path": "pages/unPlanned/job/receiptJob", "style": { @@ -1314,6 +1301,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/unPlanned/request/receiptRequestCreate", + "style": { + "navigationBarTitleText": "计划外入库申请创建", + "enablePullDownRefresh": false + } + }, { "path": "pages/unPlanned/job/issueJob", @@ -1383,6 +1377,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/unPlanned/request/issueRequestCreate", + "style": { + "navigationBarTitleText": "计划外出库申请创建", + "enablePullDownRefresh": false + } + }, { "path": "pages/unPlanned/record/receiptRecord", diff --git a/pages/index/index.vue b/pages/index/index.vue index 97a1cee9..1cf7c69c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -272,7 +272,7 @@ types:["job_status","location_type","item_status","uom", "inventory_status","container_type","pack_unit","unplanned_receipt_reason", "unplanned_issue_reason","scrap_reason","inspect_failed_reason", - "request_status","inspect_type","next_action","sample_method"] + "request_status","inspect_type","next_action","sample_method","transfer_mode"] } getDictionaryItem(params).then(res => { if (res.data.length > 0) { diff --git a/pages/login/index.vue b/pages/login/index.vue index 790d8e4a..f49e3f31 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -153,6 +153,8 @@ this.imageSrc = base64.replace(/[\r\n]/g, "") this.uuid = res.data.uuid } + }).catch(error=>{ + this.showErrorMessage(error); }) }, methods: { diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue index aeaaf9fd..f1f0bffc 100644 --- a/pages/productionReturn/coms/comReturnRequestCreator.vue +++ b/pages/productionReturn/coms/comReturnRequestCreator.vue @@ -2,20 +2,8 @@ - + + @@ -59,6 +47,7 @@ + + \ No newline at end of file diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue new file mode 100644 index 00000000..02409e35 --- /dev/null +++ b/pages/unPlanned/request/receiptRequestCreate.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/static/config.json b/static/config.json index 4f688e61..4a668deb 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://dev.ccwin-in.com:25100/api/admin-api", + "value": "http://192.168.0.106:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",