Merge remote-tracking branch 'origin/master' into cqtyt-master

src/views/hisStore/express/index.vue

@@ -23,7 +23,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['store:express:add']"
+          v-hasPermi="['his:express:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -33,7 +33,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['store:express:edit']"
+          v-hasPermi="['his:express:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,7 +43,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['store:express:remove']"
+          v-hasPermi="['his:express:remove']"
         >删除</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -63,21 +63,21 @@
             type="text"
             icon="el-icon-edit"
             @click="handleAllot(scope.row)"
-            v-hasPermi="['store:express:allot']"
+            v-hasPermi="['his:express:allot']"
           >分配公司</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['store:express:edit']"
+            v-hasPermi="['his:express:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['store:express:remove']"
+            v-hasPermi="['his:express:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/hisStore/storeProduct/index.vue

@@ -1163,9 +1163,9 @@ export default {
         precautions: [
           { required: true, message: "注意事项不能为空", trigger: "blur" }
         ],
-        storeId :[
-          { required: true, message: "所属店铺不能为空", trigger: "blur"}
-        ],
+        // storeId :[
+        //   { required: true, message: "所属店铺不能为空", trigger: "blur"}
+        // ],
       }
     };
   },
@@ -1215,7 +1215,7 @@ export default {
       const option = this.isShowOptions.find(item => item.dictValue == row.isShow);
       return option ? option.dictLabel : '未知状态';
     },
-    
+
     getStatusType(row) {
       console.log(row)
       if (row.isAudit == 0) {