diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index ff9619633..fa84f94ee 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -1116,6 +1116,13 @@ export const rawDeliver = (params) => request(
data: params,
method: "post"
});
+
+//原料直发 校验物品价格
+export const rawDeliverCheckPrice = (params) => request(
+ devUrl + "/api/pda/SalePriceSheet/get-list-by-itemcode-and-customercoder", { //
+ data: params,
+ method: "post"
+ });
//调拨发货
diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js
index d060e5a82..00297af75 100644
--- a/fe/PDA/common/basic.js
+++ b/fe/PDA/common/basic.js
@@ -218,8 +218,8 @@ export function getJobType(val) {
else if (val == 23) return 'SparePartIssueJob' //备品发料
else if (val == 96) return 'unProducePick' //非生产领料 原料
else if (val == 97) return 'unProducePickWip' //非生产领料 线边
- else if (val == 98) return 'unProduceReturn' //非生产退料 原料
- else if (val == 99) return 'unProduceReturnWip' //非生产退料 线边
+ else if (val == 98) return 'unProduceReturnWip' //非生产退料 线边
+ else if (val == 99) return 'unProduceReturn' //非生产退料 原料
else return 'Other'
}
@@ -496,4 +496,16 @@ const S4 = function() {
export function guid() {
return (S4() + S4() +'-' +S4() +'-' +S4() +'-' +S4() +'-' +S4() +S4() +S4()
);
+}
+
+export function debounceSetting(fn, wait) {
+ let timeout = null;
+ wait = wait || 600;
+ return function () {
+ let that = this;
+ if(timeout !== null) clearTimeout(timeout);
+ timeout = setTimeout(() => {
+ fn.apply(that);
+ }, wait);
+ }
}
\ No newline at end of file
diff --git a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
index 36e4f587e..49e96e4ac 100644
--- a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
+++ b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue
@@ -8,6 +8,10 @@
{{ jobContent.number }}
-->
+
+ OA单号：
+ {{jobContent.oaNumber}}
+
ERP储位：
{{jobContent.fromErpLocationCode}}
diff --git a/fe/PDA/mycomponents/coms/task/comUnProduce.vue b/fe/PDA/mycomponents/coms/task/comUnProduce.vue
index 27ea27829..d2de74816 100644
--- a/fe/PDA/mycomponents/coms/task/comUnProduce.vue
+++ b/fe/PDA/mycomponents/coms/task/comUnProduce.vue
@@ -8,6 +8,11 @@
+
+
+ OA单号：
+ {{dataContent.oaNumber}}
+
单号：
@@ -15,6 +20,7 @@
{{dataContent.unplannedReceiptRequestNumber}}
+
ERP储位：
diff --git a/fe/PDA/mycomponents/popup/balanceList.vue b/fe/PDA/mycomponents/popup/balanceList.vue
index 323ee0eb1..359344b8e 100644
--- a/fe/PDA/mycomponents/popup/balanceList.vue
+++ b/fe/PDA/mycomponents/popup/balanceList.vue
@@ -1,6 +1,6 @@
-
+
+
@@ -80,6 +80,7 @@
data() {
return {
dataList: [],
+ showPopup:false
}
},
@@ -88,10 +89,10 @@
methods: {
openScanPopup(list) {
this.dataList = list;
- this.$refs.popup.open('center')
+ this.showPopup=true
},
closeScanPopup() {
- this.$refs.popup.close()
+ this.showPopup=false
},
select(item) {
this.closeScanPopup();
diff --git a/fe/PDA/mycomponents/popup/recommendList.vue b/fe/PDA/mycomponents/popup/recommendList.vue
index 469fd0dda..7c0e19dd9 100644
--- a/fe/PDA/mycomponents/popup/recommendList.vue
+++ b/fe/PDA/mycomponents/popup/recommendList.vue
@@ -1,6 +1,6 @@
-
+
-
+
@@ -80,6 +80,7 @@
data() {
return {
dataList: [],
+ showPopup:false
}
},
@@ -88,10 +89,10 @@
methods: {
openScanPopup(list) {
this.dataList = list;
- this.$refs.popup.open('center')
+ this.showPopup=true
},
closeScanPopup() {
- this.$refs.popup.close()
+ this.showPopup=false
},
select(item) {
this.closeScanPopup();
diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue
index 8c65ac82f..b0665de86 100644
--- a/fe/PDA/pages/index/index.vue
+++ b/fe/PDA/pages/index/index.vue
@@ -161,6 +161,10 @@
}
},
onShow() {
+ localStorage.setItem("pick_oaNumber","")
+ localStorage.setItem("pickWip_oaNumber","")
+ localStorage.setItem("return_oaNumber","")
+ localStorage.setItem("returnWip_oaNumber","")
let that = this;
if (that.timer != null)
return;
diff --git a/fe/PDA/pages/task/unProducePick.vue b/fe/PDA/pages/task/unProducePick.vue
index 22c758f5d..efc64f216 100644
--- a/fe/PDA/pages/task/unProducePick.vue
+++ b/fe/PDA/pages/task/unProducePick.vue
@@ -1,7 +1,11 @@
-
+
+
+
+
@@ -23,8 +27,10 @@
} from '@/api/index.js';
import {
- goHome
+ goHome,
+ debounceSetting
} from '@/common/basic.js';
+
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
import comUnProduce from '@/mycomponents/coms/task/comUnProduce.vue';
@@ -60,21 +66,29 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
- loadingType: "nomore"
+ loadingType: "nomore",
+ styles: {
+ color: '#2979FF',
+ borderColor: '#2979FF',
+ padding:"20"
+ },
+ placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+ oaNumber:""
};
},
onShow() {
+ this.oaNumber =localStorage.getItem("pick_oaNumber")
this.getList('refresh');
},
-
+
mounted() {
-
+
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
- }else if(e.index === 1){
+ } else if (e.index === 1) {
window.location.reload();
}
},
@@ -111,7 +125,8 @@
pageIndex: that.pageIndex,
isCreationTimeSorting: that.isIssueTimeChange,
isToday: that.isToday,
- ishaspag:1
+ ishaspag: 1,
+ OaNumber: localStorage.getItem("pick_oaNumber")? localStorage.getItem("pick_oaNumber"):""
};
getUnProducePickList(params)
.then(res => {
@@ -133,6 +148,7 @@
.catch(err => {
this.showMessage(err.message);
uni.hideLoading();
+ uni.stopPullDownRefresh();
});
},
@@ -155,7 +171,7 @@
showMessage(message) {
this.$refs.comMessage.showMessage(message);
},
- onPull() {
+ onPullDownRefresh() {
this.getList('refresh');
},
onReachBottom() {
@@ -170,9 +186,21 @@
},
selectedItem(item) {
this.openDetail(item);
- }
+ },
+ changeValue: debounceSetting(function() {
+ localStorage.setItem("pick_oaNumber",this.oaNumber)
+ this.getList('refresh');
+ }, 500),
+
+ // changeValue(e){
+ // console.log(e)
+ // debounceSetting(this.test(e), 500)
+ // } ,
+ // test:function(e){
+ // console.log("1"+e)
+ // }
}
};
+
\ No newline at end of file
diff --git a/fe/PDA/pages/task/unProducePickWip.vue b/fe/PDA/pages/task/unProducePickWip.vue
index c95f802f2..5e09605ea 100644
--- a/fe/PDA/pages/task/unProducePickWip.vue
+++ b/fe/PDA/pages/task/unProducePickWip.vue
@@ -1,7 +1,10 @@
-
+
+
+
@@ -23,7 +26,8 @@
} from '@/api/index.js';
import {
- goHome
+ goHome,
+ debounceSetting
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
- loadingType: "nomore"
+ loadingType: "nomore",
+ styles: {
+ color: '#2979FF',
+ borderColor: '#2979FF',
+ padding:"20"
+ },
+ placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+ oaNumber:""
};
},
onShow() {
+ this.oaNumber =localStorage.getItem("pickWip_oaNumber")
this.getList('refresh');
},
@@ -111,7 +123,8 @@
pageIndex: that.pageIndex,
isCreationTimeSorting: that.isIssueTimeChange,
isToday: that.isToday,
- ishaspag:0
+ ishaspag:0,
+ OaNumber: localStorage.getItem("pickWip_oaNumber")? localStorage.getItem("pickWip_oaNumber"):""
};
getUnProducePickList(params)
.then(res => {
@@ -133,6 +146,7 @@
.catch(err => {
this.showMessage(err.message);
uni.hideLoading();
+ uni.stopPullDownRefresh();
});
},
@@ -155,7 +169,7 @@
showMessage(message) {
this.$refs.comMessage.showMessage(message);
},
- onPull() {
+ onPullDownRefresh() {
this.getList('refresh');
},
onReachBottom() {
@@ -170,7 +184,11 @@
},
selectedItem(item) {
this.openDetail(item);
- }
+ },
+ changeValue: debounceSetting(function() {
+ localStorage.setItem("pickWip_oaNumber",this.oaNumber)
+ this.getList('refresh');
+ }, 500),
}
};
diff --git a/fe/PDA/pages/task/unProduceReturn.vue b/fe/PDA/pages/task/unProduceReturn.vue
index 2c5cbcd2b..37badf9e6 100644
--- a/fe/PDA/pages/task/unProduceReturn.vue
+++ b/fe/PDA/pages/task/unProduceReturn.vue
@@ -1,7 +1,10 @@
-
+
+
+
@@ -23,7 +26,8 @@
} from '@/api/index.js';
import {
- goHome
+ goHome,
+ debounceSetting
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
- loadingType: "nomore"
+ loadingType: "nomore",
+ styles: {
+ color: '#2979FF',
+ borderColor: '#2979FF',
+ padding:"20"
+ },
+ placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+ oaNumber:""
};
},
onShow() {
+ this.oaNumber =localStorage.getItem("return_oaNumber")
this.getList('refresh');
},
@@ -115,7 +127,8 @@
pageIndex: that.pageIndex,
isCreationTimeSorting: that.isIssueTimeChange,
isToday: that.isToday,
- ishaspag:1
+ ishaspag:1,
+ OaNumber: localStorage.getItem("return_oaNumber")? localStorage.getItem("return_oaNumber"):""
};
getUnProduceReturnList(params)
.then(res => {
@@ -136,6 +149,7 @@
.catch(err => {
this.showMessage(err.message);
uni.hideLoading();
+ uni.stopPullDownRefresh();
});
},
@@ -173,7 +187,12 @@
},
selectedItem(item) {
this.openDetail(item);
- }
+ },
+ changeValue: debounceSetting(function() {
+ localStorage.setItem("return_oaNumber",this.oaNumber)
+ this.getList('refresh');
+ }, 500),
+
}
};
diff --git a/fe/PDA/pages/task/unProduceReturnWip.vue b/fe/PDA/pages/task/unProduceReturnWip.vue
index f06a61d4f..d1e9ce599 100644
--- a/fe/PDA/pages/task/unProduceReturnWip.vue
+++ b/fe/PDA/pages/task/unProduceReturnWip.vue
@@ -1,7 +1,10 @@
-
+
+
+
@@ -23,7 +26,8 @@
} from '@/api/index.js';
import {
- goHome
+ goHome,
+ debounceSetting
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@@ -60,10 +64,18 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
- loadingType: "nomore"
+ loadingType: "nomore",
+ styles: {
+ color: '#2979FF',
+ borderColor: '#2979FF',
+ padding:"20"
+ },
+ placeholderStyle: "color:#2979FF;font-size:14px;font-weight: bold;",
+ oaNumber:""
};
},
onShow() {
+ this.oaNumber =localStorage.getItem("returnWip_oaNumber")
this.getList('refresh');
},
@@ -111,7 +123,8 @@
pageIndex: that.pageIndex,
isCreationTimeSorting: that.isIssueTimeChange,
isToday: that.isToday,
- ishaspag:0
+ ishaspag:0,
+ OaNumber: localStorage.getItem("returnWip_oaNumber")? localStorage.getItem("returnWip_oaNumber"):""
};
getUnProduceReturnList(params)
.then(res => {
@@ -132,6 +145,7 @@
.catch(err => {
this.showMessage(err.message);
uni.hideLoading();
+ uni.stopPullDownRefresh();
});
},
@@ -144,7 +158,6 @@
},
-
openDetail(item) {
uni.navigateTo({
url: './unProduceReturnWipDetail?id=' + item.id+ '&jobStatus=' + item.jobStatus
@@ -154,7 +167,7 @@
showMessage(message) {
this.$refs.comMessage.showMessage(message);
},
- onPull() {
+ onPullDownRefresh() {
this.getList('refresh');
},
onReachBottom() {
@@ -169,7 +182,11 @@
},
selectedItem(item) {
this.openDetail(item);
- }
+ },
+ changeValue: debounceSetting(function() {
+ localStorage.setItem("returnWip_oaNumber",this.oaNumber)
+ this.getList('refresh');
+ }, 500),
}
};