lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
9cf294ee2e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1661845156873
+  "version": 1661926074453
 }

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -81,7 +81,7 @@
           <a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
           <a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>
           <a-button v-if="record.billState=='CANCEL'" size="small" type="link" class="button-error" @click.stop="handleDelete(record)">删除</a-button>
-          <a-button size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
+          <a-button v-if="record.billState!='CANCEL'&&record.billState!='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
         </template>
       </s-table>
       <!-- 确认 -->

+ 14 - 3
src/views/numsGoodsShelves/shelfSet/addHwModal.vue

@@ -18,7 +18,7 @@
         :wrapper-col="formItemLayout.wrapperCol">
         <a-form-model-item label="货架名称">{{ nowData&&nowData.shelfName || '--' }}</a-form-model-item>
         <a-form-model-item label="货位号" prop="shelfPlaceCode">
-          <a-input v-model="form.shelfPlaceCode" placeholder="请输入货位号"></a-input>
+          <a-input v-model="form.shelfPlaceCode" @input="placeCodeBlur" placeholder="请输入货位号(字母+数字格式)"></a-input>
         </a-form-model-item>
         <a-form-model-item label="绑定产品" v-if="type=='add'">
           <productJqList ref="productJqList" :params="{customerSn:nowData&&nowData.customerSn}" @change="productJqChange"></productJqList>
@@ -118,7 +118,13 @@ export default {
         maxQty: ''
       },
       rules: {
-        shelfPlaceCode: [{ required: true, message: '请输入货位号', trigger: 'blur' }],
+        shelfPlaceCode: [
+          { required: true, message: '请输入货位号', trigger: 'blur' },
+          {
+          	pattern: /^[a-zA-Z]{1}[0-9]{1,29}$/g,
+          	message: '必需字母开头且后面紧跟数字'
+          }
+        ],
         price: [{ required: true, message: '请输入销售价', trigger: 'blur' }],
         cost: [{ required: true, message: '请输入结算价', trigger: 'blur' }],
         maxQty: [{ required: true, message: '请输入最大库容', trigger: 'blur' }]
@@ -146,6 +152,11 @@ export default {
       this.form.cost = obj && obj.row && obj.row.cost || ''
       this.productName = obj && obj.row && obj.row.name || ''
     },
+    placeCodeBlur (v) {
+    	this.$nextTick(() => {
+    		this.form.shelfPlaceCode = this.form.shelfPlaceCode.toLocaleUpperCase()
+    	})
+    },
     //  保存
     handleSave () {
       const _this = this
@@ -154,7 +165,7 @@ export default {
           const params = {}
           const form = JSON.parse(JSON.stringify(_this.form))
           params.shelfSn = _this.nowData && _this.nowData.shelfSn
-          params.shelfPlaceCode = form.shelfPlaceCode
+          params.shelfPlaceCode = form.shelfPlaceCode.toLocaleUpperCase()
           if (this.type == 'edit') {
             params.id = this.nowData.id
           }

+ 16 - 28
src/views/numsGoodsShelves/shelfSet/bindProductModal.vue

@@ -27,36 +27,24 @@
           <span v-if="form.productSn">{{ productName || '--' }}</span>
         </a-form-model-item>
         <a-form-model-item label="销售价" prop="price">
-          <a-row>
-            <a-col :span="20">
-              <a-input-number
-                id="shelfSet-bindProduct-price"
-                v-model="form.price"
-                :precision="2"
-                :min="0.01"
-                :max="999999"
-                placeholder="请输入正数(最多允许两位小数)"
-                suffix="元"
-                style="width: 100%;display: inline-block;" />
-            </a-col>
-            <a-col :span="4"><span style="margin-left: 10px;">元</span></a-col>
-          </a-row>
+          <a-input-number
+            id="shelfSet-bindProduct-price"
+            v-model="form.price"
+            :precision="2"
+            :min="0.01"
+            :max="999999"
+            placeholder="请输入销售价(最多允许两位小数)"
+            style="width: 80%;display: inline-block;" /> 元
         </a-form-model-item>
         <a-form-model-item label="结算价" prop="cost">
-          <a-row>
-            <a-col :span="20">
-              <a-input-number
-                id="shelfSet-bindProduct-cost"
-                v-model="form.cost"
-                :precision="2"
-                :min="0"
-                :max="999999"
-                placeholder="请输入正数(最多允许两位小数)"
-                suffix="元"
-                style="width: 100%;display: inline-block;" />
-            </a-col>
-            <a-col :span="4"><span style="margin-left: 10px;">元</span></a-col>
-          </a-row>
+          <a-input-number
+            id="shelfSet-bindProduct-cost"
+            v-model="form.cost"
+            :precision="2"
+            :min="0"
+            :max="999999"
+            placeholder="请输入结算价(最多允许两位小数)"
+            style="width: 80%;display: inline-block;" /> 元
         </a-form-model-item>
         <a-form-model-item label="最大库容" prop="maxQty">
           <a-input-number