App.vue

@@ -8,7 +8,7 @@ export default {
 		uni.setStorageSync('downloadApkParams', null);
 		console.log('onLaunch')
 		// 检测客户端更新
-		this.$store.dispatch('update/update', 0)
+		// this.$store.dispatch('update/update', 0)
 	},
 	onShow() {
 		// #ifdef APP-PLUS

env.js

@@ -1,7 +1,7 @@
 /**
  *  全局配置文件
  */
-export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.168.40:8080' : 'https://erp.xianglitech.com.cn/prod-api'
+export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.168.42:8080' : 'https://erp.xianglitech.com.cn/prod-api'
 // https://erp.xianglitech.com.cn/prod-api
 // https://test-erp.xianglitech.com.cn/stage-api
 

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/components/check-item.vue

@@ -14,42 +14,42 @@
 				<view class="tips-box tips-yellow">盘点中</view> -->
       </view>
     </view>
-    <view class="cont-box">
+    <view class="cont-box" @click="toDetail">
       <view class="cont-item">
         <view class="item-label">盘点仓库</view>
-        <view class="item-val">{{ info.depotName }}</view>
+        <view class="item-val">{{ info.depotName || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">创建人</view>
-        <view class="item-val">{{ info.createByName }}</view>
+        <view class="item-val">{{ info.createName || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">盘点负责人</view>
-        <view class="item-val">{{ info.creatorName }}</view>
+        <view class="item-val">{{ info.creatorName || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">货物种类</view>
-        <view class="item-val">{{ info.categoryCount }}</view>
+        <view class="item-val">{{ info.categoryCount || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">货物总量</view>
-        <view class="item-val">{{ info.materialCount }}</view>
+        <view class="item-val">{{ info.materialCount || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">库位范围</view>
-        <view class="item-val">{{ info.positionRange }}</view>
+        <view class="item-val">{{ info.positionRange || '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">创建时间</view>
-        <view class="item-val">{{ info.createTime }}</view>
+        <view class="item-val">{{ info.createTime ? $u.timeFormat(info.createTime, 'yyyy-mm-dd') : '-' }}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">盘点时间</view>
-        <view class="item-val">{{ info.operTime }}</view>
+        <view class="item-val">{{$u.timeFormat(info.operTime, 'yyyy-mm-dd')}}</view>
       </view>
       <view class="cont-item">
         <view class="item-label">盘点人</view>
-        <view class="item-val">{{ info.operName }}</view>
+        <view class="item-val">{{ info.operName || '-' }}</view>
       </view>
     </view>
 
@@ -121,6 +121,15 @@ export default {
       };
       this.$emit("btnClick", params);
     },
+		toDetail() {
+			let text = ''
+			if(this.status === 3 || this.status === 4) {
+				text = '详情'
+			}else if (this.status === 1 || this.status === 2) {
+				text = '去盘点'
+			}
+			this.handleCick(text)
+		}
   },
 };
 </script>

pages/inventory-task/detail.vue

@@ -28,7 +28,7 @@
           </view>
           <view class="info-item">
             <text class="info-label">盘点人：</text>
-            <text class="info-value">{{ inventoryInfo.creatorName }}</text>
+            <text class="info-value">{{ inventoryInfo.creatorName || '-'}}</text>
           </view>
         </view>
 
@@ -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"
@@ -97,11 +98,11 @@
             </view>
             <view class="goods-field half-w">
               <text class="field-label">盘点人：</text>
-              <text class="field-value">{{ item.createName }}</text>
+              <text class="field-value">{{ item.createName || '-' }}</text>
             </view>
             <view class="goods-field">
               <text class="field-label">盘点时间：</text>
-              <text class="field-value">{{ item.operTime }}</text>
+              <text class="field-value">{{ item.operTime ? $u.timeFormat(item.operTime, 'yyyy-mm-dd') : '-' }}</text>
             </view>
             <view class="stock-row">
               <view class="stock-item">
@@ -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"
     />
     <!-- 修改库位 -->
@@ -340,7 +355,6 @@ export default {
     async getTaskStocktakingDetail(taskId) {
       try {
         const res = await taskStocktakingDetail(taskId);
-        console.log("taskStocktakingDetail======", res);
         this.inventoryInfo = res.data;
       } catch (error) {}
     },

pages/inventory-task/index.vue

@@ -22,7 +22,6 @@
             :activeStyle="{ color: '#000', fontSize: '28rpx' }"
             lineColor="#0256FF"
             lineWidth="66rpx"
-            :scrollable="false"
             @click="tabClick"
           >
           </u-tabs>
@@ -91,6 +90,8 @@ export default {
         submitActionFlag: false,
         errorText: "是否提交盘点？",
       },
+			startTaskId:null,
+			toStock:false,//是否跳转盘点
     };
   },
   onLoad() {
@@ -100,6 +101,13 @@ export default {
     // 初始化数据
     this.loadData();
   },
+	onShow() {
+		if(this.startTaskId) {
+			let index = this.list.findIndex(item=>item.id == this.startTaskId)
+			this.list[index].taskStatus = 2
+			this.startTaskId = null
+		}
+	},
   onPullDownRefresh() {
     // 下拉刷新
     this.onRefresh();
@@ -175,6 +183,7 @@ export default {
               uni.navigateTo({
                 url: `/pages/inventory-task/detail?id=${data.id}&pageType=1`,
               });
+							this.startTaskId = data.id
             } else {
               uni.$u.toast(res.data);
             }
@@ -182,7 +191,6 @@ export default {
           break;
         case "去提交":
           taskStocktakingDetail(data.id).then((res) => {
-            console.log("taskStocktakingDetail=======", res);
             let { finishCount, materialCount } = res.data;
             const a = Number(finishCount || 0);
             const b = Number(materialCount || 0);
@@ -195,6 +203,7 @@ export default {
             } else {
               this.actionPop.errorText = "尚有货物未完成盘点，请先去盘点";
               this.actionPop.submitActionFlag = false;
+							this.toStock = true
             }
           });
 
@@ -212,6 +221,7 @@ export default {
           this.resetErrorPopData();
           if (res.code === 200) {
             uni.$u.toast(res.msg);
+						this.actionPop.errorShow  = false
             this.onRefresh();
           } else {
             uni.$u.toast(res.data);
@@ -219,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()