修改部分bug

pages/inventory-task/components/categoryPopup.vue

@@ -6,6 +6,7 @@
     @open="open"
     :round="10"
     :closeOnClickOverlay="false"
+		:safeAreaInsetBottom="false"
     width="580rpx"
   >
     <view class="location-edit-popup">
@@ -67,6 +68,9 @@
           >确认</u-button
         >
       </view>
+			<view class="tips-box">
+				*修改库位后，经过erp后台审核后方可生效
+			</view>
     </view>
   </u-popup>
 </template>
@@ -178,5 +182,12 @@ export default {
       }
     }
   }
+	
+	.tips-box {
+		color: #BFC8DB;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 24rpx;
+	}
 }
 </style>

pages/inventory-task/detail.vue

@@ -72,8 +72,9 @@
         <view class="location-row">
           <view class="location-left">
             <text class="location-label">库位：</text>
-            <text class="location-value">{{ item.position }}</text>
+            <text class="location-value">{{ item.position || '-' }}</text>
             <image
+							v-if="item.status != 3"
               src="@/static/image/bianji-icon.png"
               mode=""
               class="icon"
@@ -163,9 +164,24 @@
             type="error"
             plain
             plainFill
-            v-if="item.status === 4"
+            v-if="item.status === 2"
           >
           </u-tag>
+					<u-tag
+					  text="无差异"
+					  type="success"
+					  plain
+					  plainFill
+					  v-if="item.status === 4"
+					>
+					</u-tag>
+					<u-tag
+					  text="未盘"
+					  plain
+					  plainFill
+					  v-if="item.status === 1"
+					>
+					</u-tag>
         </view>
       </view>
       <!-- 加载更多 -->
@@ -182,7 +198,6 @@
     <actionNumPopup
       :show.sync="actionPop.showNumPop"
       :min-count="actionPop.minCount"
-      :max-count="actionPop.maxCount"
       @confirm="handleConfirmNum"
     />
     <!-- 修改库位 -->

pages/inventory-task/index.vue

@@ -22,7 +22,6 @@
             :activeStyle="{ color: '#000', fontSize: '28rpx' }"
             lineColor="#0256FF"
             lineWidth="66rpx"
-            :scrollable="false"
             @click="tabClick"
           >
           </u-tabs>
@@ -92,6 +91,7 @@ export default {
         errorText: "是否提交盘点？",
       },
 			startTaskId:null,
+			toStock:false,//是否跳转盘点
     };
   },
   onLoad() {
@@ -203,6 +203,7 @@ export default {
             } else {
               this.actionPop.errorText = "尚有货物未完成盘点，请先去盘点";
               this.actionPop.submitActionFlag = false;
+							this.toStock = true
             }
           });
 
@@ -228,6 +229,12 @@ export default {
         });
       } else {
         this.resetErrorPopData();
+				if(this.toStock) {
+					this.toStock = false
+					uni.navigateTo({
+					  url: `/pages/inventory-task/detail?id=${this.activeTaskId}&pageType=1`,
+					});
+				}
       }
     },
   },

pages/inventory-task/taskDetail.vue

@@ -61,7 +61,7 @@
         </view>
         <view class="info-item">
           <text class="info-label">参与人员</text>
-          <text class="info-value">{{ taskInfo.operBy }}</text>
+          <text class="info-value">{{ taskInfo.operCount }}</text>
         </view>
       </view>
     </view>

pages/picking-task/delivery.vue

@@ -18,7 +18,7 @@
 						<text>客户</text>
 					</view>
 					<view class="info-line-value">
-						{{orderInfo.supplierName}}
+						{{orderInfo.supplierName || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -26,7 +26,7 @@
 						<text>出库类型</text>
 					</view>
 					<view class="info-line-value">
-						{{orderInfo.subType}}
+						{{orderInfo.subType || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -34,17 +34,17 @@
 						<text>出库日期</text>
 					</view>
 					<view class="info-line-value">
-						{{orderInfo.operTime}}
+						{{orderInfo.operTime || '-'}}
 					</view>
 				</view>
-				<view class="info-line">
+				<!-- <view class="info-line">
 					<view class="info-line-label">
 						<text>配送地址</text>
 					</view>
 					<view class="info-line-value">
 						长沙市岳麓区-暂无
 					</view>
-				</view>
+				</view> -->
 				<view class="info-line">
 					<view class="info-line-label">
 						<text>上传凭证</text>
@@ -91,13 +91,13 @@
 				</view>
 				<block v-for="(item,i) in goodsList" :key="i">
 					<good-item :item="item" @toDetail="toDetail">
-						<view class="num-box">
+						<view class="num-box" @click.stop="">
 							<view class="num-box-text">已确认拣货数量</view>
-							<u-number-box v-model="value">
+							<u-number-box v-model="item.materialNumber">
 								<view slot="minus" class="minus">
 									<u-icon name="minus" color="#0256FF" size="12"></u-icon>
 								</view>
-								<text slot="input" class="input">{{value}}</text>
+								<text slot="input" class="input">{{item.materialNumber}}</text>
 								<view slot="plus" class="plus">
 									<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
 								</view>
@@ -111,7 +111,7 @@
 		<view class="footer-box">
 			<view class="footer-box-l">
 				<view>货物种类:{{speciesNum}}种</view>
-				<view>货物种数:{{goodsNum}}件</view>
+				<view>货物总数:{{orderGoodsNum}}件</view>
 			</view>
 			<button class="submitBtn" @tap="submitClick">
 			  提交
@@ -270,7 +270,13 @@
 				})
 			},
 			submitClick() {
-				if(this.orderGoodsNum != this.goodsNum) {
+				let num = 0
+				this.goodsList.forEach(item=>{
+					if(item.materialNumber * 1 != item.operNumber ) {
+						num ++
+					}
+				})
+				if(num>0) {
 					return this.errorShow = true
 				}
 				this.toOrderSubmit()

pages/picking-task/detail.vue

@@ -164,7 +164,6 @@
 				
 			},
 			confirm() {
-				console.log('确定')
 				this.errorShow = false
 			},
 			backClick() {

pages/purchase/put-storage.vue

@@ -103,7 +103,7 @@
 		<view class="footer-box">
 			<view class="footer-box-l">
 				<view>货物种类:{{speciesNum}}种</view>
-				<view>货物种数:{{goodsNum}}件</view>
+				<view>货物总数:{{orderGoodsNum}}件</view>
 			</view>
 			<button class="submitBtn" @tap="submitClick">
 			  提交
@@ -272,7 +272,13 @@
 				})
 			},
 			submitClick() {
-				if(this.orderGoodsNum != this.goodsNum) {
+				let num = 0
+				this.goodsList.forEach(item=>{
+					if(item.materialNumber * 1 != item.operNumber ) {
+						num ++
+					}
+				})
+				if(num>0) {
 					return this.errorShow = true
 				}
 				this.toOrderSubmit()