From 3ab5d6299cc102e37ba5bb7d3f1dc8b970fe6670 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 11:14:16 +0800
Subject: [PATCH] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?-=E4=BF=9D=E5=85=BB=E8=AE=A1=E5=88=92-=E5=8D=95=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/upkeepPlan/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index a4bf18a..a35971d 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -306,6 +306,11 @@
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
       <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="150" label="生成规则" align="center" prop="calculationRule">
+      <template slot-scope="scope">
+          {{ scope.row.calculationRule == "0" ? "按照固定周期" : scope.row.one == "1" ? "按照上次保养时间" : "单次" }}
+        </template>
+      </el-table-column> 
       <el-table-column label="车间编码" align="center" prop="planWorkshop"/>
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
@@ -468,6 +473,7 @@
                     <el-date-picker
                       v-model="form.planLoopStart"
                       type="date"
+                      value-format="yyyy-MM-dd"
                       placeholder="选择日期">
                     </el-date-picker>
                   </el-form-item>
@@ -1461,7 +1467,7 @@ export default {
       // 获取设备组线信息
       getGroupLine().then(response => {
         this.groupLineList = response.data;
-        this.equipmentQuery.groupLine = response.data[0].equipmentCode;
+        // this.equipmentQuery.groupLine = response.data[0].equipmentCode;
         this.getEquList();
       })
 
@@ -1696,6 +1702,10 @@ export default {
               return
             }
           }
+          if(this.form.calculationRule == "2"){
+            this.form.planTimeArray = null;
+            this.form.planLoopEnd = this.form.planLoopStart;
+          }
           this.planLoading = true;
           if (this.form.planId != null) {
             this.form.personList = this.selectPersonList.map(item => {