diff --git a/pages.json b/pages.json index 4fdd950..6012610 100644 --- a/pages.json +++ b/pages.json @@ -1,7 +1,7 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path" : "pages/login/login", + "path" : "pages/login/login", "style": { "navigationStyle": "custom" } @@ -146,24 +146,36 @@ "navigationStyle": "custom" } } - ,{ - "path" : "pages/ProductManage/EmptyPipeOutStore", + ,{ + "path" : "pages/WarehouseManage/CheckList", + "style": { + "navigationStyle": "custom" + } + } + ,{ + "path" : "pages/WarehouseManage/CheckDtl", + "style": { + "navigationStyle": "custom" + } + } + ,{ + "path" : "pages/ProductManage/EmptyPipeOutStore", "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } - - } - ,{ - "path" : "pages/ProductManage/ZjInStore", + + } + ,{ + "path" : "pages/ProductManage/ZjInStore", "style" : { "navigationBarTitleText": "", "enablePullDownRefresh": false } - - } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue index ad4d8c9..b2a6fc3 100644 --- a/pages/WarehouseManage/XuniDeliveryConfirm.vue +++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue @@ -1,6 +1,6 @@ @@ -81,6 +81,11 @@ this.billCode = option.bill_code }, methods: { + goIn () { + uni.navigateTo({ + url: `/pages/WarehouseManage/XuniDelivery` + }) + }, handleChange (e) { // console.log(e) }, diff --git a/utils/getData1.js b/utils/getData1.js index cc63015..4ba2ca8 100644 --- a/utils/getData1.js +++ b/utils/getData1.js @@ -1,6 +1,9 @@ import request from './request.js' -// 生箔生产进度 + +/** + * 生箔生产进度 + */ // 1.1生产区域下拉框查询 export const queryProductArea = (type) => request({ url: 'api/pda/raw/queryProductArea', @@ -16,7 +19,9 @@ export const queryRawFoil = (pcode, cname, parea) => request({ } }) -// 生箔工序 +/** + * 生箔工序 + */ // 1.1生箔工序初始化查询 export const queryRawFoilList = (pcode, cname) => request({ url: 'api/pda/raw/queryRawFoilList', @@ -54,7 +59,9 @@ export const finish = (rjo) => request({ } }) -// 烘烤工序 +/** + * 烘烤工序 + */ // 1.1出入烘箱 export const ovenInAndOut = (pcode, cname, temp, hours, option) => request({ url: 'api/pda/baking/ovenInAndOut', @@ -94,7 +101,9 @@ export const pointStatusQuery = (pcode, cname) => request({ }) // 【仓储管理】 -// 生产区发货确认 +/** + * 生产区发货确认 + */ // 1.1出库初始化查询 export const stivtQuery = (bno, pcode) => request({ url: 'api/pda/st/ivtQuery', @@ -119,7 +128,9 @@ export const stoutPrint = (bjo) => request({ } }) -// 虚拟区发货确认 +/** + * 虚拟区发货确认 + */ // 1.1出库初始化查询 export const virtualbillQuery = (bno, bcode, btype) => request({ url: 'api/pda/virtual/billQuery', @@ -152,7 +163,9 @@ export const virtualoutConfirm = (brows, bno) => request({ } }) -// 空载具出库、空载具入库 +/** + * 空载具出库、空载具入库 + */ // 1.1空载具出入库 export const emptyVehiclepointOperate = (pcode, vcode, option) => request({ url: 'api/pda/emptyVehicle/pointOperate', @@ -168,4 +181,38 @@ export const emptyVehiclepointStatusQuery = (pcode) => request({ data: { point_code: pcode } +}) + +/** + * 盘点管理 + */ +// 1.1盘点单查询 +export const checkQuery = (ccode) => request({ + url: 'api/pda/check/checkQuery', + data: { + check_code: ccode + } +}) +// 1.2盘点单明细查询 +export const checkQueryDtl = (ccode) => request({ + url: 'api/pda/check/checkQueryDtl', + data: { + check_code: ccode + } +}) +// 1.3保存 +export const saveCheck = (crows, ccode) => request({ + url: 'api/pda/check/saveCheck', + data: { + check_rows: crows, + check_code: ccode + } +}) +// 1.4确认 +export const confirmCheck = (crows, ccode) => request({ + url: 'api/pda/check/confirmCheck', + data: { + check_rows: crows, + check_code: ccode + } }) \ No newline at end of file