修改bug

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.21",
+    "versionName" : "V1.0.3.23",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {
@@ -10,8 +10,8 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
-                    "target" : "http://192.168.1.125:18086/",
-                    //   "target" : "http://192.168.1.251:18086/",
+                    // "target" : "http://192.168.1.125:18086/",
+                    "target" : "http://192.168.1.251:18086/",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages/pda/picking/bill/index.vue

@@ -95,20 +95,39 @@
       </u-list>
 
       <u-list @scrolltolower="scrolltolower" key="dataList2" v-if="status == 2">
-        <view
-          class="card_box cx-sc"
-          v-for="(item, index) in dataList.orderInfoList"
-          :key="index"
-        >
-          <outInstanceBom :item="item" :isDetails="true"></outInstanceBom>
+        <view v-if="dataList.type == 1">
+          <view
+            class="card_box cx-sc"
+            v-for="(item, index) in dataList.detailList"
+            :key="index"
+          >
+            <outInstanceBom :item="item" :isDetails="true"></outInstanceBom>
+          </view>
+
+          <u-list-item
+            v-if="dataList.detailList.length === 0"
+            style="margin-top: 20vh"
+          >
+            <u-empty iconSize="150" textSize="32" text="暂无数据"> </u-empty>
+          </u-list-item>
         </view>
 
-        <u-list-item
-          v-if="dataList.orderInfoList.length === 0"
-          style="margin-top: 20vh"
-        >
-          <u-empty iconSize="150" textSize="32" text="暂无数据"> </u-empty>
-        </u-list-item>
+        <view v-if="dataList.type == 2">
+          <view
+            class="card_box cx-sc"
+            v-for="(item, index) in dataList.orderInfoList"
+            :key="index"
+          >
+            <outInstanceBom :item="item" :isDetails="true"></outInstanceBom>
+          </view>
+
+          <u-list-item
+            v-if="dataList.orderInfoList.length === 0"
+            style="margin-top: 20vh"
+          >
+            <u-empty iconSize="150" textSize="32" text="暂无数据"> </u-empty>
+          </u-list-item>
+        </view>
 
         <!-- <view class="card_box cx-sc">
           <outInstanceBom :list="dataList" :isDetails="true"></outInstanceBom>
@@ -160,9 +179,6 @@ export default {
     this.title =
       option.status == 1 ? "领料详情" : option.status == 2 ? " 出库详情" : "";
     this.dataList = JSON.parse(option.item);
-    console.log(this.dataList, "领料详情数据");
-    // this.ids = [option.id];
-    // this.getList();
   },
 
   methods: {

pages/pda/selfBuiltPickOrder/components/addPick.vue

@@ -120,7 +120,7 @@
     <!-- 底部操作按钮 -->
     <view class="footer-btn">
       <button @click="close" size="mini">取消</button>
-      <button type="primary" @click="save" size="mini">确定</button>
+      <button type="primary" @click="save" size="mini">提交</button>
     </view>
   </view>
 </template>
@@ -175,7 +175,6 @@ export default {
         pickList: newData,
       };
 
-      console.log(this.objPick, "11111");
       this.$forceUpdate();
     });
   },

pages/pda/selfBuiltPickOrder/components/pickWorkCard.vue

@@ -19,11 +19,6 @@
           <text class="value ellipsis">{{ item.code }}</text>
         </view>
 
-        <view class="row">
-          <text class="label">领料单名称：</text>
-          <text class="value ellipsis">{{ item.name }}</text>
-        </view>
-
         <view class="row two-col">
           <view class="col">
             <text class="label">领料人：</text>

pages/pda/selfBuiltPickOrder/components/selfBuiltPickOrderDetail.vue

@@ -78,14 +78,14 @@
       <u-list @scrolltolower="scrolltolower" key="dataList2" v-if="status == 2">
         <view
           class="card_box cx-sc"
-          v-for="(item, index) in dataList.orderInfoList"
+          v-for="(item, index) in dataList.detailList"
           :key="index"
         >
           <outInstanceBom :item="item" :isDetails="true"></outInstanceBom>
         </view>
 
         <u-list-item
-          v-if="dataList.orderInfoList.length === 0"
+          v-if="dataList.detailList.length === 0"
           style="margin-top: 20vh"
         >
           <u-empty iconSize="150" textSize="32" text="暂无数据"> </u-empty>

pages/pda/selfBuiltPickOrder/index/index.vue

@@ -37,20 +37,20 @@
           已出库</view
         >
       </view>
+    </view>
 
-      <view class="list_box">
-        <u-list @scrolltolower="scrolltolower">
-          <pickWorkCard
-            v-if="dataList.length && pickStatus != 0"
-            :list="dataList"
-          >
-          </pickWorkCard>
-
-          <view v-else style="margin-top: 20vh">
-            <u-empty iconSize="150" textSize="32" text="暂无工单"> </u-empty>
-          </view>
-        </u-list>
-      </view>
+    <view class="list_box">
+      <u-list @scrolltolower="scrolltolower">
+        <pickWorkCard
+          v-if="dataList.length && pickStatus != 0"
+          :list="dataList"
+        >
+        </pickWorkCard>
+
+        <view v-else style="margin-top: 20vh">
+          <u-empty iconSize="150" textSize="32" text="暂无工单"> </u-empty>
+        </view>
+      </u-list>
     </view>
   </view>
 </template>