bug修改

src/views/basicSetting/store.vue

@@ -128,7 +128,7 @@ export default {
         storeCode: [
           { required: true, message: "门店编号不能为空", trigger: "blur" },
           { min: 11, max: 11, message: "门店编号必须为11位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{12,}$/, message: "门店编号必须为11位字母加数字", trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "门店编号必须为11位字母加数字", trigger: "blur" }
         ],
         storeName: [{ required: true, message: '门店名称不能为空', trigger: 'blur' }],
         contactsId: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],

src/views/basicSetting/warehouse.vue

@@ -125,7 +125,7 @@ export default {
         warehouseCode: [
           { required: true, message: "仓库编号不能为空", trigger: "blur" },
           { min: 11, max: 11, message: "仓库编号必须为11位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{12,}$/, message: "仓库编号必须为11位字母加数字", trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "仓库编号必须为11位字母加数字", trigger: "blur" }
         ],
         warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
         adminId: [{ required: true, message: '管理员不能为空', trigger: 'blur' }],

src/views/customer/business.vue

@@ -134,7 +134,7 @@ export default {
         customerCode: [
           { required: true, message: "企业编号不能为空", trigger: "blur" },
           { min: 6, max: 6, message: "企业编号必须为6位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{7,}$/, message: "企业编号必须为6位字母加数字", trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "企业编号必须为6位字母加数字", trigger: "blur" }
         ],
         companyName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
         contactsName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],

src/views/customer/distributor.vue

@@ -173,7 +173,7 @@ export default {
         customerCode: [
           { required: true, message: "分销商编号不能为空", trigger: "blur" },
           { min: 7, max: 7, message: "分销商编号必须为7位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/, message: "分销商编号必须为7位字母加数字", trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{7,}$/, message: "分销商编号必须为7位字母加数字", trigger: "blur" }
         ],
         companyName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
         companyLevel: [{ required: true, message: '请选择合同开始日期', trigger: 'blur' }],

src/views/customer/guest.vue

@@ -132,7 +132,7 @@ export default {
         customerCode: [
           { required: true, message: "散客编号不能为空", trigger: "blur" },
           { min: 6, max: 6, message: "散客编号必须为7位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{7,}$/, message: "散客编号必须为6位字母加数字", trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "散客编号必须为6位字母加数字", trigger: "blur" }
         ],
         customerName: [{ required: true, message: '散客姓名不能为空', trigger: 'blur' }],
       },

src/views/goodsManage/goodsList.vue

@@ -317,7 +317,7 @@ export default {
                 productCode: [
                     { required: true, message: "请填写商品编号", trigger: "blur" },
                     { min: 14, max: 14, message: "商品编号必须为14位", trigger: "blur" },
-                    { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{15,}$/, message: "商品编号必须为14位字母加数字", trigger: "blur" }
+                    { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{14,}$/, message: "商品编号必须为14位字母加数字", trigger: "blur" }
                 ],
                 categoryId: [{ required: true, message: "请选择商品类别", trigger: "blur" }],
                 price: [

src/views/goodsManage/goodsTypeList.vue

@@ -158,7 +158,7 @@
           categoryCode: [
             { required: true, message: "商品类别编号不能为空", trigger: "blur" },
             { min: 10, max: 10, message: "商品类别编号必须为10位", trigger: "blur" },
-            { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "商品类别编号必须为10位字母加数字", trigger: "blur" }
+            { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{10,}$/, message: "商品类别编号必须为10位字母加数字", trigger: "blur" }
           ]
         }
       };

src/views/stock/breakage/breakage.vue

@@ -16,6 +16,10 @@
           <el-option :key="item.loginId" v-for="item in userSelsctList" :label="item.deptName+'_'+item.userName" :value="item.loginId">
           </el-option>
       </el-select>
+      <el-select v-model="listQuery.isRunFinish" clearable placeholder="请选择状态" class="filter-item" style="width: 200px">
+        <el-option :key="item.type" v-for="item in typeList" :label="item.name" :value="item.type">
+        </el-option>
+      </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button class="filter-item" v-waves icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-plus">添加</el-button>
@@ -44,11 +48,18 @@
       </el-table-column>
       <el-table-column align="center" min-width="100px" label="经手人" prop="addHandlerName">
       </el-table-column>
+      <el-table-column align="center" min-width="100px" label="报损状态">
+        <template slot-scope="props">
+            <span v-if="props.row.isRunFinish == '0'" style="color: #67C23A;font-weight: bold;">已报损</span>
+            <span v-if="props.row.isRunFinish == '1'" style="color: #E6A23C;font-weight: bold;">待报损</span>
+          </template>
+      </el-table-column>
       <el-table-column align="center" min-width="200px" label="报损原因" prop="remarks">
       </el-table-column>
       <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button  type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button v-if="scope.row.isRunFinish == '1'" type="success" size="small" @click="handleExecute(scope.row)">报损</el-button>
+          <el-button v-if="scope.row.isRunFinish == '1'" type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
           <el-button v-if="scope.row.isRunFinish == '1'" type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -73,6 +84,16 @@ export default {
   directives: { waves },
   data() {
     return {
+      typeList: [
+        {
+          type: '0',
+          name: "已报损",
+        },
+        {
+          type: '1',
+          name: "待报损",
+        },
+      ],
       warehouseList: [],
       userSelsctList:[],
       list: [
@@ -89,6 +110,7 @@ export default {
         endDate: '',
         warehouseId: '',
         addHandlerId: '',
+        isRunFinish: '',
       },
     }
   },
@@ -119,6 +141,7 @@ export default {
         endDate: '',
         warehouseId: '',
         addHandlerId: '',
+        isRunFinish: '',
       },
         this.getList()
     },