lilei 2 éve
szülő
commit
4c4d88b17c

+ 7 - 4
components/kk-printer/index.vue

@@ -15,7 +15,7 @@
 						<view class="filter-title">根据蓝牙名过滤</view>
 						<input type="text"  placeholder-class="kk-placeholder-class" placeholder="请输入蓝牙名字或设备ID搜索" v-model="filterName" />
 					</view> -->
-					<view>
+					<view style="text-align: left;">
 						<view>注意事项:</view>
 						<view>1、连接打印机之前,先打开手机蓝牙开关</view>
 						<view>2、请检查打印机是否已被其它手机连接,如果是请关闭其它手机蓝牙,然后再用您的手机连接</view>
@@ -37,8 +37,8 @@
 							<view class="empty-text">~ 无可搜索到的设备 ~</view>
 						</view>
 						<view class="" v-else>
-							<view class="kk-devices-item flex align_center" v-for="(item,index) in filterDeviceList" :key="index" @tap="handleConnectDevice(item)">
-								<view>
+							<view class="kk-devices-item flex align_center justify_between" v-for="(item,index) in filterDeviceList" :key="index" @tap="handleConnectDevice(item)">
+								<view style="text-align: left;flex-grow: 1;">
 									<view class="name">
 										<text>设备名称:</text>
 										<text>{{item.name?item.name:'未命名'}}</text>
@@ -52,7 +52,7 @@
 										<text>{{item.deviceId}}</text>
 									</view>
 								</view>
-								<view>
+								<view style="width: 120rpx;">
 									<!-- <u-icon :size="60" color="#55aaff" name="plus-circle"></u-icon> -->
 									<u-button @tap="handleConnectDevice(item)" :loading="isConnecting" shape="circle" size="mini" :custom-style="{background:$config('primaryColor')}" type="primary">{{isConnecting?'连接中':'连接'}}</u-button>
 								</view>
@@ -427,6 +427,9 @@
 										width: 80%;
 									}
 								}
+								button{
+									width: auto;
+								}
 							}
 						}
 					}

+ 11 - 6
pages/approveStore/authPass.vue

@@ -100,9 +100,7 @@
 					storeImage:[{ required: true, message: '请选择门头照片', trigger: 'change' }],
 					storeName: [{ required: true, message: '请输入门店名称', trigger: 'change' }],
 					contactMobile: [{ required: false, pattern: /^\d{30}$/, message: '请输入正确的手机号', trigger: 'change' }],
-					addrProvince: [{ required: true, message: '请选择省', trigger: 'change' }],
-					addrCity: [{ required: true, message: '请选择市', trigger: 'change' }],
-					addrDistrict: [{ required: true, message: '请选择区/县', trigger: 'change' }],
+					label: [{ required: true, message: '请选择地区', trigger: 'change' }],
 					addrDetail: [{ required: true, message: '请输入详细地址', trigger: 'change' }],
 					contactName: [{ required: true, message: '请输入联系人姓名', trigger: 'change' }],
 					settleType: [{ required: true, message: '请选择收结算方式', trigger: 'change' }],
@@ -153,9 +151,16 @@
 			      this.form = Object.assign(this.form, res.data)
 			      this.storePhotoList = this.form.storeImage ? [{url:this.form.storeImage}] : []
 			      this.yyzzPhotoList = this.form.licenseImage ? [{url:this.form.licenseImage}] : [],
-			      this.labelArr = [this.form.addrProvinceName,this.form.addrCityName,this.form.addrDistrictName]
-			      this.areaIdArr = [this.form.addrProvince,this.form.addrCity,this.form.addrDistrict]
-			      this.form.label = this.labelArr.join('-')
+				  this.form.addrDetail = this.form.addrDetail || ''
+				  if(this.form.addrProvinceName&&this.form.addrCityName&&this.form.addrDistrictName){
+					  this.labelArr = [this.form.addrProvinceName,this.form.addrCityName,this.form.addrDistrictName]
+					  this.areaIdArr = [this.form.addrProvince,this.form.addrCity,this.form.addrDistrict]
+					  this.form.label = this.labelArr.join('-')
+				  }else{
+					  this.labelArr = []
+					  this.areaIdArr = []
+					  this.form.label = ''
+				  }
 			      this.form.auditStatus = 'PASS' // 通过
 			    } else {
 			      this.$refs.ruleForm.resetFields()

+ 10 - 3
pages/approveStore/detail.vue

@@ -97,9 +97,16 @@
 				  console.log(res)
 			    if (res.status == 200) {
 			      this.form = Object.assign(this.form, res.data)
-			      this.labelArr = [this.form.addrProvinceName,this.form.addrCityName,this.form.addrDistrictName]
-			      this.areaIdArr = [this.form.addrProvince,this.form.addrCity,this.form.addrDistrict]
-			      this.form.label = this.labelArr.join('-')
+				  this.form.addrDetail = this.form.addrDetail || '--'
+				  if(this.form.addrProvinceName&&this.form.addrCityName&&this.form.addrDistrictName){
+				  	this.labelArr = [this.form.addrProvinceName,this.form.addrCityName,this.form.addrDistrictName]
+				  	this.areaIdArr = [this.form.addrProvince,this.form.addrCity,this.form.addrDistrict]
+				  	this.form.label = this.labelArr.join('-')
+				  }else{
+					this.labelArr = []
+					this.areaIdArr = []
+					this.form.label = '--'
+				  }
 			    }  
 			  })
 			},

