Commit d1dc4f84 by 施宇

1

parent ddd7b7b3
{"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588761186704.5857,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1589272520160.337,"children":["res/img/all-check-left-a.png","res/img/all-check-left.png","res/img/all-check-right-a.png","res/img/all-check-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/confirm.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sigle-check-left-a.png","res/img/sigle-check-left.png","res/img/sigle-check-right-a.png","res/img/sigle-check-right.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588729595864.972,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/printerjobs.js","utils/textEncoding.js","utils/util.js"]},".git/":{"mtimeMs":1589623606974.5542,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1589359297584.9631,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]},"pages/mountingPlate/":{"mtimeMs":1588761190467.1958,"children":["pages/mountingPlate/mountingPlate.js","pages/mountingPlate/mountingPlate.json","pages/mountingPlate/mountingPlate.wxml","pages/mountingPlate/mountingPlate.wxss"]},"components/page/":{"mtimeMs":1589360036796.874,"children":["components/page/page.js","components/page/page.json","components/page/page.wxml","components/page/page.wxss"]}},"cacheVersion":1} {"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588761186704.5857,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1589272520160.337,"children":["res/img/all-check-left-a.png","res/img/all-check-left.png","res/img/all-check-right-a.png","res/img/all-check-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/confirm.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sigle-check-left-a.png","res/img/sigle-check-left.png","res/img/sigle-check-right-a.png","res/img/sigle-check-right.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588729595864.972,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/printerjobs.js","utils/textEncoding.js","utils/util.js"]},".git/":{"mtimeMs":1589860213034.575,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1589359297584.9631,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]},"pages/mountingPlate/":{"mtimeMs":1588761190467.1958,"children":["pages/mountingPlate/mountingPlate.js","pages/mountingPlate/mountingPlate.json","pages/mountingPlate/mountingPlate.wxml","pages/mountingPlate/mountingPlate.wxss"]},"components/page/":{"mtimeMs":1589360036796.874,"children":["components/page/page.js","components/page/page.json","components/page/page.wxml","components/page/page.wxss"]}},"cacheVersion":1}
\ No newline at end of file \ No newline at end of file
...@@ -13,7 +13,7 @@ Page({ ...@@ -13,7 +13,7 @@ Page({
data: { data: {
inputVal:"", inputVal:"",
listArr:[], listArr:[],
pickTaskId:"", palletSn:"",
}, },
/** /**
...@@ -23,9 +23,9 @@ Page({ ...@@ -23,9 +23,9 @@ Page({
}, },
cancelCk:function(e){ cancelCk:function(e){
let {id} = e.currentTarget.dataset; let {pallet,box} = e.currentTarget.dataset;
let me = this; let me = this;
getData(apis.cancel_out_store, 'post', {"pick_task_detail_id":id}, function(res) { getData(apis.cancel_out_store, 'post', {"pallet_sn":pallet,"box_sn":box}, function(res) {
if (res.errcode === 0) { if (res.errcode === 0) {
me.getList() me.getList()
...@@ -43,14 +43,14 @@ Page({ ...@@ -43,14 +43,14 @@ Page({
let RegXb = /^(XB)\d{11}$/; let RegXb = /^(XB)\d{11}$/;
let RegKb = /^(KB)\d{11}$/; let RegKb = /^(KB)\d{11}$/;
if(RegXb.test(value)){//扫描的是箱号 if(RegXb.test(value)){//扫描的是箱号
if(!this.data.pickTaskId){ if(!this.data.palletSn){
wx.showToast({ wx.showToast({
title:'请先扫描卡板号', title:'请先扫描卡板号',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
}else{ }else{
this.confirmOutStore() this.confirmOutStore(value)
} }
}else if(RegKb.test(value)){//扫描的是卡版号 }else if(RegKb.test(value)){//扫描的是卡版号
this.setData({ this.setData({
...@@ -77,7 +77,7 @@ Page({ ...@@ -77,7 +77,7 @@ Page({
}); });
if(data.length){ if(data.length){
me.setData({ me.setData({
pickTaskId:data[0]['pick_task_detail_id'] palletSn:data[0]['pallet_id_cn']
}) })
} }
...@@ -90,9 +90,9 @@ Page({ ...@@ -90,9 +90,9 @@ Page({
} }
}, true,true) }, true,true)
}, },
confirmOutStore:function(){ confirmOutStore:function(value){
let me = this; let me = this;
getData(apis.confirm_out_store, 'post', {"pick_task_detail_id":me.data.pickTaskId}, function(res) { getData(apis.confirm_out_store, 'post', {"pallet_sn":me.data.palletSn,"box_sn":value}, function(res) {
if (res.errcode === 0) { if (res.errcode === 0) {
me.getList(); me.getList();
} else { } else {
...@@ -104,22 +104,19 @@ Page({ ...@@ -104,22 +104,19 @@ Page({
} }
}, true,true) }, true,true)
}, },
fhFun:function(){ faAjax:function(){
let arr = this.data.listArr;
let idArr = []
if(arr.length){
for(let i=0;i<arr.length;i++){
idArr.push(arr[i]['pick_task_detail_id'])
}
this.faAjax(idArr)
};
},
faAjax:function(arr){
let me = this; let me = this;
getData(apis.deliver_goods, 'post', {"pick_task_detail_id":arr}, function(res) { if(!me.data.palletSn){
if (res.errcode === 0) { wx.showToast({
title:'请先扫描卡板号',
icon: 'none',
duration: 2000
});
return
}
getData(apis.deliver_goods, 'post', {"pallet_sn":me.data.palletSn}, function(res) {
if (res.errcode == 0) {
console.log(11111)
wx.showToast({ wx.showToast({
title:'操作成功', title:'操作成功',
icon: 'none', icon: 'none',
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</block> </block>
<block wx:else> <block wx:else>
<view class="body-data Bflex" wx:for="{{listArr}}" wx:key="index"> <view class="body-data Bflex" wx:for="{{listArr}}" wx:key="index">
<view class="td-1 td borderBox Iflex jcc aic"><text class="underline-text" bindtap="cancelCk" data-id="{{item.pick_task_detail_id}}"> <view class="td-1 td borderBox Iflex jcc aic"><text class="underline-text" bindtap="cancelCk" data-pallet="{{item.pallet_id_cn}}" data-box="{{item.box_id_cn}}">
<block wx:if="{{item.is_confirm == 1}}">取消确认</block> <block wx:if="{{item.is_confirm == 1}}">取消确认</block>
</text></view> </text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text> <view class="td-2 td borderBox Iflex jcc aic"><text>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</block> </block>
</view> </view>
</view> </view>
<view class="btn blue-btn fh-btn" bindtap="fhFun">发 货</view> <view class="btn blue-btn fh-btn" bindtap="faAjax">发 货</view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment