修改零件查询排序

src/mycomponents/item/itemFilter.vue

@@ -11,8 +11,9 @@
 				<view class="" style="font-size: 35rpx; margin-bottom: 10rpx;">
 					库位
 				</view>
+				
 				<u-input style="margin-left: 0rpx;" confirmType="search" v-model="locationCode" :border="true"
-					placeholder="请输入库位"  :focus="true"/>
+					placeholder="请输入库位"  :focus="true" :clearable="true"/>
 			</view>
 			<view class="" style="font-size: 35rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
 				库存状态 :
@@ -134,6 +135,11 @@
 				this.$emit("onConfirmClick", this.locationCode,this.state)
 				this.closeScanPopup();
 			},
+			
+			clearData() {
+				this.locationCode=""
+				this.state=""
+			},
 		}
 	}
 </script>

src/pages/query/coms/comPackDetailCard.vue

@@ -4,7 +4,6 @@
 		<view class="uni-flex uni-row space-between" style="align-items: center;">
 			<view>
 				<view class="uni-flex uni-row" style="align-items: center;">
-					<text style="font-size: 30rpx; margin-left: 15rpx;">物料</text>
 					<item :dataContent="dataContent" style="padding-top: 10rpx; margin-left: 20rpx;"></item>
 				</view>
 

src/pages/query/item.vue

@@ -203,8 +203,7 @@
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: pageSize,
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
-					by: "ASC"
 				}
 				getBalanceByItemCode(params).then(res => {
 					uni.hideLoading();
@@ -270,8 +269,7 @@
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: pageSize,
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"DESC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
-					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("请先扫描物料")
 				}
 			}

src/pages/query/location.vue

@@ -169,8 +169,7 @@
 						action: "==",
 						value: this.locationCode
 					}],
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}],
-					by: "ASC"
 				}
 
 				getBalanceByLocationcode(params).then(res => {
@@ -219,8 +218,7 @@
 						action: "==",
 						value: this.locationCode
 					}],
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"DESC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
-					by: "DESC"
 				}
 				getTransaction(params).then(res => {
 					uni.hideLoading();
@@ -274,8 +272,7 @@
 						action: "==",
 						value: this.locationCode
 					}],
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
-					by: "ASC"
 				}
 
 				getExpectInByLocationCode(params).then(res => {
@@ -324,8 +321,7 @@
 						action: "==",
 						value: this.locationCode
 					}],
-					sort:"createTime",
+					sorts:[{sort:"createTime",by:"ASC"},{sort:"locationCode",by:"ASC"} ,{sort:"id",by:"DESC"}]
-					by: "ASC"
 				}
 
 				getExpectOutByLocationCode(params).then(res => {

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("请先扫描物料")
 				}
 			}

src/uni_modules/vk-uview-ui/components/u-input/u-input.vue

@@ -64,7 +64,8 @@
 				@tap="onClear"
 				v-if="clearableCom && valueCom != '' && focused"
 			>
-				<u-icon size="32" name="close-circle-fill" color="#c0c4cc" />
+			<text class="uni-icon" >&#xe434;</text>
+				<!-- <u-icon size="50" name="close-circle-fill" color="#c0c4cc" /> -->
 			</view>
 			<view
 				class="u-input__right-icon__clear u-input__right-icon__item"