Browse Source

fix:修改

maliang 2 weeks ago
parent
commit
95a5d8611a

+ 2 - 2
manifest.json

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

+ 2 - 1
pages/goods-enter/addGood.vue

@@ -198,6 +198,7 @@ export default {
   onShow() {
     uni.$on("scanFinish", (data) => {
       this.form.barCode = data;
+      this.$refs.uForm.validateField("barCode");
     });
   },
   methods: {
@@ -226,7 +227,7 @@ export default {
               }, 1000);
               uni.setStorageSync("goodsEnterRefresh", true);
             } else {
-              uni.$u.toast(res.data);
+              uni.$u.toast(result.msg);
             }
           } catch (error) {}
         })

+ 1 - 1
pages/goods-enter/index.vue

@@ -16,7 +16,7 @@
         <view class="head-box">
           <view class="search-box">
             <u-search
-              placeholder="输入关键字进行货物的模糊查询"
+              placeholder="货物名称或条码"
               shape="square"
               :showAction="false"
               @search="handleSearch"

+ 1 - 0
pages/inventory-inquiry/index.vue

@@ -420,6 +420,7 @@ export default {
         display: flex;
         .goods-cont-left {
           width: 190rpx;
+          flex: 0 0 190rpx;
           background-color: #f0f6fb;
           .type-item {
             width: 100%;

+ 1 - 12
pages/picking-task/index.vue

@@ -399,18 +399,7 @@ export default {
       });
     },
     handleClickField(key, itemData) {
-      console.log(123333);
-      console.log("key===", key);
-      console.log("itemData===", itemData);
-      if (
-        itemData.status == 1 ||
-        itemData.status == 4 ||
-        itemData.status == 7
-      ) {
-        this.toStorage(itemData);
-      } else {
-        this.toDetail(itemData);
-      }
+      this.toDetail(itemData);
     },
   },
 };

+ 2 - 2
pages/purchase/detail.vue

@@ -102,7 +102,7 @@
         </view>
         <view class="info-line" v-if="orderInfo.auditorName">
           <view class="info-line-label">
-            <text>驳回人</text>
+            <text>{{orderInfo.status=='7'?'驳回人':'复核人'}}</text>
           </view>
           <view class="info-line-value">
             {{ orderInfo.auditorName }}
@@ -110,7 +110,7 @@
         </view>
         <view class="info-line" v-if="orderInfo.rejectTime">
           <view class="info-line-label">
-            <text>驳回时间</text>
+            <text>{{orderInfo.status=='7'?'驳回时间':'复核时间'}}</text>
           </view>
           <view class="info-line-value">
             {{ $u.timeFormat(orderInfo.rejectTime, "yyyy-mm-dd hh:MM:ss") }}

+ 1 - 11
pages/purchase/index.vue

@@ -401,17 +401,7 @@ export default {
       });
     },
     handleClickField(key, itemData) {
-      console.log("key===", key);
-      console.log("itemData===", itemData);
-      if (
-        itemData.status == 1 ||
-        itemData.status == 4 ||
-        itemData.status == 7
-      ) {
-        this.toStorage(itemData);
-      } else {
-        this.toDetail(itemData);
-      }
+      this.toDetail(itemData);
     },
   },
 };