+ 1 - 1
pages/approveStore/list.vue

@@ -27,7 +27,7 @@
 								<view class="info">
 									<view class="btext">{{item.contactPhone}} {{item.contactName}}</view>
 									<view>{{item.storeName}}</view>
-									<view class="addr">{{item.addrProvinceName +'-'+ item.addrCityName +'-'+ item.addrDistrictName +'-'+ item.addrDetail}}</view>
+									<view class="addr" v-if="item.addrProvinceName||item.addrDetail">{{item.addrProvinceName +'-'+ item.addrCityName +'-'+ item.addrDistrictName +' '+ item.addrDetail}}</view>
 								</view>
 							</view>
 							<view style="width: 100%;text-align: right;" v-if="item.auditStatus == 'WAIT'">

+ 1 - 1
pages/common/partList.vue

@@ -82,7 +82,7 @@
 					<view class="pcurnums flex align_center" v-if="pageType=='replenishmentSign'">
 						<text>入库数量</text>
 						<view class="u-ninput">
-							<u-number-box color="#000" bg-color="#fff" v-model="item.putQty" @change="numberChange" :min="0" :max="item.confirmQty"></u-number-box>
+							<u-number-box color="#000" bg-color="#fff" v-model="item.putQty" @change="numberChange" :min="0" :max="999999"></u-number-box>
 						</view>
 					</view>
 				</view>

+ 1 - 1
pages/replenishmentManage/confirm.vue

@@ -9,7 +9,7 @@
 					<view class="item-num">
 						<view class="num-t">x {{item.qty||item.qty==0?item.qty:'--'}} {{item.product&&item.product.unit?item.product.unit:'--'}}</view>
 						<view class="num-v">
-							<u-number-box color="#000" bg-color="#fff" v-model="item.confirmQty" @change="handlerChange" :min="0" :max="item.qty"></u-number-box>
+							<u-number-box color="#000" bg-color="#fff" v-model="item.confirmQty" @change="handlerChange" :min="0" :max="999999"></u-number-box>
 						</view>
 					</view>
 				</view>

+ 8 - 6
pages/shelfSetting/addShelfHw.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content flex flex_column">
 		<view class="form-body">
-			<u-form :model="form" label-width="155rpx" :error-type="['toast']" ref="uForm">
+			<u-form :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
 				<u-form-item label="货位号" required prop="shelfPlaceCode">
 					<u-input focus v-model="form.shelfPlaceCode" :maxlength="30" placeholder="请输入货位号(最多30个字符)"/>
 				</u-form-item>
@@ -29,14 +29,14 @@
 						</view>
 					</view>
 				</u-form-item>
-				<u-form-item label="销售价" v-if="productEntity" required prop="price">
+				<u-form-item label="销售价(元)" v-if="productEntity" required prop="price">
 					<u-input clearable type="number" :min="0" @input="numberToFixed('price',2,999999)" v-model="form.price" placeholder="请输入销售价,最多两位小数"/>
 				</u-form-item>
-				<u-form-item label="结算价" v-if="productEntity" required prop="cost">
+				<u-form-item label="结算价(元)" v-if="productEntity" required prop="cost">
 					<u-input clearable type="number" :min="0" @input="numberToFixed('cost',2,999999)" v-model="form.cost" placeholder="请输入结算价,最多两位小数"/>
 				</u-form-item>
-				<u-form-item label="最大库容" v-if="productEntity" required prop="maxQty">
-					<u-input clearable type="number" :min="1" @input="numberToFixed('maxQty',1,999999)" v-model="form.maxQty" placeholder="请输入最大库容"/>
+				<u-form-item label="最大库容(件)" v-if="productEntity" required prop="maxQty">
+					<u-number-box :min="0" :max="999999" positive-integer v-model="form.maxQty" color="#000" bg-color="#fff" size="30" :input-height="70" :input-width="150"></u-number-box>
 				</u-form-item>
 			</u-form>
 		</view>
@@ -107,7 +107,9 @@
 			}
 		},
 		onUnload(){
-			uni.$off("addProductToHw")
+			if(this.type == 'add'){
+				uni.$off("addProductToHw")
+			}
 		},
 		methods: {
 			// 小数点后两位

+ 6 - 5
pages/shelfSetting/editShelfHw.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content flex flex_column">
 		<view class="form-body">
-			<u-form :model="form" label-width="155rpx" :error-type="['toast']" ref="uForm">
+			<u-form :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
 				<u-form-item label="货位号">
 					<view class="flex align_center flex_1 justify_between">
 						<view style="width: 80%;">{{shelfPlaceCode}}</view>
@@ -28,14 +28,14 @@
 							</view>
 						</view>
 					</u-form-item>
-					<u-form-item label="销售价" required prop="price">
+					<u-form-item label="销售价(元)" required prop="price">
 						<u-input clearable type="number" :min="0" @input="numberToFixed('price',2,999999)" v-model="form.price" placeholder="请输入销售价,最多两位小数"/>
 					</u-form-item>
-					<u-form-item label="结算价" required prop="cost">
+					<u-form-item label="结算价(元)" required prop="cost">
 						<u-input clearable type="number" :min="0" @input="numberToFixed('cost',2,999999)" v-model="form.cost" placeholder="请输入结算价,最多两位小数"/>
 					</u-form-item>
-					<u-form-item label="最大库容" required prop="maxQty">
-						<u-input clearable type="number" :min="1" @input="numberToFixed('maxQty',0,999999)" v-model="form.maxQty" placeholder="请输入最大库容"/>
+					<u-form-item label="最大库容(件)" required prop="maxQty">
+						<u-number-box :min="0" :max="999999" positive-integer v-model="form.maxQty" color="#000" bg-color="#fff" size="30" :input-height="70" :input-width="150"></u-number-box>
 					</u-form-item>
 				</view>
 				<view class="noproduct" v-else  @click="toBindProduct">
@@ -119,6 +119,7 @@
 			}
 		},
 		onUnload(){
+			console.log('-----')
 			uni.$off("addProductToHw")
 			uni.$off("updateHwNo")
 		},

+ 3 - 1
pages/shelfSetting/quickReplenish.vue

@@ -19,7 +19,9 @@
 				<u-checkbox size="40" @change="allCheckeChange" v-model="allChecked" shape="circle">{{allChecked?'取消全选':'全选'}}</u-checkbox>
 			</view>
 			<view class="btns flex align_item justify_end">
-				<kk-printer ref="kkprinter" printBtnStyle="default-mid" defaultText="打印贴签" @startPrint="startPrint"></kk-printer>
+				<view>
+					<kk-printer ref="kkprinter" printBtnStyle="default-mid" defaultText="打印贴签" @startPrint="startPrint"></kk-printer>
+				</view>
 				<view style="padding: 0 10rpx;"></view>
 				<view>
 					<u-button class="handle-btn" :loading="loading" shape="circle" size="medium" hover-class="none" :custom-style="customBtnStyle" @click="replenish">快速补货</u-button>

+ 1 - 1
pages/shelfSetting/shelfList.vue

@@ -75,7 +75,7 @@
 			uni.$on("setCustome",(data)=>{
 				this.pageNo = 1
 				this.shelfList = []
-				this.getShelfList()
+				this.search()
 				this.saveShelf(data)
 			})
 		},

+ 2 - 3
pages/stockCheck/editModal.vue

@@ -12,7 +12,7 @@
 				 	<text>单位</text> {{infoData.productEntity.unit}}
 				 </view>
 				 <view class="p-info flex align_center">
-				 	<text>可用库存</text> {{infoData.qty}}
+				 	<text>可用库存</text> {{infoData.currQty}}
 				 </view>
 				 <view class="p-info flex align_center">
 				 	<text>冻结库存</text>
@@ -85,9 +85,8 @@
 						shelfPlaceCode: this.infoData.shelfPlaceCode,
 						productCode: this.infoData.productCode,
 						productSn: this.infoData.productSn,
-						stockQty: this.infoData.stockQty,
 						freezeQty: this.infoData.freezeQty,
-						stockQty: this.infoData.qty,
+						stockQty: this.infoData.currQty,
 						checkQty: this.infoData.checkQty,
 						stockCheckDetailSn: this.infoData.stockCheckDetailSn || undefined,
 						cost: this.infoData.cost

+ 3 - 3
pages/stockCheck/startCheck.vue

@@ -47,7 +47,7 @@
 								<view class="item-detail">
 									<view>
 										可用库存:
-										<text class="item-detail-text">{{item.qty}}</text>
+										<text class="item-detail-text">{{item.currQty}}</text>
 										{{item.productEntity&&item.productEntity.unit}}
 									</view>
 									<view>
@@ -298,11 +298,11 @@
 				// 修改
 				if(data){
 					data.productEntity = data.product
-					data.qty = data.stockQty
+					data.currQty = data.stockQty
 					this.tempData = data
 				}else{
 					// 添加
-					item.checkQty = item.qty
+					item.checkQty = item.currQty
 					this.tempData = item
 				}
 				this.editModal = true