Parcourir la source

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop

chenrui il y a 3 ans
Parent
commit
cae4e9f3b2

+ 1 - 0
src/views/productManagement/productInfo/detailModal.vue

@@ -23,6 +23,7 @@
           {{ detailsData&&detailsData.packQtyUnit || '--' }}
         </a-descriptions-item>
         <a-descriptions-item label="箭冠产品:">{{ detailsData&&detailsData.arrowFalgDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="条形码:" :span="2">{{ detailsData&&detailsData.qrCode || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品图片:" :span="2">
           <div style="display: flex;">
             <p class="pic-box" v-for="(item,index) in fileList" :key="index">

+ 23 - 0
src/views/productManagement/productInfo/edit.vue

@@ -127,6 +127,16 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+              <a-form-model-item label="条形码" prop="qrCode">
+                <a-input
+                  id="productInfoEdit-qrCode"
+                  :maxLength="50"
+                  v-model.trim="form.qrCode"
+                  placeholder="请输入条形码(最多50个字符)"
+                  allowClear />
+              </a-form-model-item>
+            </a-col>
           </a-row>
           <a-row>
             <a-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
@@ -239,6 +249,7 @@ export default {
         packQty: '', // 包装数
         packQtyUnit: undefined, // 包装数单位
         arrowFalg: undefined, // 是否箭冠产品
+        qrCode: '',
         productMsg: '', //  产品图片
         size: '', // 产品尺寸
         weight: '', // 产品重量
@@ -268,6 +279,10 @@ export default {
         // ],
         arrowFalg: [
           { required: true, message: '请选择是否为箭冠产品', trigger: 'change' }
+        ],
+        qrCode: [
+          { required: false, message: '请输入条形码', trigger: 'blur' },
+          { validator: this.validateQrCode }
         ]
       },
       productBrandList: [], //  品牌下拉数据
@@ -351,6 +366,14 @@ export default {
     changeImage (file) {
       this.form.productMsg = file
     },
+    validateQrCode (rule, value, callback) {
+      const reg = /^[0-9a-zA-Z]+$/
+      if (value && !reg.test(value)) {
+        callback('条形码由大小写英文字母和数字组成')
+      } else {
+        callback()
+      }
+    },
     // 产品说明 文本编辑器
     editorDescriptionChange (html, text) {
       this.form.description = html