Merge remote-tracking branch 'origin/main'

src/router/views/index.js

@@ -180,5 +180,19 @@ export default [{
         import( /* webpackChunkName: "views" */ '@/views/smart/operationticketDetail')
     }]
   },
+  {
+    path: '/leger',
+    component: Layout,
+    redirect: '/leger/index',
+    children: [{
+      path: 'dynamicledgerDetail',
+      name: '动态台账详情',
+      meta: {
+        menu: false
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/leger/dynamicledgerDetail')
+    }]
+  },
 
   ]

src/views/inspection/inspectionPlanDetail.vue

@@ -38,9 +38,8 @@
           if(value > this.form.endTime) {
             callback(new Error('输入的计划起始时间大于计划终了时间'));
           }
-        } else {
-          callback();
         }
+        callback();
       };
       var validateEnd = (rule, value, callback) => {
         if (value === '') {
@@ -49,9 +48,8 @@
           if(this.form.startTime > value) {
             callback(new Error('输入的计划终了时间小于计划起始时间'));
           }
-        } else {
-          callback();
         }
+        callback();
       };
       return {
         addUpdateShowButton:{},

src/views/inspection/inspectiontasks.vue

@@ -21,7 +21,6 @@
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
-                   icon="el-icon-delete"
                    plain
                    v-if="permission.inspectiontasks_delete"
                    @click="handleDelete">批量删除
@@ -113,18 +112,18 @@
           if(this.resultForm.executeEndDate.trim().replaceAll('/','') < value.trim().replaceAll('/','')) {
             callback(new Error('输入的任务执行开始时间大于任务执行结束时间'));
           }
-        } else {
-          callback();
         }
+          callback();
+
       };
       var validateEndTime = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入任务执行结束时间'));
         } else if(this.resultForm.executeStartDate.trim().replaceAll('/','') >= value.trim().replaceAll('/','')) {
           callback(new Error('输入的任务执行结束时间小于任务执行开始时间'));
-        } else {
-          callback();
         }
+          callback();
+
       };
       return {
         form: {},
@@ -147,6 +146,7 @@
           calcHeight: 210,
           searchShow: true,
           searchMenuSpan: 6,
+          align: 'center',
           tip: false,
           border: true,
           index: false,
@@ -656,7 +656,7 @@
 
 <style>
 .header-class{
-  background-color: #3366cc !important;
+  background-color: #243970 !important;
   color: #FFFFFF !important;
 }
 </style>

src/views/inspection/inspectiontasksDetail.vue

@@ -59,18 +59,16 @@ export default {
         if(this.information_form.taskEndDate < value) {
           callback(new Error('输入的任务开始日期大于任务完成日期'));
         }
-      } else {
-        callback();
       }
+        callback();
     };
     var validateEndTime = (rule, value, callback) => {
-      if (value === '') {
+      if (!value) {
         callback(new Error('请输入任务完成日期'));
       } else if(this.information_form.taskStartDate > value) {
         callback(new Error('输入的任务开始日期大于任务完成日期'));
-      } else {
-        callback();
       }
+        callback();
     };
     return {
       information_class: '',
@@ -143,7 +141,7 @@ export default {
             labelWidth: 120,
             format: 'yyyy年MM月dd日',
             valueFormat: "yyyyMMdd",
-            rules: [{required: true, validator: validateStartTime, trigger: 'blur' }]
+            rules: [{required: true, validator: validateStartTime, trigger: 'change' }]
           },
           {
             label: "任务完成日期",
@@ -513,7 +511,7 @@ export default {
 </script>
 <style>
 .header-class{
-  background-color: #3366cc !important;
+  background-color: #243970 !important;
   color: #FFFFFF !important;
 }
 .information_class .el-input__inner,

src/views/leger/equipmentledger.vue

@@ -562,8 +562,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           path: "/leger/equipmentledgerDetail",
           query: {
             frameMode:"search",
-            id: row.id,
+            id: row.id
-            checkstatus: row.checkStatus
           },
         });
       },

src/views/leger/equipmentledgerDetail.vue

@@ -6,15 +6,7 @@
        <span >
         <el-col >
           审核状态:
-                     <avue-input v-model="form" placeholder="" class="frame_class1" style = "width: 100px"></avue-input>
+             <avue-input v-model="form" placeholder="" class="frame_class1" style = "width: 100px"></avue-input>
-<!--          <el-select v-model="checkStatusValue">-->
-<!--            <el-option-->
-<!--              v-for="item in optionCheckStatus"-->
-<!--              :key="item.value"-->
-<!--              :label="item.label"-->
-<!--              :value="item.value">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
         </el-col>
         </span>
         </div>
@@ -141,20 +133,6 @@
         }
       };
       return {
-        checkStatusValue: this.$route.query.checkstatus,
-          optionCheckStatus: [{
-            value: 1,
-            label: '审核中'
-          }, {
-            value: 2,
-            label: '已审核'
-          }, {
-            value: 3,
-            label: '未通过'
-          }, {
-            value: 4,
-            label: ' '
-          }],
         frame_class: '',
         type: {},
         shouldShowButton:{},
@@ -698,7 +676,6 @@
         this.addUpdateShowButton=false;
         this.UpdateShowButton=true;
         this.frame_class = 'frame_class1';
-        this.checkStatusValue = this.$route.query.checkstatus;
         this.SearchDetail();
       }else{
         this.readonlyForm=false;
@@ -706,20 +683,6 @@
         this.UpdateShowButton=false;
         this.addUpdateShowButton=true;
         this.frame_class = null;
-        this.checkStatusValue = 4;
-      }
-      switch (this.$route.query.checkstatus){
-        case 1:
-          this.form = "审核中";
-          break;
-        case 2:
-          this.form = "已审核";
-          break;
-        case 3:
-          this.form = "未通过";
-          break;
-        default:
-          this.form =" ";
       }
     },
     methods: {
@@ -921,6 +884,19 @@
         getDetail(this.$route.query.id).then(res => {
           console.log(res);
           this.tab1_form = res.data.data;
+          switch (this.tab1_form.checkStatus){
+            case 1:
+              this.form = "审核中";
+              break;
+            case 2:
+              this.form = "已审核";
+              break;
+            case 3:
+              this.form = "未通过";
+              break;
+            default:
+              this.form =" ";
+          }
         });
       },
       auditing() {

src/views/smart/operationticket.vue

@@ -651,7 +651,6 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
             frameMode:"search",
             id: row.id,
             operationTicketNo:row.operationTicketNo,
-            reviewStatus: row.reviewStatus
           },
         });
       },

