添加筛选

.env.development

@@ -2,7 +2,7 @@ VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
 VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=true

.env.production

@@ -1,11 +1,12 @@
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
+VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=false
 
+
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'

.hbuilderx/launch.json

@@ -17,7 +17,7 @@
             "type" : "uni-app:h5"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]

src/api/request2.js

@@ -546,6 +546,29 @@ export function getBasicItemByCode(itemCode) {
 		pageNo: 1,
 		pageSize: 100
 	}
+	return request({
+		url: baseApi + "/wms/itembasic/page",
+		method: "post",
+		data: params,
+	});
+}
+
+/**
+ * 查询物品信息接口
+ * @param {*} code  物品代码
+ * 
+ */
+export function getBasicItemByCodeSenior(itemCode) {
+
+	var params = {
+		filters: [{
+			column: "column",
+			action: "like",
+			value: itemCode
+		}],
+		pageNo: 1,
+		pageSize: 1000
+	} 
 	return request({
 		url: baseApi + "/wms/itembasic/page",
 		method: "get",

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.55",
+    "versionName" : "1.0.58",
-    "versionCode" : 55,
+    "versionCode" : 58,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages.json

@@ -606,7 +606,25 @@
 				"navigationBarTitleText": "直接发料",
 				"enablePullDownRefresh": false,
 				"titleNView": {
-					"autoBackButton": "true"
+					"autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+						
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						
+						},
+						{
+					
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
 				}
 			}
 		},

src/pages/issue/job/issueJob.vue

@@ -194,6 +194,7 @@
 						this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
 						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
 						// this.openScanPopup();
+						this.$refs.scanPopup.openScanPopup(this.businessType);
 					} else {
 						this.showErrorMessage(res.message)
 					}
@@ -294,6 +295,7 @@
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
+						this.openScanPopup()
 					}
 					var list = res.data.list;
 

src/pages/issue/record/directIssue.vue

@@ -48,6 +48,7 @@
 
 		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
 		</winComScanBalance>
+		<balanceQuery ref="refBalanceQuery" ></balanceQuery>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -98,6 +99,8 @@
 	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
 	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	import balanceQuery from '@/mycomponents/query/balanceQuery.vue'
+	
 
 	export default {
 		components: {
@@ -110,7 +113,8 @@
 			recordComDetailCard,
 			recordDetailCard,
 			balanceSelect,
-			winComScanBalance
+			winComScanBalance,
+			balanceQuery
 		},
 		data() {
 			return {
@@ -156,10 +160,13 @@
 			// }
 
 		},
+		
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				goHome();
+			} else if (e.index == 1) {
+				this.$refs.refBalanceQuery.showDrawer();
 			}
 		},
 		//拦截返回按钮事件
@@ -170,6 +177,26 @@
 		mounted() {},
 
 		methods: {
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
+			
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
+			
+			showDrawer() {
+							this.$refs.showRight.open();
+						},
+						closeDrawer() {
+							this.$refs.showRight.close();
+						},
 			
 			getBusinessType() {
 				getBusinessType(this.businessTypeCode, res => {