Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionobject.vue

@@ -24,36 +24,39 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.inspectionroute_delete"
+                   v-if="permission.inspectionobject_delete"
                    @click="handleDelete">批量删除
         </el-button>
       </template>
       <template slot="menuRight">
         <el-button type="primary"
                    size="small"
-                   v-if="permission.inspectionroute_add"
+                   v-if="permission.inspectionobject_add"
                    plain
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_effect"
                    @click="handleTakeEffect">生效
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_lapse"
                    @click="handleLapse">失效
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.inspectionobject_export"
                    @click="handleExport">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button v-if="permission.inspectionroute_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button v-if="permission.inspectionroute_delete" @click="rowDel(row)" type="text">删除</el-button>
+        <el-button v-if="permission.inspectionobject_view" @click="handleDetailSearch(row,index)" type="text">查看</el-button>
+        <el-button v-if="permission.inspectionobject_delete" @click="rowDel(row)" type="text">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="失效"
@@ -232,7 +235,7 @@
       ...mapGetters(["permission"]),
       permissionList() {
           // this.option.column = this.option.column.filter(v => {
-          //     return this.permission['inspectionroute_col_' + v.prop]
+          //     return this.permission['inspectionobject_col_' + v.prop]
           // })
         return {
           addBtn: false,

src/views/inspection/inspectionobjectDetail.vue

@@ -9,14 +9,14 @@
     <div class="container">
        <span >
           <el-button type="primary"
-                     size="large"
+                     size="small"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.inspectionobject_add">
                      确定</el-button>
          <el-button type="primary"
                     size="small"
                     @click="seachToUpdate"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.inspectionobject_edit">
                       修改</el-button>
        </span>
     </div>
@@ -30,7 +30,7 @@ import {getToken} from "@/util/auth";
 import request from "@/router/axios";
 
 export default {
-  name: "inspectionrouteDetail",
+  name: "inspectionobjectDetail",
   data() {
     return {
       addUpdateShowButton:{},
@@ -233,7 +233,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList() {
       // this.option.column = this.option.column.filter(v => {
-      //     return this.permission['inspectionroute_col_' + v.prop]
+      //     return this.permission['inspectionobject_col_' + v.prop]
       // })
       return {
         addBtn: false,

src/views/inspection/inspectionplan.vue

@@ -320,7 +320,7 @@
           return;
         }
         this.cancelBox = true;
-        this.$refs.cancelForm.resetForm();
+        this.cancelForm.cancelReason = '';
       },
       handleDetailCancel() {
         this.$confirm("是否将选择数据改为失效状态?", {
@@ -332,7 +332,7 @@
             return lapse(this.ids, this.cancelForm.cancelReason);
           })
           .then(() => {
-            this.$refs.cancelForm.resetForm();
+            this.cancelForm.cancelReason = '';
             this.cancelBox = false;
             this.onLoad(this.page);
             this.$message({

src/views/inspection/inspectionroute.vue

@@ -302,7 +302,7 @@
           return;
         }
         this.cancelBox = true;
-        this.$refs.cancelForm.resetForm();
+        this.cancelForm.cancelReason = '';
       },
       handleDetailCancel() {
         this.$confirm("是否将选择数据改为失效状态?", {
@@ -314,7 +314,7 @@
             return lapse(this.ids, this.cancelForm.cancelReason);
           })
           .then(() => {
-            this.$refs.cancelForm.resetForm();
+            this.cancelForm.cancelReason = '';
             this.cancelBox = false;
             this.onLoad(this.page);
             this.$message({

src/views/leger/equipmentledger.vue

@@ -32,27 +32,31 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.equipmentledger_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.equipmentledger_view">查看详情</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.equipmentledger_delete">删除</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/leger/equipmentledgerDetail.vue

@@ -75,32 +75,32 @@
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.equipmentledger_add">
                      确定</el-button>
           <el-button type="text"
                      size="large"
                      @click="back"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton ">
                      取消</el-button>
           <el-button type="primary"
                      size="small"
                       @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.equipmentledger_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.equipmentledger_delete">
                      删除</el-button>
        </span>
     </div>

src/views/leger/toolinventoryrecord.vue

@@ -31,27 +31,31 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.toolinventoryrecord_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport">导出
+                   v-if="permission.toolinventoryrecord_export"
+                   @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.toolinventoryrecord_view">查看详情</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.toolinventoryrecord_delete">删除</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/leger/toolinventoryrecordDetail.vue

@@ -100,35 +100,35 @@
       </span>
     <div class="container">
        <span >
+          <el-button type="primary"
+                     size="large"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
+                     确定</el-button>
           <el-button type="text"
                      size="large"
                      @click="back"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton ">
                      取消</el-button>
-         <el-button type="primary"
-                     size="large"
-                     @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
-                     确定</el-button>
           <el-button type="primary"
                      size="small"
                      @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.toolinventoryrecord_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.toolinventoryrecord_delete">
                      删除</el-button>
        </span>
     </div>
@@ -173,7 +173,7 @@ import {readonly} from "vue";
 import {getToken} from "@/util/auth";
 import {getListByTaskNo} from "@/api/inspection/inspectionresult";
 export default {
-  name: "equipmentledgerDetail",
+  name: "toolinventoryrecordDetail",
   data () {
     var validatePage = (rule, value, callback) => {
       if (value === '') {

src/views/smart/operationticket.vue

@@ -70,9 +70,9 @@
       <div class="container">
          <span>
            <el-button type="primary"
-                                  size="small"
-                                  plain
-                                  @click="handleDetailCancel">取消
+                      size="small"
+                      plain
+                      @click="handleDetailCancel">取消
             </el-button>
             <el-button type="submit"
                        size="small"

src/views/smart/operationticketDetail.vue

@@ -51,7 +51,7 @@
       </span>
     <div class="container">
        <span >
-         <el-button type="primary"
+         <el-button type="text"
                               size="large"
                               @click="back"
                               v-if="addUpdateShowButton">
@@ -96,7 +96,7 @@
       </avue-form>
       <div class="container">
          <span>
-           <el-button type="primary"
+           <el-button type="text"
                       size="small"
                       plain
                       @click="handleDetailCancel">取消

src/views/smart/workpermit.vue

@@ -23,7 +23,7 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.equipmentledger_delete"
+                   v-if="permission.workpermit_delete"
                    @click="handleDelete">批量删除
         </el-button>
       </template>
@@ -31,28 +31,32 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_audit"
                    @click="handleAuditing">批量审核
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.workpermit_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看详情</el-button>
-        <el-button @click="handleCloseTicket(row)" type="text">关票</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.workpermit_view">查看详情</el-button>
+        <el-button @click="handleCloseTicket(row)" type="text" v-if="permission.workpermit_close">关票</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.workpermit_delete">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="关票提醒"

src/views/smart/workpermitDetail.vue

@@ -48,7 +48,7 @@
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.workpermit_add">
                      确定</el-button>
           <el-button type="text"
                      size="large"
@@ -58,27 +58,27 @@
          <el-button type="primary"
                     size="small"
                     @click="closeTicket"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.workpermit_close">
                     关票</el-button>
           <el-button type="primary"
                      size="small"
                       @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workpermit_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workpermit_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="UpdateShowButton">
+                     v-if="UpdateShowButton && permission.workpermit_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.workorder_delete">
                      删除</el-button>
        </span>
     </div>

src/views/spares/materialDetail.vue

@@ -442,6 +442,8 @@
     },
     methods: {
       test(val) {
+        this.diaForm.code = '';
+        this.diaForm.type = '';
         this.dialogVisible = true;
       },
       handleFormSubmit() {
@@ -630,7 +632,8 @@
           if (valid) {
             done()
             codeAdd(this.diaForm).then(() => {
-              this.$refs.diaForm.resetForm();
+              this.diaForm.code = '';
+              this.diaForm.type = '';
               this.dialogVisible = false;
               this.SearchClassCode();
               this.$message({