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/inspectiontasks.vue

@@ -109,6 +109,10 @@
           callback(new Error('请输入任务执行开始时间'));
         } else if(this.currStartDate > value.replaceAll('/','').slice(0, 8)) {
           callback(new Error('输入的任务执行开始时间小于任务开始日期'));
+        }else if(this.resultForm.executeEndDate !== '' && this.resultForm.executeEndDate !== null) {
+          if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) {
+            callback(new Error('输入的任务执行开始时间大于任务执行结束时间'));
+          }
         } else {
           callback();
         }

src/views/inspection/inspectiontasksDetail.vue

@@ -52,7 +52,18 @@ import request from "@/router/axios";
 export default {
   name: "inspectiontasksDetail",
   data () {
-    var validateTime = (rule, value, callback) => {
+    var validateStartTime = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入任务开始日期'));
+      } else if(this.information_form.taskEndDate !== '' && this.information_form.taskEndDate !== null) {
+        if(this.information_form.taskEndDate < value) {
+          callback(new Error('输入的任务开始日期大于任务完成日期'));
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateEndTime = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入任务完成日期'));
       } else if(this.information_form.taskStartDate > value) {
@@ -132,11 +143,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{
-              required: true,
-              message: "请输入任务开始日期",
-              trigger: "blur"
-            }]
+            rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
           },
           {
             label: "任务完成日期",
@@ -146,7 +153,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+            rules: [{required: true, validator: validateEndTime, trigger: 'blur' }]
           },
           {
             label: "对象编号",

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 () {
     return {
       checkStatusValue:{},

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>