From 9bf423302eb3536cab04ebbfbfe8daedfdee46e9 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 2 Jan 2024 15:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Repair/repairing.vue     |  2 +-
 src/pages/equipment/Repair/repairingview.vue | 21 +++++++++++++++++---
 src/pages/shouye/me.vue                      |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue
index 4ab6732..aed2553 100644
--- a/src/pages/equipment/Repair/repairing.vue
+++ b/src/pages/equipment/Repair/repairing.vue
@@ -443,7 +443,7 @@ export default class ChangePalletNew extends BasePage {
     // await this.model.getpalletDestination(params);
   }
   async selectProductlocCode2(e: any) {
-    this.workReason = e.pickerName;
+    this.repairMeasures = e.pickerName;
     // await this.model.getpalletDestination(params);
   }
   scrollLeft() {
diff --git a/src/pages/equipment/Repair/repairingview.vue b/src/pages/equipment/Repair/repairingview.vue
index a01d341..20b6b5c 100644
--- a/src/pages/equipment/Repair/repairingview.vue
+++ b/src/pages/equipment/Repair/repairingview.vue
@@ -121,8 +121,14 @@
             <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" />
+            <jPicker :disabled="detailsinfolist.workReason == null ? true : true" sureColor="#ff0000" :moren="moren" showKey="label" valKey="value" :val="workReason.value" :options="model.locList" />
           </u-form-item>
+          <u-form-item label="维修措施:">
+            <jPicker :disabled="detailsinfolist.workReason == null ? true : true" sureColor="#ff0000" :moren="moren2" showKey="label" valKey="value" :val="repairMeasures.value" :options="model.locList2" />
+          </u-form-item>
+          <!-- <u-form-item label="原因分析:">
+            <u-input :disabled="detailsinfolist.workReason == null ? true : true" v-model="detailsinfolist.workReason" placeholder="" />
+          </u-form-item> -->
           <u-form-item label="图片:">
             <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
               <view class="photoList photoList1">
@@ -229,6 +235,8 @@ export default class ChangePalletNew extends BasePage {
       cate_name: '巡检记录',
     },
   ];
+  moren = '选择原因分析';
+  moren2 = '选择维修措施';
   current: any = 0;
   shouciFocus = true;
   // 详细
@@ -285,10 +293,12 @@ export default class ChangePalletNew extends BasePage {
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
   formdata: any = {};
+  workReason: any = {};
+  repairMeasures: any = {};
   async onReady() {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
-    this.model.rowdata = [];
+    // this.model.rowdata = [];
     console.log(0);
   }
   onShow() {
@@ -362,6 +372,8 @@ export default class ChangePalletNew extends BasePage {
     console.log(item);
   }
   async onLoad(options) {
+    await this.model.getFaultMeasuresList();
+    await this.model.getFaultDescriptionList();
     let str = decodeURIComponent(options.listitem);
     if (str) {
       this.detailsinfo = JSON.parse(str);
@@ -370,7 +382,10 @@ export default class ChangePalletNew extends BasePage {
       };
       await this.model.getInspectionOrderInfo(query.workId);
       this.detailsinfolist = this.model.OrderInfList;
-      if (this.detailsinfolist.files.length > 0) {
+      this.workReason.value = this.detailsinfolist.workReason;
+      this.repairMeasures.value = this.detailsinfolist.repairMeasures;
+
+      if (this.detailsinfolist.files) {
         this.imgformList = [];
         this.detailsinfolist.files.forEach((item) => {
           this.imgformList.push(item.fileAddress);
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 6ef320a..c3e5abf 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.21';
+  version = '0.0.22';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {