lilei 2 سال پیش
والد
کامیت
a59b30ddfb

+ 5 - 6
pages/common/partList.vue

@@ -8,7 +8,7 @@
 			<view class="partList-list-box" v-for="item in partList" :key="item.id">
 				<view class="product flex align_center">
 					<view class="checkbox" v-if="model == 'checkbox'">
-						<u-checkbox v-model="item.checked" :name="item.id" @change="checkChange" size="40" shape="circle"></u-checkbox>
+						<u-checkbox v-model="item.checked" :disabled="item.printQty==0" :name="item.id" @change="checkChange" size="40" shape="circle"></u-checkbox>
 					</view>
 					<view class="flex align_center flex_1">
 						<view class="pimgs" @click="checkChange({name:item.id})">
@@ -66,7 +66,7 @@
 				<!-- 有复选框 -->
 				<view v-if="model == 'checkbox'" class="ptools flex align_center justify_between">
 					<view></view>
-					<view class="pcurnums flex align_center" v-if="pageType=='manualPrint'">
+					<view class="pcurnums flex align_center" v-if="pageType=='manualPrint'&&item.printQty">
 						<text>打印数量</text>
 						<view class="u-ninput">
 							<u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="item.printQty" :min="1" :max="999999"></u-number-box>
@@ -137,7 +137,6 @@
 						this.totalNums = this.totalNums + item.qty
 					}else if(_this.pageType=='manualPrint'){  // 补货-手动打印
 						this.totalNums = this.totalNums + (item.billState == 'FINISH' ? item.putQty : item.qty)
-						item.printQty = item.printQty ? item.printQty : 1
 					}else if(_this.pageType=='scanCodePrint'){  // 补货-扫码打印
 						this.totalNums = this.totalNums + (item.billState == 'FINISH' ? item.putQty : item.qty)
 						item.printQty = item.printQty ? item.printQty : 1
@@ -170,7 +169,7 @@
 			// 全选
 			allSelect(val){
 				this.partList.map(item => {
-					item.checked = val
+					item.checked = val && !!item.printQty
 				})
 				this.partList.splice()
 			},
@@ -182,12 +181,12 @@
 					this.partList.splice()
 				}
 				// 判断是否全选
-				const isAllNoChecked = this.partList.filter(item => !item.checked)
+				const isAllNoChecked = this.partList.filter(item => !item.checked && item.printQty)
 				this.$emit('allChecked',isAllNoChecked.length == 0)
 			},
 			// 获取所有选择的
 			getAllChecked(){
-				return this.partList.filter(item => item.checked)
+				return this.partList.filter(item => item.checked && item.printQty)
 			},
 			// 获取所有数据
 			getAllData(){

+ 3 - 3
pages/replenishmentManage/manualPrint.vue

@@ -8,7 +8,7 @@
 		</view>
 		<view class="replenishment-manualPrint-footer">
 			<view>
-				<u-checkbox size="40" @change="allCheckeChange" v-model="allChecked" shape="circle">{{allChecked?'取消全选':'全选'}}</u-checkbox>
+				<u-checkbox size="40" :disabled="basicInfoData&&basicInfoData.billState == 'FINISH' && !basicInfoData.totalPutQty" @change="allCheckeChange" v-model="allChecked" shape="circle">{{allChecked?'取消全选':'全选'}}</u-checkbox>
 			</view>
 			<view>
 				<kk-printer @closeConnect="closeConnect" ref="kkprinter" defaultText="开始打印" @startPrint="startPrint"></kk-printer>
@@ -45,7 +45,6 @@
 		onLoad(option) {
 			this.replenishBillSn = option.sn
 			this.getDetail()
-			this.getPartList()
 			// 保持屏幕常亮
 			uni.setKeepScreenOn({
 				keepScreenOn: true
@@ -80,6 +79,7 @@
 					}else{
 						this.basicInfoData = null
 					}
+					this.getPartList()
 				})
 			},
 			// 查询列表
@@ -97,7 +97,7 @@
 						this.partList = res.data || []
 						this.$nextTick(()=>{
 							this.allCheckeChange({value:true})
-							this.allChecked = true
+							this.allChecked = !(this.basicInfoData&&this.basicInfoData.billState == 'FINISH' && !this.basicInfoData.totalPutQty)
 						})
 					}else{
 						this.partList = []

+ 5 - 1
pages/replenishmentManage/scanCodePrint.vue

@@ -136,7 +136,11 @@
 							shelfPlaceCode: res.data&&res.data[0]&&res.data[0].shelfPlaceCode,
 							shelfPlaceSn: res.data&&res.data[0]&&res.data[0].shelfPlaceSn
 						}
-						uni.navigateTo({ url: "/pages/common/printTag/printTag?page=smdy&data="+JSON.stringify(params) })
+						if(!(res.data[0].billState == 'FINISH'&&!params.qty)){
+							uni.navigateTo({ url: "/pages/common/printTag/printTag?page=smdy&data="+JSON.stringify(params) })
+						}else{
+							this.toashMsg("签收数量为0,不可打印")
+						}
 					}else{
 						this.contTitle = 0
 						this.contModal = "抱歉,该产品不是此补货单的产品请更换产品重新扫描?"

+ 2 - 4
pages/shelfSetting/shelfSet.vue

@@ -122,7 +122,7 @@
 			this.shelfSn = option.shelfSn
 			// 获取货架详情
 			this.getShelfDetal()
-			this.getShelfPriceShow()
+			// this.getShelfPriceShow()
 			// 获取货物
 			this.getShelfPlace()
 			this.isLoad = true
@@ -309,9 +309,7 @@
 				shelfSave(params).then(res => {
 					 if (res.status == 200) {
 					  this.toashMsg(res.message)
-					  setTimeout(()=>{
-						  this.getShelfDetal()
-					  },4000)
+					  this.getShelfDetal()
 					 }
 				})
 			},

+ 2 - 1
pages/soldOut/shelfList.vue

@@ -46,6 +46,7 @@
 					<view class="item-info">
 						<view class="item-name">
 							<text>{{item.shelfName}}</text>
+							<text style="color: #ff5500;" v-if="item.state!='ENABLE'">(状态为"已暂停")</text>
 						</view>
 						<view class="item-detail">
 							<view>
@@ -204,7 +205,7 @@
 			    	url: "/pages/soldOut/creatOrder?data="+encodeURIComponent(JSON.stringify(this.tempData))
 			    })
 			  } else {
-			    this.$message.info('此货架没有待补货产品')
+			    this.toashMsg('此货架没有待补货产品')
 			  }
 			},
 		}