lilei 23 hours ago
parent
commit
96c549d68d

+ 1 - 1
App.vue

@@ -7,7 +7,7 @@
 			token: '',
 			changeOrg:'',
 			version: '', // 当前版本号
-			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'dev', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 1 - 1
config/index.js

@@ -6,7 +6,7 @@ const getConfig = (theme) => {
 			themePath: 'default',
 			pro_URL: 'https://iscm.360arrow.com/qpls-md/', // 生产地址
 			uat_URL: 'https://p.iscm.360arrow.com/qpls-md/', // 预发布地址
-			dev_URL: 'http://192.168.2.100:91/qpls-md/', // 本地地址
+			dev_URL: 'http://192.168.2.10/qpls-md/', // 本地地址
 			appName: 'iSCM智慧供应链', // app 名称
 			company: '陕西山海高科信息技术有限公司',
 			loadText:{

+ 6 - 6
pages/shelfSetting/addShelfHw.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="content flex flex_column">
 		<view class="form-body">
-			<u-form :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
+			<u-form :model="form" label-width="150rpx" :error-type="['toast']" ref="uForm">
 				<u-form-item label="货位号" required prop="shelfPlaceCode">
-					<u-input v-model="form.shelfPlaceCode" @input="placeCodeBlur" :maxlength="30" placeholder="请输入货位号(首字母+数字)格式"/>
+					<u-input v-model="form.shelfPlaceCode" border @input="placeCodeBlur" :maxlength="6" placeholder="请输入货位号(首字母+数字)格式"/>
 				</u-form-item>
 				<u-form-item label="绑定产品" v-show="type=='add'">
 					<view style="flex-grow: 1;" v-if="productEntity&&productEntity.code" @click="toBindProduct">
@@ -30,13 +30,13 @@
 					</view>
 				</u-form-item>
 				<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-input clearable type="number" border :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-input clearable type="number" :min="0" @input="numberToFixed('cost',2,999999)" v-model="form.cost" placeholder="请输入结算价,最多两位小数"/>
+					<u-input clearable type="number" border :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-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 label="最大库容(件)" label-width="180rpx"  v-if="productEntity" required prop="maxQty">
+					<u-number-box :min="0" :max="999999" positive-integer v-model="form.maxQty" color="#000" bg-color="#f8f8f8" size="30" :input-height="60" :input-width="150"></u-number-box>
 				</u-form-item>
 			</u-form>
 		</view>

+ 22 - 6
pages/shelfSetting/editShelfHw.vue

@@ -10,7 +10,10 @@
 		</u-navbar>
 		<view class="form-body">
 			<u-form :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
-				<u-form-item label="货位号">
+				<u-form-item label="货位号" required prop="shelfPlaceCode" v-if="productEntity">
+					<u-input v-model="form.shelfPlaceCode" @input="placeCodeBlur" border :maxlength="6" placeholder="请输入货位号(首字母+数字)格式"/>
+				</u-form-item>
+				<u-form-item label="货位号" v-else>
 					<view class="flex align_center flex_1 justify_between">
 						<view style="width: 80%;">{{shelfPlaceCode}}</view>
 						<view style="width: 20%;text-align: center;" @click="editShelf"><u-icon name='edit-pen'></u-icon>修改</view>
@@ -43,13 +46,13 @@
 						</view>
 					</u-form-item>
 					<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-input clearable type="number" border :min="0" @input="numberToFixed('price',2,999999)" v-model="form.price" placeholder="请输入销售价,最多两位小数"/>
 					</u-form-item>
 					<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-input clearable type="number" border :min="0" @input="numberToFixed('cost',2,999999)" v-model="form.cost" placeholder="请输入结算价,最多两位小数"/>
 					</u-form-item>
 					<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-number-box :min="0" :max="999999" positive-integer v-model="form.maxQty" color="#000" bg-color="#f8f8f8" size="30" :input-height="60" :input-width="150"></u-number-box>
 					</u-form-item>
 				</view>
 				<view class="noproduct" v-else  @click="toBindProduct">
@@ -83,6 +86,13 @@
 					maxQty: 1, //  最大库容
 				},
 				rules: {
+					shelfPlaceCode:[
+						{ required: true, message: '请输入货位号', trigger: 'change' },
+						{
+							pattern: /^[a-zA-Z]{1}[0-9]{1,5}$/g,
+							message: '必须字母开头且后面紧跟数字,最多6位'
+						}
+					],
 					productSn: [{ required: true, message: '请选择绑定产品', trigger: 'change' }],
 					price: [{ required: true,type:'number', message: '请输入销售价', trigger: 'change' }],
 					cost: [{ required: true,type:'number', message: '请输入结算价', trigger: 'change' }],
@@ -108,7 +118,7 @@
 			this.shelfSn = this.nowData.shelfSn
 			this.type = opts.type
 			this.shelfPlaceCode = this.nowData.shelfPlaceCode||''
-			console.log(this.nowData)
+			this.form.shelfPlaceCode = this.shelfPlaceCode
 			// 选在产品
 			uni.$on('addProductToHw',function(data){
 				console.log(data)
@@ -128,6 +138,7 @@
 			// 修改货位号成功
 			uni.$on('updateHwNo',(data)=>{
 				this.shelfPlaceCode = data
+				this.form.shelfPlaceCode = data
 			})
 			
 			if(this.type != 'bind'){
@@ -136,7 +147,6 @@
 			}
 		},
 		onUnload(){
-			console.log('-----')
 			uni.$off("addProductToHw")
 			uni.$off("updateHwNo")
 			this.$store.state.vuex_tempData = null
@@ -150,6 +160,11 @@
 					this.form[key] = ret < 0 ? 0 : ret
 				})
 			},
+			placeCodeBlur(v){
+				this.$nextTick(() => {
+					this.form.shelfPlaceCode = this.form.shelfPlaceCode.toLocaleUpperCase()
+				})
+			},
 			// 更换产品
 			toBindProduct(){
 				if(this.productEntity && this.productEntity.currQty){
@@ -290,6 +305,7 @@
 							 	icon: "none",
 							 	title: res.message
 							 })
+							 uni.$emit("updateHw",form.shelfPlaceCode)
 						     uni.navigateBack()
 						   }
 						    _this.loading = false

+ 3 - 1
pages/shelfSetting/shelfSet.vue

@@ -259,7 +259,9 @@
 				this.isLoad = true
 				this.saveShelf(data, 1)
 			})
-
+			uni.$on("updateHw",(data)=>{
+				this.updateHw()
+			})
 			// const win = uni.getWindowInfo()
 			// this.pleft = Math.floor(win.windowWidth * 0.3)
 			// this.ptop = Math.floor(win.windowHeight - 70)