diff --git a/src/mycomponents/item/itemFilter.vue b/src/mycomponents/item/itemFilter.vue
index e952de2a..f546e007 100644
--- a/src/mycomponents/item/itemFilter.vue
+++ b/src/mycomponents/item/itemFilter.vue
@@ -11,8 +11,9 @@
库位
+
+ placeholder="请输入库位" :focus="true" :clearable="true"/>
库存状态 :
@@ -134,6 +135,11 @@
this.$emit("onConfirmClick", this.locationCode,this.state)
this.closeScanPopup();
},
+
+ clearData() {
+ this.locationCode=""
+ this.state=""
+ },
}
}
diff --git a/src/pages/query/coms/comPackDetailCard.vue b/src/pages/query/coms/comPackDetailCard.vue
index 02826bee..09b3ba81 100644
--- a/src/pages/query/coms/comPackDetailCard.vue
+++ b/src/pages/query/coms/comPackDetailCard.vue
@@ -4,7 +4,6 @@
- 物料
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index d25566a3..2e68304d 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -203,8 +203,7 @@
filters: filters,
pageNo: this.pageNo,
pageSize: pageSize,
- sort:"createTime",
- by: "ASC"
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
}
getBalanceByItemCode(params).then(res => {
uni.hideLoading();
@@ -270,8 +269,7 @@
filters: filters,
pageNo: this.pageNo,
pageSize: pageSize,
- sort:"createTime",
- by: "DESC"
+ sorts:[{sort:"createTime",by:"DESC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
}
getTransaction(params).then(res => {
uni.hideLoading();
@@ -354,7 +352,8 @@
var params = {
filters: filters,
pageNo: this.pageNo,
- pageSize: pageSize
+ pageSize: pageSize,
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
}
getExpectinByItemcode(params).then(res => {
uni.hideLoading();
@@ -422,7 +421,8 @@
var params = {
filters: filters,
pageNo: this.pageNo,
- pageSize: pageSize
+ pageSize: pageSize,
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
}
getExpectoutByItemcode(params).then(res => {
uni.hideLoading();
@@ -480,6 +480,7 @@
}
this.tabChange(this.tabIndex)
}else {
+ this.$refs.filter.clearData()
this.showMessage("请先扫描物料")
}
}
diff --git a/src/pages/query/location.vue b/src/pages/query/location.vue
index d290dbe3..2614df23 100644
--- a/src/pages/query/location.vue
+++ b/src/pages/query/location.vue
@@ -169,8 +169,7 @@
action: "==",
value: this.locationCode
}],
- sort:"createTime",
- by: "ASC"
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
}
getBalanceByLocationcode(params).then(res => {
@@ -219,8 +218,7 @@
action: "==",
value: this.locationCode
}],
- sort:"createTime",
- by: "DESC"
+ sorts:[{sort:"createTime",by:"DESC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getTransaction(params).then(res => {
uni.hideLoading();
@@ -274,8 +272,7 @@
action: "==",
value: this.locationCode
}],
- sort:"createTime",
- by: "ASC"
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getExpectInByLocationCode(params).then(res => {
@@ -324,8 +321,7 @@
action: "==",
value: this.locationCode
}],
- sort:"createTime",
- by: "ASC"
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getExpectOutByLocationCode(params).then(res => {
diff --git a/src/pages/query/pack.vue b/src/pages/query/pack.vue
index 045dd20b..25e7a3c5 100644
--- a/src/pages/query/pack.vue
+++ b/src/pages/query/pack.vue
@@ -65,7 +65,7 @@
return {
//v-model绑定的这个变量不要在分页请求结束中自己赋值!!!
dataList: [],
- tabList: ['明细', '预计出'],
+ tabList: ['库存余额', '预计出'],
tabIndex: 0,
itemDetail: undefined,
packingNumber: '',
@@ -183,7 +183,8 @@
var params = {
filters: filters,
pageNo: this.pageNo,
- pageSize: pageSize
+ pageSize: pageSize,
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getBalanceByItemCode(params).then(res => {
uni.hideLoading();
@@ -245,7 +246,8 @@
var params = {
filters: filters,
pageNo: this.pageNo,
- pageSize: pageSize
+ pageSize: pageSize,
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getBalanceByItemCode(params).then(res => {
uni.hideLoading();
@@ -378,7 +380,8 @@
var params = {
filters: filters,
pageNo: this.pageNo,
- pageSize: pageSize
+ pageSize: pageSize,
+ sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
}
getExpectoutByItemcode(params).then(res => {
uni.hideLoading();
@@ -433,6 +436,7 @@
}
this.tabChange(this.tabIndex)
}else {
+ this.$refs.filter.clearData()
this.showMessage("请先扫描物料")
}
}
diff --git a/src/uni_modules/vk-uview-ui/components/u-input/u-input.vue b/src/uni_modules/vk-uview-ui/components/u-input/u-input.vue
index df0a12ff..5b1184cc 100644
--- a/src/uni_modules/vk-uview-ui/components/u-input/u-input.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-input/u-input.vue
@@ -64,7 +64,8 @@
@tap="onClear"
v-if="clearableCom && valueCom != '' && focused"
>
-
+
+