瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
2ecf8a7518
共有 2 個文件被更改,包括 9 次插入4 次删除
  1. 1 1
      pages/replenishmentManage/replenishmentList.vue
  2. 8 3
      pages/shelfSetting/addShelfHw.vue

+ 1 - 1
pages/replenishmentManage/replenishmentList.vue

@@ -28,7 +28,7 @@
 						</view>
 						<view class="ptools flex align_center justify_between">
 							<view><text>{{item.createDate}}</text></view>
-							<view class="print" @click.stop="print(item)">
+							<view class="print" v-if="item.billState!='CANCEL'&&item.billState!='WAIT_CONFIRM'" @click.stop="print(item)">
 								<u-image :src="`/static/${$config('themePath')}/icon_printer@3x.png`" width="48" height="48"></u-image>
 							</view>
 						</view>

+ 8 - 3
pages/shelfSetting/addShelfHw.vue

@@ -3,7 +3,7 @@
 		<view class="form-body">
 			<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="请输入货位号(大写字母+数字的格式)"/>
+					<u-input focus v-model="form.shelfPlaceCode" @input="placeCodeBlur" :maxlength="30" placeholder="请输入货位号(字母+数字的格式)"/>
 				</u-form-item>
 				<u-form-item label="绑定产品" v-show="type=='add'">
 					<view style="flex-grow: 1;" v-if="productEntity&&productEntity.code" @click="toBindProduct">
@@ -64,8 +64,8 @@
 					shelfPlaceCode:[
 						{ required: true, message: '请输入货位号', trigger: 'change' },
 						{
-							pattern: /^[A-Z]{1}[0-9]{1,29}$/g,
-							message: '必需大写字母开头且后面紧跟数字'
+							pattern: /^[a-zA-Z]{1}[0-9]{1,29}$/g,
+							message: '必需字母开头且后面紧跟数字'
 						}
 					],
 					price: [{ required: true,type:'number', message: '请输入销售价', trigger: 'change' }],
@@ -120,6 +120,11 @@
 					this.form[key] = ret < 0 ? 0 : ret
 				})
 			},
+			placeCodeBlur(v){
+				this.$nextTick(() => {
+					this.form.shelfPlaceCode = this.form.shelfPlaceCode.toLocaleUpperCase()
+				})
+			},
 			// 解除绑定
 			clearBind(){
 				this.productEntity = null