From 1341953ef10ab070152a76fe21331e644e136184 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 5 Jan 2024 15:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=85=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/index.vue | 12 ++++++++----
 src/pages/equipment/Repair/index.vue     |  4 ++--
 src/pages/equipment/Spotcheck/index.vue  | 12 ++++++++----
 src/pages/equipment/Upkeep/index.vue     | 14 ++++++++------
 src/pages/equipment/Upkeep/repairing.vue |  7 +++++--
 src/pages/shouye/me.vue                  |  2 +-
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index 3f9a2d8..f53d5e1 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -9,26 +9,30 @@
       <view class="right"></view>
     </view>
     <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
+    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.planCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
         <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
       <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
     </view>
 
-    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
+    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.planCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
         <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
       <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
     </view>
diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue
index a5f3808..af883aa 100644
--- a/src/pages/equipment/Repair/index.vue
+++ b/src/pages/equipment/Repair/index.vue
@@ -9,7 +9,7 @@
       <view class="right"></view>
     </view>
     <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
+    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.workCode }}</div>
         <div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
@@ -24,7 +24,7 @@
       <div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div>
     </view>
 
-    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
+    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.workCode }}</div>
         <div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue
index f4c25ec..d16aa65 100644
--- a/src/pages/equipment/Spotcheck/index.vue
+++ b/src/pages/equipment/Spotcheck/index.vue
@@ -9,25 +9,29 @@
       <view class="right"></view>
     </view>
     <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
+    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.planCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
         <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
     </view>
 
-    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
+    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.planCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
         <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
     </view>
     <u-toast ref="uToast" />
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index 1163a01..742a3fd 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -9,7 +9,7 @@
       <view class="right"></view>
     </view>
     <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
+    <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.orderCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}</div>
@@ -22,9 +22,10 @@
 执行结束时间		保养类型	内部
 是否停机保养	开机保养	保养人	 -->
       <div class="item1">计划编码: {{ item.planCode }}</div>
-      <div class="item1">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}日</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
       <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
       <div class="item1">执行开始时间: {{ item.orderStart }}</div>
@@ -32,16 +33,17 @@
       <div class="item1">是否停机保养: {{ item.delFlag == 1 ? '是' : '否' }}</div>
     </view>
 
-    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
+    <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.workCode }}</div>
         <div class="tag">{{ item.orderStatus == 0 ? '待处理' : item.orderStatus == 1 ? '已完成' : item.orderStatus == 2 ? '已逾期' : '进行中' }}</div>
         <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
       <div class="item1">计划编码: {{ item.planCode }}</div>
-      <div class="item1">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
+      <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
       <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}日</div>
+      <div class="item1" style="color: red">周期: {{ item.planLoop }}{{ item.planLoopType == 'month' ? '月' : item.planLoopType == 'day' ? '日' : item.planLoopType == 'year' ? '年' : '周' }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
       <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
       <div class="item1">执行开始时间: {{ item.orderStart }}</div>
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue
index 5b20e33..65410e1 100644
--- a/src/pages/equipment/Upkeep/repairing.vue
+++ b/src/pages/equipment/Upkeep/repairing.vue
@@ -275,7 +275,9 @@ export default class ChangePalletNew extends BasePage {
   deleteimgList: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
-  formdata: any = {};
+  formdata: any = {
+    orderCost: 0,
+  };
   Sparepartlist: any = [];
   imgformList: any = [];
   deleteimgList1: any = [];
@@ -610,7 +612,8 @@ export default class ChangePalletNew extends BasePage {
       });
       return;
     }
-    if (this.formdata.orderCost == '' || this.formdata.orderCost == undefined) {
+    console.log(this.formdata.orderCost);
+    if (this.formdata.orderCost === '') {
       (this.$refs.uToast as any).show({
         title: '保养费用不能为空',
         type: 'default',
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index d65e51f..4883f6b 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.28';
+  version = '0.0.29';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {