|
@@ -173,8 +173,8 @@ export default {
|
|
|
},
|
|
|
onBackPress(e) {
|
|
|
if (this.sortShow) {
|
|
|
- this.sortShow = false;
|
|
|
- this.isSortFlag = 0;
|
|
|
+ this.chooseShow = false;
|
|
|
+ this.detailPopup = false;
|
|
|
return true;
|
|
|
}
|
|
|
},
|
|
@@ -183,8 +183,9 @@ export default {
|
|
|
loadData(params) {
|
|
|
const _this = this;
|
|
|
uni.showLoading({
|
|
|
- title: '加载中...'
|
|
|
- });
|
|
|
+ mask:true,
|
|
|
+ title:"正在加载..."
|
|
|
+ })
|
|
|
controlQueryList(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
res.data.forEach(item=>{
|
|
@@ -193,7 +194,9 @@ export default {
|
|
|
})
|
|
|
this.recallBillList=res.data;
|
|
|
}
|
|
|
- uni.hideLoading()
|
|
|
+ setTimeout(()=>{
|
|
|
+ uni.hideLoading()
|
|
|
+ },this.recallBillList.length*40)
|
|
|
});
|
|
|
},
|
|
|
checkGroupChange(e){
|
|
@@ -287,7 +290,7 @@ export default {
|
|
|
queryWord:undefined
|
|
|
};
|
|
|
this.queryParam = ajaxData;
|
|
|
- this.loadData(this.queryParam);
|
|
|
+ this.loadData(ajaxData);
|
|
|
},
|
|
|
handelFilter(){
|
|
|
if(this.checkValueRange()){
|
|
@@ -299,11 +302,13 @@ export default {
|
|
|
// 搜索
|
|
|
getSearchCon() {
|
|
|
var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
|
|
|
- if (reg.test(this.keyword)) {
|
|
|
- //包含汉字
|
|
|
- this.queryParam.productName = this.keyword.trim()
|
|
|
- } else {
|
|
|
- this.queryParam.productCode=this.keyword.trim()
|
|
|
+ if(!this.queryParam.queryWord){
|
|
|
+ if (reg.test(this.keyword)) {
|
|
|
+ //包含汉字
|
|
|
+ this.queryParam.productName = this.keyword.trim()
|
|
|
+ } else {
|
|
|
+ this.queryParam.productCode=this.keyword.trim()
|
|
|
+ }
|
|
|
}
|
|
|
this.queryParam.shelfSn = this.shelfSn
|
|
|
this.loadData(this.queryParam);
|
|
@@ -339,8 +344,10 @@ export default {
|
|
|
if(data.scanType == 'QRCODE'){
|
|
|
const ret = data.scanValue.split("&")
|
|
|
this.queryParam.queryWord = ret[1] // 产品编码
|
|
|
+ this.keyword= ret[1]
|
|
|
}else{
|
|
|
this.queryParam.queryWord = data.scanValue;
|
|
|
+ this.keyword= data.scanValue
|
|
|
}
|
|
|
this.queryParam.shelfSn = this.shelfSn
|
|
|
this.loadData(this.queryParam);
|