Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionPlanDetail.vue

@@ -31,11 +31,24 @@
   export default {
     name: "inspectionPlanDetail",
     data() {
-      var validateTime = (rule, value, callback) => {
+      var validateStart = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入计划开始时间'));
+        } else if(this.form.endTime !== null && this.form.endTime !== '') {
+          if(value > this.form.endTime) {
+            callback(new Error('输入的计划起始时间大于计划终了时间'));
+          }
+        } else {
+          callback();
+        }
+      };
+      var validateEnd = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入计划终了时间'));
-        } else if(this.form.startTime > value) {
+        } else if(this.form.startTime !== null && this.form.startTime !== '') {
-          callback(new Error('输入的计划起始时间大于计划终了时间'));
+          if(this.form.startTime > value) {
+            callback(new Error('输入的计划终了时间小于计划起始时间'));
+          }
         } else {
           callback();
         }
@@ -105,11 +118,7 @@
               labelWidth: 120,
               format: 'yyyy年MM月dd日',
               valueFormat: "yyyyMMdd",
-              rules: [{
+              rules: [{required: true, validator: validateStart, trigger: 'blur' }]
-                required: true,
-                message: "请输入计划起始时间",
-                trigger: "blur"
-              }]
             },
             {
               label: "计划终了时间",
@@ -119,7 +128,7 @@
               labelWidth: 120,
               format: 'yyyy年MM月dd日',
               valueFormat: "yyyyMMdd",
-              rules: [{required: true, validator: validateTime, trigger: 'blur' }]
+              rules: [{required: true, validator: validateEnd, trigger: 'blur' }]
             },
             {
               label: "状态",

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: [{
+            rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
-              required: true,
-              message: "请输入任务开始日期",
-              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/equipmentledgerDetail.vue

@@ -614,6 +614,8 @@
             {
               label: "页数",
               prop: "page",
+              type: 'number',
+              step: 1,
               span: 20,
               rules: [{
                 required: true,

src/views/leger/toolinventoryrecordDetail.vue

@@ -552,6 +552,8 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
+            type: 'number',
+            step: 1,
             rules: [{
               required: true,
               message: "请输入页数",

src/views/release/productioninformation.vue

@@ -31,35 +31,40 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_add"
                    @click="$refs.crud.rowAdd()">新增</el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_release"
                    @click="handleRelease">发布
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_stop"
                    @click="handleStop">停用
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.productioninformation_audit"
                    @click="handleAuditing">批量审核
         </el-button>
       </template>
       <template #menu="{row,index,size}">
         <el-button type="text" size="small"
-                   @click="$refs.crud.rowEdit(row,index)">编辑</el-button>
+                   @click="$refs.crud.rowEdit(row,index)" v-if="permission.productioninformation_edit">修改</el-button>
         <el-button type="text" size="small"
-                   @click="$refs.crud.rowDel(row,index)">删除</el-button>
+                   @click="$refs.crud.rowDel(row,index)" v-if="permission.productioninformation_delete">删除</el-button>
-        <el-button @click="auditing(row,index)" type="text" size="small" plain>审核</el-button>
+        <el-button @click="auditing(row,index)" type="text" size="small" plain v-if="permission.productioninformation_audit">审核</el-button>
-        <el-button @click="reject(row,index)" type="text" size="small" plain >驳回</el-button>
+        <el-button @click="reject(row,index)" type="text" size="small" plain v-if="permission.productioninformation_reject">驳回</el-button>
       </template>
     </avue-crud>
   </basic-container>

src/views/smart/operationticket.vue

@@ -32,29 +32,33 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_add"
                    @click="handleDetailAdd">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_reject"
                    @click="handleReject">批量驳回
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_audit"
                    @click="handleAuditing">批量审核
         </el-button>
 
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_export"
                    @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
+        <el-button @click="handleDetailSearch(row,index)" v-if="permission.operationticket_view" type="text">查看</el-button>
-        <el-button @click="handleDetailcls(row,index)" type="text">关票</el-button>
+        <el-button @click="handleDetailcls(row,index)"  v-if="permission.operationticket_close" type="text">关票</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="rowDel(row)" v-if="permission.operationticket_delete" type="text">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="关票提醒"

src/views/smart/operationticketDetail.vue

@@ -43,6 +43,7 @@
         <el-button type="primary"
                    size="small"
                    plain
+                   v-if="permission.operationticket_add"
                    @click="addrow">新增</el-button>
             </template>
           </avue-crud>
@@ -63,27 +64,27 @@
          <el-button type="primary"
                     size="small"
                     @click="handleDetailcls"
-                    v-if="shouldShowButton">
+                    v-if="shouldShowButton && permission.operationticket_close">
                      关票</el-button>
           <el-button type="primary"
                      size="small"
                      @click="auditing"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton  && permission.operationticket_audit">
                      审核</el-button>
           <el-button type="primary"
                      size="small"
                      @click="reject"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_reject">
                      驳回</el-button>
           <el-button type="primary"
                      size="small"
                      @click="searchToUpdate"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_edit">
                       修改</el-button>
           <el-button type="primary"
                      size="small"
                      @click="del"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.operationticket_delete">
                      删除</el-button>
        </span>
     </div>