lilei пре 1 година
родитељ
комит
6774bb4825

+ 3 - 3
pages/stock/index.vue

@@ -17,14 +17,14 @@
 				<!-- 表头行 -->
 				<uni-tr>
 					<uni-td width="30%" align="center">产品编码</uni-td>
-					<uni-td width="30%" align="center">条形码</uni-td>
-					<uni-td width="15%" align="center">库存</uni-td>
+					<uni-td width="30%" align="center">库存</uni-td>
+					<uni-td width="15%" align="center">冻结</uni-td>
 					<uni-td width="25%" align="center">仓库/仓位</uni-td>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="item in listData" :key="item.productSn" @click="toDetail(item)">
 					<uni-td width="30%" align="center">{{item.productCode||'-'}}</uni-td>
-					<uni-td width="30%" align="center">{{item.dealerProductEntity.qrCode||'-'}}</uni-td>
+					<uni-td width="30%" align="center">{{item.currentQty}}</uni-td>
 					<uni-td width="15%" align="center">{{item.currentQty}}</uni-td>
 					<uni-td width="25%" align="center">{{item.warehouseName}}/<view>{{item.warehouseLocationName}}</view></uni-td>
 				</uni-tr>

+ 20 - 1
pages/stockOut/chainTransferOut/index.vue

@@ -7,7 +7,7 @@
 					<text style="color: crimson;">{{baseData.allocationLinkageOutNo}}</text>
 				</view>
 				<view>
-					<button :disabled="loading" size="mini" type="primary" @click="toOut"> 出库 <text class="iconfont icon-icon-test43"></text></button>
+					<button :disabled="loading" size="mini" type="primary" @click="submitForm"> 出库 <text class="iconfont icon-icon-test43"></text></button>
 				</view>
 			</view>
 			 <view>
@@ -73,6 +73,7 @@
 			<button size="mini" type="primary" @click="addQty(true)"> <text class="iconfont icon-add-btn"> 加 </text></button>
 		</view>
 		<scanCode></scanCode>
+		<u-modal :show="showModal" :title="msg.title" :confirmText="msg.confirmText" showCancelButton :content='msg.content' @cancel="showModal=false" @confirm="confirmModal"></u-modal>
 	</view>
 </template>
 
@@ -87,6 +88,8 @@
 			return {
 				loading: false,
 				baseData: null,
+				showModal: false,
+				msg:{title:'提示',content:''},
 				detailList:[],
 				code:'',
 				productCode: '',
@@ -192,6 +195,22 @@
 					}
 				})
 			},
+			confirmModal(e){
+				this.toOut()
+			},
+			// 提交
+			submitForm(){
+				if(this.baseData.pickQty != this.baseData.productTotalQty){
+					this.showModal = true
+					this.msg = {
+						title: '提示',
+						content: '拣货未完成,是否出库?',
+						confirmText: '确定出库'
+					}
+				}else{
+					this.toOut()
+				}
+			},
 			// 出库
 			async toOut(){
 				const ret = await allocLinkageOutStock({sn: this.allocationLinkageOutSn})

+ 20 - 1
pages/stockOut/salesOut/index.vue

@@ -7,7 +7,7 @@
 					<text style="color: crimson;">{{baseData.salesBillNo}}</text>
 				</view>
 				<view>
-					<button :disabled="loading" size="mini" type="primary" @click="toOut"> 出库 <text class="iconfont icon-icon-test43"></text></button>
+					<button :disabled="loading" size="mini" type="primary" @click="submitForm"> 出库 <text class="iconfont icon-icon-test43"></text></button>
 				</view>
 			</view>
 			<view>
@@ -73,6 +73,7 @@
 			<button size="mini" type="primary" @click="addQty(true)"> <text class="iconfont icon-add-btn"> 加 </text></button>
 		</view>
 		<scanCode></scanCode>
+		<u-modal :show="showModal" :title="msg.title" :confirmText="msg.confirmText" showCancelButton :content='msg.content' @cancel="showModal=false" @confirm="confirmModal"></u-modal>
 	</view>
 </template>
 
@@ -87,6 +88,8 @@
 			return {
 				loading: false,
 				baseData: null,
+				showModal: false,
+				msg:{title:'提示',content:''},
 				detailList:[],
 				code:'',
 				productCode: '',
@@ -191,6 +194,22 @@
 					}
 				})
 			},
+			confirmModal(e){
+				this.toOut()
+			},
+			// 提交
+			submitForm(){
+				if(this.baseData.pickQty != this.baseData.totalQty){
+					this.showModal = true
+					this.msg = {
+						title: '提示',
+						content: '拣货未完成,是否出库?',
+						confirmText: '确定出库'
+					}
+				}else{
+					this.toOut()
+				}
+			},
 			// 出库
 			async toOut(){
 				const ret = await salesWriteStockOut({salesBillSn: this.salesBillSn})

+ 20 - 1
pages/stockOut/storeTransferOut/index.vue

@@ -7,7 +7,7 @@
 					<text style="color: crimson;">{{baseData.storeCallOutNo}}</text>
 				</view>
 				<view>
-					<button :disabled="loading" size="mini" type="primary" @click="toOut"> 出库 <text class="iconfont icon-icon-test43"></text></button>
+					<button :disabled="loading" size="mini" type="primary" @click="submitForm"> 出库 <text class="iconfont icon-icon-test43"></text></button>
 				</view>
 			</view>
 			<view>
@@ -73,6 +73,7 @@
 			<button size="mini" type="primary" @click="addQty(true)"> <text class="iconfont icon-add-btn"> 加 </text></button>
 		</view>
 		<scanCode></scanCode>
+		<u-modal :show="showModal" :title="msg.title" :confirmText="msg.confirmText" showCancelButton :content='msg.content' @cancel="showModal=false" @confirm="confirmModal"></u-modal>
 	</view>
 </template>
 
@@ -87,6 +88,8 @@
 			return {
 				loading: false,
 				baseData: null,
+				showModal: false,
+				msg:{title:'提示',content:''},
 				detailList:[],
 				code:'',
 				productCode: '',
@@ -192,6 +195,22 @@
 					}
 				})
 			},
+			confirmModal(e){
+				this.toOut()
+			},
+			// 提交
+			submitForm(){
+				if(this.baseData.pickQty != this.baseData.productTotalQty){
+					this.showModal = true
+					this.msg = {
+						title: '提示',
+						content: '拣货未完成,是否出库?',
+						confirmText: '确定出库'
+					}
+				}else{
+					this.toOut()
+				}
+			},
 			// 出库
 			async toOut(){
 				const ret = await storeCallOutOut({storeCallOutSn: this.storeCallOutSn})