maliang 4 săptămâni în urmă
părinte
comite
606d4e0acc

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "pdaApp-test",
     "appid" : "__UNI__7E491C0",
     "description" : "pdaApp",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 1 - 0
pages/index/index.vue

@@ -130,6 +130,7 @@
 				const params = this.$store.state.update.downloadApkParams
 				const url = this.$BASE_URL + '/pda/downloadApk'
 				console.log(url,'url')
+				console.log('params=======',params)
 				downloadApkWithJsonPost(url, params)
 			},
 			meunClick() {

+ 8 - 7
pages/inventory-task/components/inventoryFilterPopup.vue

@@ -182,6 +182,7 @@ import {
   getMaterialCategoryTree,
   creatorSpinnerList,
 } from "@/common/request/apis/inventoryTask";
+import { inventoryPositionTree } from "@/common/request/apis/inventoryInquiry";
 import { goodsInventoryStatus } from "../utils/index.js";
 export default {
   name: "InventoryFilterPopup",
@@ -225,11 +226,6 @@ export default {
 
       // 库位树形数据
       locationTree: [
-        // {
-        //   id: "all",
-        //   name: "全部",
-        //   children: [],
-        // },
         {
           id: "zone_a",
           name: "A区",
@@ -285,8 +281,8 @@ export default {
     // 库位侧边栏列表
     locationSidebarList() {
       return this.locationTree.map((item) => ({
-        name: item.name,
-        id: item.id,
+        name: item.label,
+        id: item.value,
       }));
     },
     // 当前显示的库位内容
@@ -303,6 +299,11 @@ export default {
             console.log("creatorSpinnerList=======", res);
             this.userOptions = res.data;
           });
+          //库存
+          inventoryPositionTree().then((res) => {
+            console.log("res=====", res);
+            this.locationTree = res.data;
+          });
         }
       },
       immediate: true,

+ 5 - 3
pages/inventory-task/detail.vue

@@ -24,7 +24,7 @@
           :showAction="false"
           @search="onRefresh"
           @clear="onRefresh"
-          v-model="queryFilterValues.number"
+          v-model="number"
         ></u-search>
         <view class="scan-icon flex_box flex_row_center" @click="scanCode">
           <image src="@/static/image/scan-icon-2.png" mode=""></image>
@@ -285,8 +285,8 @@ export default {
         userIdList: [], // 盘点负责人id
         categoryIdList: [], // 类目
         positionList: [], // 库位
-        number: "",
       },
+      number: "",
       actionPop: {
         // 盘点数量弹框状态
         showNumPop: false,
@@ -325,7 +325,7 @@ export default {
   },
   onShow() {
     uni.$on("scanFinish", (data) => {
-      this.queryFilterValues.number = data;
+      this.number = data;
       this.onRefresh();
     });
   },
@@ -369,7 +369,9 @@ export default {
         const params = {
           taskId,
           ...this.queryFilterValues,
+          number: this.number,
         };
+        console.log("getTaskStocktakingItemList======", params);
         const res = await taskStocktakingItemList(params);
         const { total, rows } = res.data;
         rows.forEach((item) => {