src/views/smart/operationticketDetail.vue

@@ -51,7 +51,7 @@
       </span>
     <div class="container">
        <span >
-         <el-button type="text"
+         <el-button type="default"
                               size="large"
                               @click="back"
                               v-if="addUpdateShowButton">
@@ -130,6 +130,27 @@ import {Alert} from "element-ui";
 export default {
   name: "operationticketDetail",
   data () {
+
+    var validateStartTime = (rule, value, callback) => {
+      alert(value);
+      if (value === '' || value ===null) {
+        callback(new Error('请输入计划开始日期'));
+      } else if(this.tab1_form.plannedEndTime !== '' && this.tab1_form.plannedEndTime !== null) {
+        if(this.tab1_form.plannedEndTime < value) {
+           callback(new Error('输入的计划开始日期大于计划结束日期'));
+        }
+      }
+      callback();
+    };
+    var validateEndTime = (rule, value, callback) => {
+      alert(value);
+      if (value === '' || value ===null ) {
+        callback(new Error('请输入计划结束日期'));
+      } else if(this.tab1_form.plannedStartTime > value) {
+        callback(new Error('输入的计划结束日期小于计划开始日期'));
+      }
+       callback();
+    };
     return {
       // checkStatusValue: this.$route.query.reviewStatus,
       // optionCheckStatus: [{
@@ -339,25 +360,17 @@ export default {
               {
                 label: "计划开始时间",
                 prop: "plannedStartTime",
-                rules: [{
-                  required: true,
-                  message: "请输入计划开始时间",
-                  trigger: "blur"
-                }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
                 valueFormat: "yyyyMMddHH:mm:ss",
                 span: 8,
                 maxlength: 20,
+                rules: [{required: true,validator: validateStartTime, trigger: 'blur' }],
               },
               {
                 label: "计划结束时间",
                 prop: "plannedEndTime",
-                rules: [{
+                rules: [{ required: true,validator: validateEndTime, trigger: 'blur' }],
-                  required: true,
-                  message: "请输入计划结束时间",
-                  trigger: "blur"
-                }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
                 valueFormat: "yyyyMMddHH:mm:ss",
@@ -626,7 +639,7 @@ export default {
       this.shouldShowButton=false;
       this.addUpdateShowButton=true;
       this.addUpdateShowButton=true;
-      this.frame_class = null;
+      this.frame_class = "";
     }else{
       this.readonlyForm=false;
       this.shouldShowButton=true;
@@ -634,19 +647,6 @@ export default {
       this.frame_class = 'frame_class1';
       this.SearchDetail();
     }
-    switch (this.$route.query.reviewStatus){
-      case 1:
-        this.form = "审核中";
-        break;
-      case 2:
-        this.form = "已审核";
-        break;
-      case 3:
-        this.form = "未通过";
-        break;
-      default:
-        this.form =" ";
-    }
     // if(this.$route.query.reviewStatus ===1){
     //   this.form = "审核中";
     // }else if(this.$route.query.reviewStatus ===2){
@@ -659,17 +659,26 @@ export default {
   },
   methods: {
     handleFormSubmit() {
-      const form = this.$refs.tab1_form;
+      this.$refs.tab1_form.validate((valid, done, msg) => {
-      form.validate((valid) => {
         if (valid) {
+          done()
           this.Submit();
         } else {
-          this.$message({
+          console.log('error submit!!');
-            type: "warning",
+          return false;
-            message: "请输入必要信息!"
-          });
         }
       });
+      // const form = this.$refs.tab1_form;
+      // form.validate((valid) => {
+      //   if (valid) {
+      //     this.Submit();
+      //   } else {
+      //     this.$message({
+      //       type: "warning",
+      //       message: "请输入必要信息!"
+      //     });
+      //   }
+      // });
     },
     // 处理表单提交
     Submit() {
@@ -842,6 +851,19 @@ export default {
       getDetail(this.$route.query.id).then(res => {
         console.log(res);
         this.tab1_form = res.data.data;
+        switch (this.tab1_form.reviewStatus){
+          case 1:
+            this.form = "审核中";
+            break;
+          case 2:
+            this.form = "已审核";
+            break;
+          case 3:
+            this.form = "未通过";
+            break;
+          default:
+            this.form =" ";
+        }
       });
     },
     auditing() {

src/views/smart/workorder.vue

@@ -493,8 +493,7 @@
           path: "/workorder/detail",
           query: {
             frameMode:"search",
-            id: row.id,
+            id: row.id
-            checkstatus: row.approvalStatus
           },
         });
       },

src/views/smart/workorderDetail.vue

@@ -4,8 +4,9 @@
       <el-row :span="24">
         <div class="check_status_class">
        <span>
-        <el-col>
+        <el-col >
-          {{ getOptionCheckStatusLabel($route.query.checkstatus) }}
+          审核状态:
+             <avue-input v-model="form" placeholder="" class="frame_class1" style = "width: 100px"></avue-input>
         </el-col>
         </span>
         </div>
@@ -58,7 +59,6 @@
           value: 4,
           label: ''
         }],
-        checkStatusValue: this.$route.query.checkstatus,
         item_form: {},
         option: {
           column: [{
@@ -316,7 +316,6 @@
         this.shouldShowButton = false;
         this.addupdateShowButton = true;
         this.frame_class = null;
-        this.checkStatusValue = this.$route.query.checkstatus;
         this.searchDetail();
       } else if (this.$route.query.frameMode == "search") {
         this.tab1_option.column[1].disabled = false;
@@ -326,7 +325,6 @@
         this.addupdateShowButton = false;
         this.frame_class = 'frame_class1';
         this.searchDetail();
-        this.checkStatusValue = 4;
       }
     },
     methods: {
@@ -363,6 +361,19 @@
       searchDetail() {
         getDetail(this.$route.query.id).then(res => {
           this.tab1_form = res.data.data;
+          switch (this.tab1_form.approvalStatus){
+            case 1:
+              this.form = "审核中";
+              break;
+            case 2:
+              this.form = "已审核";
+              break;
+            case 3:
+              this.form = "未通过";
+              break;
+            default:
+              this.form =" ";
+          }
         });
       },
       submitForm() {

src/views/smart/workpermit.vue

@@ -435,7 +435,6 @@
           query: {
             frameMode:"search",
             id: row.id,
-            checkstatus: row.checkStatus,
             ticketCode:row.ticketCode
           },
         });

src/views/smart/workpermitDetail.vue

@@ -547,20 +547,6 @@
       create_date.display = false;
       const ticketCode = this.findObject(this.optionParam.column, "ticketCode");
       ticketCode.display = false;
-
-      switch (this.$route.query.checkstatus){
-        case 1:
-          this.form = "审核中";
-          break;
-        case 2:
-          this.form = "已审核";
-          break;
-        case 3:
-          this.form = "未通过";
-          break;
-        default:
-          this.form =" ";
-      }
     },
     methods: {
       handleFormSubmit() {
@@ -714,6 +700,19 @@
         getDetail(this.$route.query.id).then(res => {
           console.log(res);
           this.tab1_form = res.data.data;
+          switch (this.tab1_form.checkStatus){
+            case 1:
+              this.form = "审核中";
+              break;
+            case 2:
+              this.form = "已审核";
+              break;
+            case 3:
+              this.form = "未通过";
+              break;
+            default:
+              this.form =" ";
+          }
         });
       },
       closeTicket() {