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

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1484,7 +1484,7 @@ export default {
       this.carManages = response;
     });
     company({
-         fStatus:1
+      fStatus: 1,
     }).then((response) => {
       this.companyList = response.rows;
     });
@@ -1573,6 +1573,11 @@ export default {
         carcorPid: this.schedulingList[0].carcorPid,
       });
       this.showSure(this.schedulingList);
+      listFtmsorderbillss({
+        fleetCompanyId: this.schedulingList[0].carcorPid,
+      }).then((response) => {
+        this.carManages = response;
+      });
     },
     //删除行
     deleteRow(index, rows) {

src/views/warehouseCheck/index.vue

@@ -99,14 +99,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['warehouse:log:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouse:log:remove']"
           >删除</el-button>
         </template>
       </el-table-column>