Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/basicdata/corps/index.vue

@@ -279,6 +279,7 @@
             v-model="scope.row.fStatus"
             active-value="0"
             inactive-value="1"
+            v-hasPermi="['basicdata:corps:edit']"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
@@ -1422,4 +1423,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/basicdata/fleet/carManage-add-or-update.vue

@@ -600,9 +600,9 @@
       </el-form>
     </el-collapse>
     <span slot="footer" class="dialog-footer">
-      <el-button type="info" @click="handleUpdata" v-if="hide">修改</el-button>
+      <el-button type="info" @click="handleUpdata" v-hasPermi="['fleet:carManage:edit']" v-if="hide">修改</el-button>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit"
+      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit" v-hasPermi="['fleet:carManage:edit']"
         >确定</el-button
       >
     </span>

src/views/basicdata/fleet/carManage.vue

@@ -17,8 +17,8 @@
         <!--        车辆管理添加驾驶员-->
         <!--车队可以加车辆-->
         <!--        个人照片改成身份证-->
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()"
+        <el-button @click="getDataList()" v-hasPermi="['fleet:carManage:query']">查询</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle()" v-hasPermi="['fleet:carManage:add']"
           >添加车辆</el-button
         >
         <!--        <el-button v-if="isAuth('fleet:carManage:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
@@ -334,6 +334,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['fleet:carManage:query']"
             @click="addOrUpdateHandle(scope.row)"
             >查看
           </el-button>
@@ -341,6 +342,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-hasPermi="['fleet:carManage:remove']"
             @click="deleteHandle(scope.row.Id)"
             >删除
           </el-button>
@@ -537,4 +539,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -251,10 +251,10 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="info" @click="handleUpdata" v-if="hide">修改</el-button>
+      <el-button type="info" @click="handleUpdata" v-hasPermi="['basicdata:corps:edit']" v-if="hide">修改</el-button>
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" :disabled="doNot"
-        >确定</el-button
+      <el-button type="primary" @click="dataFormSubmit()" :disabled="doNot" v-hasPermi="['basicdata:corps:edit']"
+      >确定</el-button
       >
     </span>
   </el-dialog>

src/views/basicdata/fleet/companyMsg.vue

@@ -20,6 +20,7 @@
             type="primary"
             icon="el-icon-plus"
             size="mini"
+            v-hasPermi="['basicdata:corps:add']"
             @click="addOrUpdateHandle()"
           >新增
           </el-button>
@@ -168,6 +169,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['basicdata:corps:query']"
             @click="addOrUpdateHandle(scope.row)"
           >查看
           </el-button>
@@ -175,6 +177,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-hasPermi="['basicdata:corps:remove']"
             @click="deleteHandle(scope.row.fId)"
           >删除
           </el-button>
@@ -379,4 +382,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/basicdata/fleet/driverMsg-add-or-update.vue

@@ -202,9 +202,9 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="info" @click="handleUpdata" v-if="hide">修改</el-button>
+      <el-button type="info" @click="handleUpdata" v-if="hide" v-hasPermi="['basicdata:corps:edit']">修改</el-button>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit()"
+      <el-button type="primary" :disabled="doNot" @click="dataFormSubmit()" v-hasPermi="['basicdata:corps:edit']"
         >确定</el-button
       >
     </span>

src/views/basicdata/fleet/driverMsg.vue

@@ -12,8 +12,7 @@
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
         <el-button
-          type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <!--        <el-button v-if="isAuth('fleet:driverMsg:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
+          type="primary" @click="addOrUpdateHandle()" v-hasPermi="['basicdata:corps:add']">新增</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -143,6 +142,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['basicdata:corps:list']"
             @click="addOrUpdateHandle(scope.row)"
           >查看
           </el-button>
@@ -150,6 +150,7 @@
               type="text"
               icon="el-icon-delete"
               size="mini"
+              v-hasPermi="['basicdata:corps:remove']"
               circle @click="deleteHandle(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
@@ -332,4 +333,4 @@ import draggable from "vuedraggable";
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>s
+</style>s

src/views/basicdata/goods/index.vue

@@ -305,6 +305,7 @@
             v-model="scope.row.fStatus"
             active-value="0"
             inactive-value="1"
+            v-hasPermi="['basicdata:goods:edit']"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
@@ -1030,4 +1031,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>