From 4d54276ce88615dd115bdf7351f34c5bcd66f7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Sat, 15 Jul 2023 10:05:38 +0800
Subject: [PATCH] =?UTF-8?q?2023-07-15=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamWorkPlanForCheck.vue | 23 +++++++++--
 .../modules/eam/eamWorkPlanForMaintenance.vue | 38 ++++++++++++++++---
 src/views/modules/qc/qcPartAttribute.vue      |  2 +-
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 848ee93..3ed9df0 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -150,8 +150,7 @@
             value-format="yyyy-MM-dd"
             format='yyyy-MM-dd'
             placeholder="必选"
-            :editable=false
-          >
+            :editable=false>
           </el-date-picker>
         </el-form-item>
         <el-form-item label="计划结束日期:" prop="planEndDate" :rules="rules.planEndDateType">
@@ -162,8 +161,7 @@
             value-format="yyyy-MM-dd"
             format='yyyy-MM-dd'
             placeholder="必选"
-            :editable=false
-          >
+            :editable=false>
           </el-date-picker>
         </el-form-item>
         <el-form-item label="点检频率:" prop="planPeriod" :rules="rules.planPeriodType">
@@ -946,6 +944,23 @@
             columnProp: 'planPeriod',
             headerAlign: "center",
             align: "right",
+            columnLabel: '点检频率',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101013,
+            serialNumber: '101013TablePlanPeriod',
+            tableId: "101013Table",
+            tableName: "点检计划表",
+            columnProp: 'planCycle',
+            headerAlign: "center",
+            align: "center",
             columnLabel: '点检周期',
             columnHidden: false,
             columnImage: false,
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index f645ee3..177d71f 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -147,10 +147,18 @@
           placeholder="必选">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="维保周期(天):" prop="planPeriod" :rules="rules.planPeriodType">
+      <el-form-item label="维保频率:" prop="planPeriod" :rules="rules.planPeriodType">
         <el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="周末(选中周末排单):">
+      <el-form-item label="维保周期">
+        <el-select filterable v-model="modalData.planCycle" style="width: 50px">
+          <el-option label="天" value="天"></el-option>
+          <el-option label="周" value="周"></el-option>
+          <el-option label="月" value="月"></el-option>
+          <el-option label="年" value="年"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="周末:">
         <input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
       </el-form-item>
     </el-form>
@@ -793,7 +801,8 @@
           planEndDate:'',
           userId:'',
           remark:'',
-          workOrderRule: ''
+          workOrderRule: '',
+          planCycle: ''
         },
         objectData:{
           site: this.$store.state.user.site,
@@ -966,6 +975,23 @@
             columnProp: 'planPeriod',
             headerAlign: "center",
             align: "right",
+            columnLabel: '维保频率',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101017,
+            serialNumber: '101017TablePlanPeriod',
+            tableId: "101017Table",
+            tableName: "维保计划表",
+            columnProp: 'planCycle',
+            headerAlign: "center",
+            align: "right",
             columnLabel: '维保周期',
             columnHidden: false,
             columnImage: false,
@@ -1853,7 +1879,8 @@
           createdBy:this.$store.state.user.name,
           updateBy:this.$store.state.user.name,
           remark:'',
-          workOrderRule: ''
+          workOrderRule: '',
+          planCycle: '天'
         };
         this.modalDisableFlag = false;
         this.objectList = [];
@@ -1883,7 +1910,8 @@
           createdBy:this.$store.state.user.name,
           updateBy:this.$store.state.user.name,
           remark:row.remark,
-          workOrderRule: row.workOrderRule
+          workOrderRule: row.workOrderRule,
+          planCycle: row.planCycle
         };
         this.updateObjectList = []
         this.updateDetailData = {}
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index 898dd87..0b1c896 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -990,7 +990,7 @@
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
         qcPartAttributeSearch(this.searchData).then(({data}) => {
-          if (data.code == 0) {
+          if (data.code === 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
             this.pageSize = data.page.pageSize