From 21d3365df06ad66b93c253ebdc5ebe4003b724cb Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Thu, 16 Nov 2023 17:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  16 +
 src/pages/equipment/Inspection/details.vue    |  51 +-
 .../equipment/Inspection/detailsview.vue      |  33 +-
 src/pages/equipment/Repair/Sparepartlist.vue  | 998 +++---------------
 src/pages/equipment/Repair/details.vue        |  92 +-
 src/pages/equipment/Repair/index.vue          |  56 +-
 src/pages/equipment/Repair/model.ts           |  26 +-
 src/pages/equipment/Repair/repairing.vue      | 390 +++++--
 src/pages/equipment/Repair/repairingview.vue  | 364 ++++---
 src/pages/equipment/Repairbx/index.vue        |   7 +
 src/pages/equipment/Spotcheck/details.vue     |   2 +-
 src/pages/equipment/Upkeep/Sparepartlist.vue  | 998 +++---------------
 src/pages/equipment/Upkeep/details.vue        | 103 +-
 src/pages/equipment/Upkeep/index.vue          |  83 +-
 src/pages/equipment/Upkeep/model.ts           |  56 +-
 src/pages/equipment/Upkeep/repairing.vue      | 390 +++++--
 src/pages/equipment/Upkeep/repairingview.vue  | 364 ++++---
 src/pages/mes/ChangePalletNew/index.vue       |   1 +
 src/pages/mes/ProductionQtyInsp/index.vue     |  13 +-
 src/pages/shouye/me.vue                       |   2 +-
 src/utils/request.ts                          |  13 +-
 src/utils/url.ts                              |  12 +-
 22 files changed, 1810 insertions(+), 2260 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 128c744..b5545ea 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -124,6 +124,14 @@
         "navigationBarTextStyle": "white" 
       }
     },
+    {
+      "path": "pages/equipment/Upkeep/repairingview",
+      "style": {
+        "navigationBarTitleText": "维修查看",
+        "navigationStyle": "custom", 
+        "navigationBarTextStyle": "white" 
+      }
+    },
     {
       "path": "pages/equipment/Upkeep/Sparepartlist",
       "style": {
@@ -156,6 +164,14 @@
         "navigationBarTextStyle": "white" 
       }
     },
+    {
+      "path": "pages/equipment/Repair/repairingview",
+      "style": {
+        "navigationBarTitleText": "维修查看",
+        "navigationStyle": "custom", 
+        "navigationBarTextStyle": "white" 
+      }
+    },
     {
       "path": "pages/equipment/Repair/Sparepartlist",
       "style": {
diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index 878a428..d026190 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -166,8 +166,10 @@ export default class ChangePalletNew extends BasePage {
     console.log(item, value, index, index1);
     this.radiomodal = false;
     this.inputmodal = false;
-    if (value == null) {
-      this.isvalue == true;
+    if (value == null || value == '') {
+      this.isvalue = true;
+    } else {
+      this.isvalue = false;
     }
     if (value > item.detailUpLimit || value < item.detailDownLimit) {
       this.equipmentindex = [];
@@ -296,7 +298,7 @@ export default class ChangePalletNew extends BasePage {
         //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: '/dev-api/file/upload',
+            url: 'http://192.168.202.20:9000/prod-api/file/upload',
             //url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
@@ -358,25 +360,38 @@ export default class ChangePalletNew extends BasePage {
       this.customToast('请扫码设备编码');
       return;
     }
+    this.detailsinfocontent.equ.detailList.forEach((item) => {
+      if (item.standardList.length > 0) {
+        item.standardList.forEach((item1) => {
+          if (item1.standardType == 'quantify') {
+            if (item1.detailReach == null || item1.detailReach == '') {
+              // console.log(this.isvalue);
+              this.isvalue = true;
+            }
+          }
+        });
+      }
+    });
+    // i
     if (this.isvalue) {
       this.customToast('检查标准不能为空');
       return;
     }
-    // this.detailsinfocontent.equ = this.detailsinfolist;
-    // let query = this.detailsinfocontent;
-    // await this.model.updateInspectionRecord(query);
-    // if (this.model.SubmitCode == '200') {
-    //   (this.$refs.uToast as any).show({
-    //     title: '成功',
-    //     type: 'success',
-    //   });
-    //   uni.navigateBack({});
-    // } else {
-    //   (this.$refs.uToast as any).show({
-    //     title: '失败',
-    //     type: 'error',
-    //   });
-    // }
+    this.detailsinfocontent.equ = this.detailsinfolist;
+    let query = this.detailsinfocontent;
+    await this.model.updateInspectionRecord(query);
+    if (this.model.SubmitCode == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'success',
+      });
+      uni.navigateBack({});
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'error',
+      });
+    }
   }
   search(value) {
     console.log(value);
diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue
index 864c513..6070212 100644
--- a/src/pages/equipment/Inspection/detailsview.vue
+++ b/src/pages/equipment/Inspection/detailsview.vue
@@ -31,7 +31,7 @@
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
           <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="select">
               <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
                 <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
@@ -41,7 +41,7 @@
             </div>
           </div>
           <div class="item1 item2" v-if="item1.standardType == 'quantify'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="input-box" id="input-box1">
               实际值:
               <input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
@@ -71,16 +71,16 @@
         <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
           <view class="photoList">
             <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-              <view class="closeBtn" @click="deleteImg(index)">
+              <!-- <view class="closeBtn" @click="deleteImg(index)">
                 <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
-              </view>
+              </view> -->
               <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
             </view>
-            <view class="itemBox chooseBtn" @click="chooseImg">
-              <view class="inner">
+            <view class="itemBox chooseBtn">
+              <!-- <view class="inner">
                 <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                 <text class="desc">添加照片</text>
-              </view>
+              </view> -->
             </view>
           </view>
         </scroll-view>
@@ -160,6 +160,25 @@ export default class ChangePalletNew extends BasePage {
     //this.remove = this.model.WlList[0];
   }
   // 输入框焦点
+  checkimg(item, value, index, index1) {
+    this.equipmentindex = [];
+    this.radiomodal = false;
+    this.inputmodal = false;
+    this.equipmentindex.push(index);
+    this.equipmentindex.push(index1);
+    if (item.picturePath != null) {
+      this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = this.imgList.split(',');
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
+    } else {
+      this.imgList = [];
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
+    }
+  }
   blur(item, value, index, index1) {
     this.radiomodal = false;
     this.inputmodal = false;
diff --git a/src/pages/equipment/Repair/Sparepartlist.vue b/src/pages/equipment/Repair/Sparepartlist.vue
index 3f276f0..bf1079f 100644
--- a/src/pages/equipment/Repair/Sparepartlist.vue
+++ b/src/pages/equipment/Repair/Sparepartlist.vue
@@ -9,7 +9,7 @@
     </view>
     <view class="single-left">
       <view>备件名称:</view>
-      <u-search placeholder="请输入" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+      <u-search placeholder="请输入" @search="search()" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
       <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
     </view>
     <view style="margin: 20px">
@@ -27,6 +27,12 @@
         </u-col>
       </u-row>
     </view>
+    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm()">
+      <div class="form">
+        <div class="formlable">申领数量</div>
+        <u-input style="" v-model="number1" placeholder="" type="number" />
+      </div>
+    </u-modal>
     <u-toast ref="uToast" />
   </view>
 </template>
@@ -53,829 +59,51 @@ export default class ProductionQtyInsplist extends BasePage {
     },
     {
       label: '备件名称',
-      key: 'rfid',
+      key: 'materialDesc',
       width: 320,
     },
     {
       label: '备件编码',
-      key: 'rfid',
+      key: 'materialCode',
       width: 320,
     },
     {
-      label: '库存数量',
-      key: 'orderCode',
+      label: '总数量',
+      key: 'amount',
     },
     {
-      label: '机台',
-      key: 'machineName',
-    },
-    {
-      label: '产品',
-      key: 'productName',
-      width: 220,
-    },
-    {
-      label: '工单',
-      key: 'workorderCode',
-      width: 220,
+      label: '冻结数量',
+      key: 'storageAmount',
     },
     // {
-    //   label: '是否合格',
-    //   key: 'licensePlateNumber',
+    //   label: '产品',
+    //   key: 'productName',
+    //   width: 220,
     // },
-    {
-      label: '不良描述',
-      key: 'badMeg',
-    },
     // {
-    //   label: '照片',
-    //   key: 'checkPeople',
+    //   label: '工单',
+    //   key: 'workorderCode',
+    //   width: 220,
+    // },
+    // {
+    //   label: '不良描述',
+    //   key: 'badMeg',
     // },
   ];
-  tableData: any = [
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:09:06',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'fcc79188e5814d20823bec29b33d2805',
-      rfid: 'S0000286',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H15',
-      machineName: '烘房15',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:04:47',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'c58ab2b76a9d4148bd0d77a2bbb75374',
-      rfid: 'S0000145',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H18',
-      machineName: '烘房18',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:01:32',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '123895b70acc4cf19a160b2b56c76a11',
-      rfid: 'S0000480',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500013-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500013',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H61',
-      machineName: '烘房61',
-      badMeg: null,
-      productId: null,
-      productCode: '000000020000000292',
-      productName: 'Φ125mm无烟白坯',
-      productSpc: 'Φ125mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:50:59',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '1ad4fe9ec1a545d8a1b170f36ff18bd0',
-      rfid: 'S0000267',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:49:45',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '27fa98d1f37b45f885bae71b08b24b30',
-      rfid: 'S0000067',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H18',
-      machineName: '烘房18',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:25:23',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'f81731618e524ec8a132d369d97fd864',
-      rfid: 'S0000247',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H14',
-      machineName: '烘房14',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:00:34',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '4d3c9130c0344f47b6433a7e6abe29eb',
-      rfid: 'S0000223',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H15',
-      machineName: '烘房15',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 12:56:09',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '8579731e3d1544ceb5c2c696a7cbadae',
-      rfid: 'S0000050',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H16',
-      machineName: '烘房16',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:19:36',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'a2863d392dab4caa92289c2f27522f7e',
-      rfid: 'S0000592',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H11',
-      machineName: '烘房11',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-  ];
+  tableData: any = [];
   orderNo: any = '';
   shouciFocus = true;
+  // 详细
+  detailsinfo: any = {};
+  detailsinfolist: any = {};
+  detailsinfocontent: any = {};
+  // 模态框
+  isshow = false;
+  inputmodal = false;
+  isvalue = false;
+  ischecked = false;
+  radiomodal = false;
+  number1: any = '';
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -886,6 +114,105 @@ export default class ProductionQtyInsplist extends BasePage {
   // }
   onShow() {
     // this.query();
+    console.log(2, this.model.rowdata);
+  }
+  confirm() {
+    if (this.number1 == '' || this.number1 == null) {
+      (this.$refs.uToast as any).show({
+        title: '请输入申领数量',
+        type: 'default',
+      });
+      this.isshow = true;
+      return;
+    }
+    var bool = null;
+    let amount = this.rowdata.amount;
+    let storageAmount = this.rowdata.storageAmount;
+    let maxnumber = parseInt(amount) - parseInt(storageAmount);
+    if (this.number1 > maxnumber) {
+      (this.$refs.uToast as any).show({
+        title: '输入的申领数量不符合',
+        type: 'default',
+      });
+      this.isshow = true;
+      return;
+    }
+    if (this.model.rowdata.length > 0) {
+      bool = this.model.rowdata.some((item) => item.materialCode == this.rowdata.materialCode);
+      console.log(bool);
+      if (!bool) {
+        this.rowdata.spareQuantity = this.number1;
+        this.model.rowdata.push(this.rowdata);
+        // uni.navigateTo({
+        //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+        // });
+        uni.navigateBack({});
+      }
+      if (bool) {
+        this.model.rowdata.forEach((item) => {
+          if (item.materialCode == this.rowdata.materialCode) {
+            let spareQuantity = parseInt(item.spareQuantity) + parseInt(this.number1);
+            let amount = this.rowdata.amount;
+            let storageAmount = this.rowdata.storageAmount;
+            let maxnumber = parseInt(amount) - parseInt(storageAmount);
+            if (spareQuantity > maxnumber) {
+              (this.$refs.uToast as any).show({
+                title: '输入的申领数量不符合',
+                type: 'default',
+              });
+              this.isshow = true;
+              return;
+            }
+            item.spareQuantity = parseInt(item.spareQuantity) + parseInt(this.number1);
+            // console.log(this.detailsinfo)
+            // uni.navigateTo({
+            //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+            // });
+            uni.navigateBack({});
+            // uni.navigateBack({});
+          }
+        });
+
+        // this.rowdata
+        // (this.$refs.uToast as any).show({
+        //   title: '请勿重复申领',
+        //   type: 'default',
+        // });
+        // _this.customToast('请勿重复申领');
+      }
+    } else {
+      this.rowdata.spareQuantity = this.number1;
+      this.model.rowdata.push(this.rowdata);
+      // uni.navigateTo({
+      //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+      // });
+      uni.navigateBack({});
+    }
+    console.log(this.model.rowdata, this.page, this.rowdata);
+  }
+  cancel() {
+    this.isshow = false;
+  }
+  goback() {
+    uni.redirectTo({
+      url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+    });
+  }
+  async onLoad(options) {
+    let str = decodeURIComponent(options.listitem);
+    if (str) {
+      this.detailsinfo = JSON.parse(str);
+      let query = {
+        pageNum: 1,
+        pageSize: 10000,
+        materialDesc: this.orderNo,
+      };
+      await this.model.queryhandChecklist(query);
+      this.tableData = this.model.Checklist;
+      this.tableData.map((item, index) => {
+        item.index = index + 1;
+      });
+    }
   }
   changeContent(e) {
     //console.log('eee', e.data);
@@ -900,49 +227,28 @@ export default class ProductionQtyInsplist extends BasePage {
   onSubmit() {
     //debugger
     //console.log('xssss',this.rowdata);
-    var bool = null;
+
     if (JSON.stringify(this.rowdata) === '{}' || this.rowdata === undefined) {
       this.customToast('请选择至少一个备件');
       return;
     }
-    if (this.model.rowdata.length > 0) {
-      bool = this.model.rowdata.some((item) => item.rfid == this.rowdata.rfid);
-      console.log(bool);
-      if (!bool) {
-        this.model.rowdata.push(this.rowdata);
-        uni.navigateBack({});
-      }
-      if (bool) {
-        (this.$refs.uToast as any).show({
-          title: '请勿重复申领',
-          type: 'default',
-        });
-        // _this.customToast('请勿重复申领');
-      }
-    } else {
-      this.model.rowdata.push(this.rowdata);
-      uni.navigateBack({});
-    }
+    this.isshow = true;
 
-    console.log(this.model.rowdata, this.page, this.rowdata);
     // this.uni.navigateTo({
     //   url: this.page.mes.ProductionQtyInspDetail,
     // });
   }
-  async query() {
-    //this.tableData = [];
-    await this.model.queryhandChecklist();
-    //console.log('1234567', this.model.Checklist);
+  async search() {
+    let query = {
+      pageNum: 1,
+      pageSize: 10000,
+      materialDesc: this.orderNo,
+    };
+    await this.model.queryhandChecklist(query);
     this.tableData = this.model.Checklist;
     this.tableData.map((item, index) => {
       item.index = index + 1;
     });
-    //console.log('this.tableData', model.Checklist);
-    //this.productCodeList = this.model.productCodeList[0];
-    //this.histroyItem = this.model.orderNoItemList[0];
-  }
-  search(value) {
-    console.log(value);
   }
   histroyItem: any = {};
   barcode: any = '';
@@ -1130,4 +436,22 @@ export default class ProductionQtyInsplist extends BasePage {
 // .wyb-table-scroll-view {
 //   width: auto !important;
 // }
+.form {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+::v-deep .form .uni-input-input {
+  margin-left: 10px;
+  width: 93%;
+  border: 1px solid;
+  padding: 10px 5px;
+  box-sizing: border-box;
+  outline: none;
+  height: 35px;
+  font-weight: 500;
+}
 </style>
diff --git a/src/pages/equipment/Repair/details.vue b/src/pages/equipment/Repair/details.vue
index ee2d138..6d430ba 100644
--- a/src/pages/equipment/Repair/details.vue
+++ b/src/pages/equipment/Repair/details.vue
@@ -18,8 +18,8 @@
           <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
         </div>
         <div class="details">
-          <div>车间: {{ detailsinfocontent.planWorkshop }}</div>
-          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workshopName }}</div>
+          <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
+          <div>工作中心: {{ detailsinfolist.workshopName }}</div>
         </div>
       </div>
       <view class="single-left">
@@ -27,7 +27,7 @@
         <u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
         <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
       </view>
-      <view class="item" v-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
+      <!-- <view class="item" v-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
         <div class="item1">检查项: {{ item.itemName }}</div>
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
@@ -50,10 +50,17 @@
             </div>
           </div>
         </div>
-      </view>
+      </view> -->
     </view>
-    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="是否停机维修" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfocontent)">
-      <div class="upload-name"></div>
+    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfolist)">
+      <div class="form">
+        <div class="formlable">是否停机维修</div>
+        <u-radio-group v-model="radio" @change="radioGroupChange1(radio)">
+          <u-radio v-for="(item, index) in radioList" :key="index" :name="item.type" :disabled="item.disabled">
+            {{ item.name }}
+          </u-radio>
+        </u-radio-group>
+      </div>
     </u-modal>
     <u-toast ref="uToast" />
   </view>
@@ -65,6 +72,7 @@ import model from './model';
 import chooseOne from '@/components/choose-one/choose-one.vue';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
+import moment from 'moment';
 //import store from '@/store';
 @Component({
   components: {
@@ -125,6 +133,19 @@ export default class ChangePalletNew extends BasePage {
   deleteimgUrlListcope: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
+  radioList: any = [
+    {
+      name: '停机',
+      disabled: false,
+      type: 1,
+    },
+    {
+      name: '不停机',
+      disabled: false,
+      type: 0,
+    },
+  ];
+  radio: any = null;
 
   async onReady() {
     //await this.model.getpalletLocation();
@@ -183,6 +204,9 @@ export default class ChangePalletNew extends BasePage {
       this.form = item;
     }
   }
+  radioGroupChange1(value) {
+    console.log(value);
+  }
   async onLoad(options) {
     let str = decodeURIComponent(options.listitem);
     if (str) {
@@ -205,32 +229,48 @@ export default class ChangePalletNew extends BasePage {
     this.linkrepairing(item);
   }
   async linkrepairing(item) {
-    let query = this.detailsinfocontent;
-    await this.model.updateInspectionRecord(query);
-    if (this.model.SubmitCode == '200') {
+    console.log(this.radio);
+    if (this.radio == null) {
       (this.$refs.uToast as any).show({
-        title: '成功',
-        type: 'success',
+        title: '请选择是否停机维修',
+        type: 'default',
       });
-      uni.navigateBack({});
+      this.isshow = true;
+      return;
+    }
+
+    let query = {
+      workId: item.workId,
+      workCode: item.workCode,
+      workDownMachine: this.radio,
+      workStartTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+    };
+    console.log(query);
+    await this.model.updateInspectionRecord(query);
+    if (this.model.SubmitCode.code == 200) {
+      // (this.$refs.uToast as any).show({
+      //   title: '成功',
+      //   type: 'success',
+      // });
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+      this.isshow = false;
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',
         type: 'error',
       });
     }
-    uni.navigateTo({
-      url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
-    });
   }
   cancel() {
     this.isshow = false;
-    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
-      this.imgList = [];
-    } else {
-      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
-      this.imgList = this.imgList.split(',');
-    }
+    // if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+    //   this.imgList = [];
+    // } else {
+    //   this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+    //   this.imgList = this.imgList.split(',');
+    // }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
@@ -265,7 +305,7 @@ export default class ChangePalletNew extends BasePage {
         //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: '/dev-api/file/upload',
+            url: 'http://192.168.202.20:9000/prod-api/file/upload',
             //url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
@@ -592,5 +632,13 @@ export default class ChangePalletNew extends BasePage {
     max-height: 15px;
     font-size: 13px;
   }
+  .form {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+  }
 }
 </style>
diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue
index 5ee1770..3d6d9e4 100644
--- a/src/pages/equipment/Repair/index.vue
+++ b/src/pages/equipment/Repair/index.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="goback()" />
       </view>
       <view class="title">维修</view>
       <view class="right"></view>
@@ -12,26 +12,30 @@
     <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index">
       <div class="list-top">
         <div class="name">工单号: {{ item.workCode }}</div>
-        <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
+        <div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
         <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
       <div class="item1">设备编码: {{ item.equipmentCode }}</div>
       <div class="item1">维修负责人: {{ item.workPerson }}</div>
       <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
       <div class="item1">维修人员: {{ item.workPerson }}</div>
+      <div class="item1">维修组: {{ item.teamName }}</div>
+      <div class="item1">维修组人员: {{ item.teamPerson }}</div>
       <div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div>
     </view>
 
     <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
       <div class="list-top">
         <div class="name">工单号: {{ item.workCode }}</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 class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
+        <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
       <div class="item1">设备编码: {{ item.equipmentCode }}</div>
       <div class="item1">维修负责人: {{ item.workPerson }}</div>
       <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
       <div class="item1">维修人员: {{ item.workPerson }}</div>
+      <div class="item1">维修组: {{ item.teamName }}</div>
+      <div class="item1">维修组人员: {{ item.teamPerson }}</div>
       <div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div>
     </view>
   </view>
@@ -99,6 +103,7 @@ export default class ChangePalletNew extends BasePage {
     },
   ];
   userinfo: any = null;
+  Sparepartlist: any = [];
   // remove: any = {};
   async onReady() {
     //await this.model.getpalletLocation();
@@ -141,7 +146,7 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userId,
-          workStatus: '1',
+          workStatus: '0',
           workOutsource: '0',
         };
         await this.model.getTaskRecord(query);
@@ -150,16 +155,45 @@ export default class ChangePalletNew extends BasePage {
     }
   }
   linkdetails(item) {
+    this.model.rowdatanull();
+    // this.model.rowdata = []
+    // item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成';
+    if (item.workStatus == 0) {
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else if (item.workStatus == 2 || item.workStatus == 3) {
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    }
+  }
+  goback() {
     uni.navigateTo({
-      url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      url: `/pages/equipment/index`,
     });
   }
   linkdetailscheck(item) {
-    this.ischecked = true;
-    item.ischecked = true;
-    uni.navigateTo({
-      url: `/pages/equipment/Repair/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)),
-    });
+    this.model.rowdatanull();
+    if (item.workStatus == 0) {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else if (item.workStatus == 2 || item.workStatus == 3) {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    }
   }
 }
 </script>
diff --git a/src/pages/equipment/Repair/model.ts b/src/pages/equipment/Repair/model.ts
index b42c53c..b0a3875 100644
--- a/src/pages/equipment/Repair/model.ts
+++ b/src/pages/equipment/Repair/model.ts
@@ -2,7 +2,6 @@ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decor
 import store from '@/store';
 import http from '@/utils/request';
 import { url } from '@/utils/url';
-import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
   dynamic: true,
@@ -37,25 +36,30 @@ export class ChangePalletNew extends VuexModule {
   //巡检提交
   @MutationAction
   async updateInspectionRecord(params: any) {
-    const result: any = await http.post(url.lanjuequipment.product.Inspection.updateInspectionRecord, params);
-    const SubmitCode: [] = result.code;
+    const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params);
+    const SubmitCode: [] = result;
+    return { SubmitCode };
+  }
+  @MutationAction
+  async updateMaintenanceRecords(params: any) {
+    const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params);
+    const SubmitCode: [] = result;
     return { SubmitCode };
   }
   Checklist: any = [];
   @MutationAction
-  async queryhandChecklist() {
-    const result: any = await http.get(url.lanjumes.product.queryhandChecklist, {
-      //loginName: session.loginName,
-      params: {
-        factoryCode: session.FactoryCode,
-        createBy: session.user?.loginName,
-      },
-    });
+  async queryhandChecklist(params: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.list, { params: params });
     const Checklist: any = result.rows;
     console.log('this.tableData', Checklist);
     // debugger
     return { Checklist };
   }
+  @MutationAction
+  async rowdatanull() {
+    const rowdata: [] = [];
+    return { rowdata };
+  }
 }
 
 export default getModule(ChangePalletNew);
diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue
index 17a5e62..3f3fba2 100644
--- a/src/pages/equipment/Repair/repairing.vue
+++ b/src/pages/equipment/Repair/repairing.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="goback()" />
       </view>
       <view class="title">巡检详情</view>
       <view class="right"></view>
@@ -13,35 +13,35 @@
       <div class="item-name">
         <div class="quest">报修信息</div>
         <div class="details">
-          <div>报修人: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修人: {{ detailsinfolist.orderRepairman }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>保修时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>保修时间: {{ detailsinfolist.orderTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>故障时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>报修来源: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修来源: {{ detailsinfolist.orderSource }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <!-- <div class="details">
+          <div>故障时间: {{ detailsinfolist.planWorkshop }}</div>
+          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
+        </div> -->
         <div class="details">
-          <div>故障时间: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>是否立即维修: {{ detailsinfolist.workHandle }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>是否立即维修: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>联系方式: {{ detailsinfolist.orderConnection }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>联系方式: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>故障描述: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
       </div>
@@ -58,7 +58,7 @@
             <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="select">
               <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
-                <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
+                <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
               </u-radio-group>
@@ -79,44 +79,43 @@
       <!-- <u-button type="success">点击进行备件申领</u-button> -->
       <div class="Pickup">点击进行备件申领</div>
       <div class="Pickupclick">
-        <img @click="linkSparepartlist()" src="../../../static/images/add.png" alt="" />
+        <img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" />
       </div>
     </div>
-    <view class="list" v-for="(item, index) in this.model.rowdata" :key="index">
+    <view class="list" v-for="(item, index) in this.Sparepartlist" :key="index">
       <div class="item-name">
         <div class="quest">备件申领单</div>
+        <div class="deletebtn">
+          <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
+        </div>
         <div class="details">
-          <div>件编码: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件编码: {{ item.materialCode }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件名称: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件名称: {{ item.materialDesc }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>申请数量: {{ detailsinfolist.equipmentCode }}</div>
+          <div>申领数量: {{ item.spareQuantity }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件费用: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件费用: {{ item.equipmentCode }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
-        <div class="details">
-          <div>申请人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+        <!-- <div class="details">
+          <div>申请人: {{ item.applyPeople }}</div>
         </div>
         <div class="details">
-          <div>申请时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+          <div>申请时间: {{ item.planWorkshop }}</div>
         </div>
         <div class="details">
-          <div>审核人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+          <div>审核人: {{ item.planWorkshop }}</div>
         </div>
         <div class="details">
-          <div>审核时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
+          <div>审核时间: {{ item.planWorkshop }}</div>
+        </div> -->
       </div>
     </view>
     <view class="list listbottom">
@@ -124,12 +123,12 @@
         <div class="quest">维修单</div>
         <u-form class="form" ref="form" label-width="230rpx">
           <u-form-item label="负责人:">
-            {{ detailsinfolist.equipmentCode }}
+            {{ detailsinfolist.workPerson }}
           </u-form-item>
           <!-- 机台 -->
           <u-form-item label="维修结果:">
             <div class="select">
-              <u-radio-group v-model="formdata.detailReach" @change="radioGroupChange1(formdata.detailReac)">
+              <u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)">
                 <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
@@ -138,33 +137,32 @@
           </u-form-item>
           <!-- 单号 -->
           <u-form-item label="维修费用:">
-            <u-input v-model="orderNoItemList.productCode" placeholder="" />
+            <u-input v-model="formdata.workCost" placeholder="" />
           </u-form-item>
-          <!-- 机台 -->
-          <u-form-item label="维修用时(分钟):">
-            <u-input v-model="orderNoItemList.productSpc" placeholder="" />
+          <!-- <u-form-item label="维修用时(分钟):">
+            <u-input v-model="formdata.productSpc" placeholder="" />
           </u-form-item>
-          <!-- 产品 -->
           <u-form-item label="维修人员签字:">
-            <u-input v-model="orderNoItemList.productName" placeholder="" />
-          </u-form-item>
+            <u-input v-model="formdata.productName" placeholder="" />
+          </u-form-item> -->
+
           <!-- 工单 -->
           <u-form-item label="联系方式:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input v-model="formdata.workConnection" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input v-model="formdata.workReason" placeholder="" />
           </u-form-item>
           <u-form-item label="上传图片:">
-            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
+            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
               <view class="photoList">
-                <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-                  <view class="closeBtn" @click="deleteImg(index)">
+                <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
+                  <view class="closeBtn" @click="deleteImg1(index)">
                     <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
                   </view>
-                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
+                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg1(index)"></image>
                 </view>
-                <view class="itemBox chooseBtn" @click="chooseImg">
+                <view class="itemBox chooseBtn" @click="chooseImg1">
                   <view class="inner">
                     <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                     <text class="desc">添加照片</text>
@@ -195,7 +193,7 @@
         <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
         <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
           <view class="photoList">
-            <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
+            <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
               <view class="closeBtn" @click="deleteImg(index)">
                 <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
               </view>
@@ -211,6 +209,7 @@
         </scroll-view>
       </div>
     </u-modal>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -266,12 +265,12 @@ export default class ChangePalletNew extends BasePage {
   ];
   listselect1: any = [
     {
-      type: 0,
+      type: 1,
       name: '已完成',
       radiovalue: null,
     },
     {
-      type: 1,
+      type: 3,
       name: '未完成',
       radiovalue: null,
     },
@@ -288,43 +287,62 @@ export default class ChangePalletNew extends BasePage {
   filesArr: any = [];
   imgList: any = [];
   imgUrlList: any = [];
-  deleteimgUrlList: any = [];
+  deleteimgList: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
   formdata: any = {};
+  Sparepartlist: any = [];
+  imgformList: any = [];
+  deleteimgList1: any = [];
+  isvalue = false;
   async onReady() {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
-    this.model.rowdata = [];
-    console.log(0);
+    // this.Sparepartlist = []
+    console.log(0, this.model.rowdata, this.Sparepartlist);
   }
   onShow() {
     this.onLoad;
-    console.log(2, this.model.rowdata);
+    this.blur;
+    if (this.model.rowdata.length == 0) {
+      this.model.rowdatanull();
+    } else {
+      this.Sparepartlist = this.model.rowdata;
+    }
+    console.log(1, this.model.rowdata, this.Sparepartlist);
   }
   // 输入框焦点
   blur(item, value, index, index1) {
+    console.log(item, value, index, index1);
     this.radiomodal = false;
     this.inputmodal = false;
+    if (value == null || value == '') {
+      this.isvalue = true;
+    } else {
+      this.isvalue = false;
+    }
+    console.log(this.isvalue, value == null, value == '');
     if (value > item.detailUpLimit || value < item.detailDownLimit) {
+      this.equipmentindex = [];
       this.equipmentindex.push(index);
       this.equipmentindex.push(index1);
       if (item.picturePath != null) {
-        item.picturePath = item.picturePath.split(',');
-        this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
+        this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+        this.imgList = this.imgList.split(',');
       } else {
-        this.imgUrlList = [];
+        this.imgList = [];
       }
-      // this.inputmodal = true;
-      // this.isshow = true;
-      // this.form = item;
+      this.inputmodal = true;
+      this.isshow = true;
+      this.form = item;
     }
   }
+
   changeinput(e) {
-    console.log(e);
+    console.log(e, '11111111');
   }
   input(e) {
-    console.log(e);
+    console.log(e, '00000000');
   }
   //单选
   radioChange(e) {
@@ -332,21 +350,23 @@ export default class ChangePalletNew extends BasePage {
   }
   // 选中任一radio时，由radio-group触发
   radioGroupChange(item, value, index, index1) {
+    console.log(item, value, index, index1);
+    this.equipmentindex = [];
     this.radiomodal = false;
     this.inputmodal = false;
     this.equipmentindex.push(index);
     this.equipmentindex.push(index1);
     if (item.picturePath != null) {
-      item.picturePath = item.picturePath.split(',');
-      this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = this.imgList.split(',');
     } else {
-      this.imgUrlList = [];
+      this.imgList = [];
+    }
+    if (value == 1) {
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
     }
-    // if (value == 1) {
-    //   this.isshow = true;
-    //   this.radiomodal = true;
-    //   this.form = item;
-    // }
   }
   radioGroupChange1(item) {
     console.log(item);
@@ -356,15 +376,20 @@ export default class ChangePalletNew extends BasePage {
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
-        orderCode: this.detailsinfo.orderCode,
+        workId: this.detailsinfo.workId,
       };
-      await this.model.getInspectionOrderInfo(query);
-      this.detailsinfocontent = this.model.OrderInfList;
-      this.detailsinfolist = this.model.OrderInfList.equ;
+      await this.model.getInspectionOrderInfo(query.workId);
+      this.detailsinfolist = this.model.OrderInfList;
     }
   }
+  goback() {
+    uni.redirectTo({
+      url: `/pages/equipment/Repair/index?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+    });
+  }
   created() {
     this.onLoad;
+    console.log(2, this.model.rowdata, this.Sparepartlist);
   }
   change(index) {
     this.current = index;
@@ -374,21 +399,37 @@ export default class ChangePalletNew extends BasePage {
     console.log((this as any).uUpload, 'sssss', this.equipmentindex);
     console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
     if (this.radiomodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     } else if (this.inputmodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     }
   }
   cancel() {
-    this.imgUrlList = this.deleteimgUrlList;
+    this.isshow = false;
+    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+      this.imgList = [];
+    } else {
+      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+      this.imgList = this.imgList.split(',');
+    }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
   }
   showScreenImg(i) {
-    let list = this.imgUrlList;
+    let list = this.imgList;
     uni.previewImage({
       current: i,
       urls: list,
@@ -404,10 +445,21 @@ export default class ChangePalletNew extends BasePage {
         // uni.showLoading();
         //console.log('/////',res);
         let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: 'http://192.168.202.20:9000/prod-api/file/upload',
-            //url: '/dev-api/file/upload',
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
             header: {
@@ -419,23 +471,19 @@ export default class ChangePalletNew extends BasePage {
             // 	materialCode: this.materialObj.materialCode,
             // },
             success: (res) => {
-              console.log(res);
               uni.hideLoading();
               if (!res.data) {
                 // this.$refs.toastRef.show({
                 // 	type:"error",
-                // 	text:"上传失败！"
+                // 	text:res.msg
                 // })
                 return;
               }
               let data = JSON.parse(res.data);
-              console.log('123dddd', data);
-              this.imgUrlList = [...this.imgList, data.data.url];
+              this.imgList = [...this.imgList, data.data.url];
               //this.imgListName = [...this.imgListName,data.fileName];
-              // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
               //this.picUrls = this.imgList.join(",");
               //this.picNames = this.imgListName.join(",");
-              console.log('this.imgList', this.imgList);
               uni.hideLoading();
             },
             fail: (err) => {
@@ -452,8 +500,91 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   deleteImg(index) {
-    this.deleteimgUrlList = JSON.parse(JSON.stringify(this.imgUrlList));
-    this.imgUrlList.splice(index, 1);
+    this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath));
+    this.imgList = this.imgList.split(',');
+    this.imgList.splice(index, 1);
+  }
+  scrollLeft1() {
+    return 222 * (this.imgformList.length + 1);
+  }
+
+  showScreenImg1(i) {
+    let list = this.imgformList;
+    uni.previewImage({
+      current: i,
+      urls: list,
+      // loop: true
+    });
+  }
+  chooseImg1() {
+    uni.chooseImage({
+      count: 9, //默认9
+      // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        // uni.showLoading();
+        //console.log('/////',res);
+        let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
+        tempFilePaths.map((item) => {
+          uni.uploadFile({
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
+            fileType: 'image',
+            filePath: item,
+            header: {
+              Authorization: 'Bearer ' + session.user?.access_token,
+              // 'cosmo-env-sitecode': this.$store.state.siteCode
+            },
+            name: 'file',
+            // formData: {
+            // 	materialCode: this.materialObj.materialCode,
+            // },
+            success: (res) => {
+              uni.hideLoading();
+              if (!res.data) {
+                // this.$refs.toastRef.show({
+                // 	type:"error",
+                // 	text:res.msg
+                // })
+                return;
+              }
+              let data = JSON.parse(res.data);
+              this.imgformList = [...this.imgformList, data.data.url];
+              //this.imgListName = [...this.imgListName,data.fileName];
+              //this.picUrls = this.imgList.join(",");
+              //this.picNames = this.imgListName.join(",");
+              uni.hideLoading();
+            },
+            fail: (err) => {
+              console.log(err);
+              // this.$refs.toastRef.show({
+              // 	type:"error",
+              // 	text:"上传失败！"
+              // })
+              uni.hideLoading();
+            },
+          });
+        });
+      },
+    });
+  }
+  deleteImg1(index) {
+    this.imgformList.splice(index, 1);
+  }
+  deleteSparepart(index) {
+    this.model.rowdata.splice(index, 1);
+    this.Sparepartlist = this.model.rowdata;
   }
   scanCodeOne() {
     uni.scanCode({
@@ -467,10 +598,72 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   async onSubmit() {
-    if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+    this.detailsinfolist.detailList.forEach((item) => {
+      if (item.standardList.length > 0) {
+        item.standardList.forEach((item1) => {
+          if (item1.standardType == 'quantify') {
+            if (item1.detailReach == null || item1.detailReach == '') {
+              // console.log(this.isvalue);
+              this.isvalue = true;
+            }
+          }
+        });
+      }
+    });
+    // if (this.orderNo == '' || this.orderNo.length == 0) {
+    //   this.customToast('请输入nficl');
+    //   return;
+    // }
+    console.log(this.detailsinfolist, this.isvalue);
+    if (this.isvalue) {
+      (this.$refs.uToast as any).show({
+        title: '检查标准不能为空',
+        type: 'default',
+      });
       return;
     }
+    if (this.formdata.workStatus == '' || this.formdata.workStatus == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '请选择维修结果',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.formdata.workCost == '' || this.formdata.workCost == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '维修费用不能为空',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.formdata.workConnection == '' || this.formdata.workConnection == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '联系方式不能为空',
+        type: 'default',
+      });
+      return;
+    }
+    let query = this.detailsinfolist;
+    query.applyList = this.Sparepartlist;
+    query.fileList = this.imgList.join(',');
+    query.workStatus = this.formdata.workStatus;
+    query.workCost = this.formdata.workCost;
+    query.workConnection = this.formdata.workConnection;
+    query.workReason = this.formdata.workReason;
+    console.log(query, this.isvalue);
+    await this.model.updateInspectionRecord(query);
+    if (this.model.SubmitCode.code == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'default',
+      });
+      uni.navigateBack({});
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'default',
+      });
+    }
     // if (this.badMeg == '') {
     //   this.customToast('请输入不良描述');
     //   return;
@@ -482,9 +675,9 @@ export default class ChangePalletNew extends BasePage {
       this.isaccord = true;
     }
   }
-  linkSparepartlist() {
+  linkSparepartlist(item) {
     uni.navigateTo({
-      url: `/pages/equipment/Repair/Sparepartlist?listitem=`,
+      url: `/pages/equipment/Repair/Sparepartlist?listitem=` + encodeURIComponent(JSON.stringify(item)),
     });
   }
 }
@@ -537,6 +730,7 @@ export default class ChangePalletNew extends BasePage {
     padding: 7px 8px 7px 12px;
     box-sizing: border-box;
     .item-name {
+      position: relative;
       .quest {
         // width: 367px;
         // border-radius: 5px;
@@ -549,6 +743,15 @@ export default class ChangePalletNew extends BasePage {
         font-weight: 600;
         color: black;
       }
+      .deletebtn {
+        .btn1 {
+          width: 80px;
+          height: 36px;
+          position: absolute;
+          top: 0px;
+          right: 0px;
+        }
+      }
       .details {
         display: flex;
         font-size: 16px;
@@ -840,6 +1043,9 @@ export default class ChangePalletNew extends BasePage {
   .listbottom ::v-deep .uni-input-input {
     border: 1px solid black;
     width: 98%;
+    padding: 10px 5px;
+    box-sizing: border-box;
+    font-weight: 500;
   }
   ::v-deep .u-form-item {
     padding: 6px 0;
diff --git a/src/pages/equipment/Repair/repairingview.vue b/src/pages/equipment/Repair/repairingview.vue
index ec57d3d..6f2b8a4 100644
--- a/src/pages/equipment/Repair/repairingview.vue
+++ b/src/pages/equipment/Repair/repairingview.vue
@@ -9,39 +9,51 @@
       <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">
       <div class="item-name">
+        <div class="quest">工单号: {{ detailsinfolist.orderCode }}</div>
+        <div class="details">
+          <div>设备编码: {{ detailsinfolist.equipmentCode }}</div>
+          <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
+        </div>
+        <div class="details">
+          <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
+          <div>工作中心: {{ detailsinfolist.workshopName }}</div>
+        </div>
+      </div>
+      <div class="item-name item-info">
         <div class="quest">报修信息</div>
         <div class="details">
-          <div>报修人: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修人: {{ detailsinfolist.orderRepairman }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>保修时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>保修时间: {{ detailsinfolist.orderTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>故障时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>报修来源: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修来源: {{ detailsinfolist.orderSource }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <!-- <div class="details">
+          <div>故障时间: {{ detailsinfolist.planWorkshop }}</div>
+          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
+        </div> -->
         <div class="details">
-          <div>故障时间: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>是否立即维修: {{ detailsinfolist.workHandle }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>是否立即维修: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>联系方式: {{ detailsinfolist.orderConnection }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>联系方式: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>故障描述: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
       </div>
@@ -55,7 +67,7 @@
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
           <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="select">
               <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
                 <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
@@ -65,10 +77,10 @@
             </div>
           </div>
           <div class="item1 item2" v-if="item1.standardType == 'quantify'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="input-box" id="input-box1">
               实际值:
-              <input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
+              <input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
               单位:mm
             </div>
           </div>
@@ -82,55 +94,19 @@
         <img @click="linkSparepartlist()" src="../../../static/images/add.png" alt="" />
       </div>
     </div> -->
-    <view class="list" v-for="(item, index) in this.model.rowdata" :key="index">
-      <div class="item-name">
-        <div class="quest">备件申领单</div>
-        <div class="details">
-          <div>件编码: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>备件名称: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请数量: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>备件费用: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>审核人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>审核时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-      </div>
-    </view>
+
     <view class="list listbottom">
       <div class="item-name">
         <div class="quest">维修单</div>
         <u-form class="form" ref="form" label-width="230rpx">
           <u-form-item label="负责人:">
-            {{ detailsinfolist.equipmentCode }}
+            {{ detailsinfolist.workPerson }}
           </u-form-item>
           <!-- 机台 -->
           <u-form-item label="维修结果:">
             <div class="select">
-              <u-radio-group v-model="formdata.detailReach" @change="radioGroupChange1(formdata.detailReac)">
-                <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
+              <u-radio-group v-model="detailsinfolist.workStatus" @change="radioGroupChange1(formdata.workStatus)">
+                <u-radio :disabled="detailsinfolist.detailReach == n.type ? false : true" @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
               </u-radio-group>
@@ -138,55 +114,78 @@
           </u-form-item>
           <!-- 单号 -->
           <u-form-item label="维修费用:">
-            <u-input v-model="orderNoItemList.productCode" placeholder="" />
+            <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
           </u-form-item>
-          <!-- 机台 -->
-          <u-form-item label="维修用时(分钟):">
-            <u-input v-model="orderNoItemList.productSpc" placeholder="" />
+          <!-- <u-form-item label="维修用时(分钟):">
+            <u-input v-model="formdata.productSpc" placeholder="" />
           </u-form-item>
-          <!-- 产品 -->
           <u-form-item label="维修人员签字:">
-            <u-input v-model="orderNoItemList.productName" placeholder="" />
-          </u-form-item>
+            <u-input v-model="formdata.productName" placeholder="" />
+          </u-form-item> -->
+
           <!-- 工单 -->
           <u-form-item label="联系方式:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input :disabled="detailsinfolist.workConnection == null ? true : true" v-model="detailsinfolist.workConnection" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <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="scrollLeft()">
+          <u-form-item label="图片:">
+            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
               <view class="photoList">
-                <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-                  <view class="closeBtn" @click="deleteImg(index)">
+                <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
+                  <!-- <view class="closeBtn" @click="deleteImg1(index)">
                     <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
-                  </view>
-                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
+                  </view> -->
+                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg1(index)"></image>
                 </view>
-                <view class="itemBox chooseBtn" @click="chooseImg">
-                  <view class="inner">
+                <view class="itemBox chooseBtn">
+                  <!-- <view class="inner">
                     <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                     <text class="desc">添加照片</text>
-                  </view>
+                  </view> -->
                 </view>
               </view>
             </scroll-view>
           </u-form-item>
         </u-form>
-        <u-button @click="onSubmit" type="primary">提交</u-button>
+        <!-- <u-button @click="onSubmit" type="primary">提交</u-button> -->
       </div>
     </view>
-    <view class="bottom-bar">
+    <view class="list" v-for="(item, index) in detailsinfolist.applyList" :key="index">
       <div class="item-name">
+        <div class="quest">备件申领单</div>
+        <!-- <div class="deletebtn">
+          <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
+        </div> -->
         <div class="details">
-          <div>点检人: 刘XX</div>
-          <div style="margin-left: 42px">点检时间: 2023-08-09</div>
+          <div>备件编码: {{ item.materialCode }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>是否异常: 是</div>
-          <div style="margin-left: 42px">报修单: 90272931234</div>
+          <div>备件名称: {{ item.materialDesc }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <div class="details">
+          <div>申领数量: {{ item.spareQuantity }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
+        </div>
+        <div class="details">
+          <div>备件费用: {{ item.equipmentCode }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
+        </div>
+        <!-- <div class="details">
+          <div>申请人: {{ item.applyPeople }}</div>
+        </div>
+        <div class="details">
+          <div>申请时间: {{ item.planWorkshop }}</div>
+        </div>
+        <div class="details">
+          <div>审核人: {{ item.planWorkshop }}</div>
+        </div>
+        <div class="details">
+          <div>审核时间: {{ item.planWorkshop }}</div>
+        </div> -->
       </div>
     </view>
     <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
@@ -195,17 +194,17 @@
         <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
         <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
           <view class="photoList">
-            <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-              <view class="closeBtn" @click="deleteImg(index)">
+            <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
+              <!-- <view class="closeBtn" @click="deleteImg(index)">
                 <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
-              </view>
+              </view> -->
               <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
             </view>
-            <view class="itemBox chooseBtn" @click="chooseImg">
-              <view class="inner">
+            <view class="itemBox chooseBtn">
+              <!-- <view class="inner">
                 <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                 <text class="desc">添加照片</text>
-              </view>
+              </view> -->
             </view>
           </view>
         </scroll-view>
@@ -288,6 +287,7 @@ export default class ChangePalletNew extends BasePage {
   filesArr: any = [];
   imgList: any = [];
   imgUrlList: any = [];
+  imgformList: any = [];
   deleteimgUrlList: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
@@ -304,20 +304,41 @@ export default class ChangePalletNew extends BasePage {
   }
   // 输入框焦点
   blur(item, value, index, index1) {
+    console.log(item, value, index, index1);
     this.radiomodal = false;
     this.inputmodal = false;
-    if (value > item.detailUpLimit || value < item.detailDownLimit) {
-      this.equipmentindex.push(index);
-      this.equipmentindex.push(index1);
-      if (item.picturePath != null) {
-        item.picturePath = item.picturePath.split(',');
-        this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
-      } else {
-        this.imgUrlList = [];
-      }
-      // this.inputmodal = true;
-      // this.isshow = true;
-      // this.form = item;
+    // if (value > item.detailUpLimit || value < item.detailDownLimit) {
+    //   this.equipmentindex = [];
+    //   this.equipmentindex.push(index);
+    //   this.equipmentindex.push(index1);
+    //   if (item.picturePath != null) {
+    //     this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+    //     this.imgList = this.imgList.split(',');
+    //   } else {
+    //     this.imgList = [];
+    //   }
+    //   this.inputmodal = true;
+    //   this.isshow = true;
+    //   this.form = item;
+    // }
+  }
+  checkimg(item, value, index, index1) {
+    this.equipmentindex = [];
+    this.radiomodal = false;
+    this.inputmodal = false;
+    this.equipmentindex.push(index);
+    this.equipmentindex.push(index1);
+    if (item.picturePath != null) {
+      this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = this.imgList.split(',');
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
+    } else {
+      this.imgList = [];
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
     }
   }
   changeinput(e) {
@@ -336,12 +357,6 @@ export default class ChangePalletNew extends BasePage {
     this.inputmodal = false;
     this.equipmentindex.push(index);
     this.equipmentindex.push(index1);
-    if (item.picturePath != null) {
-      item.picturePath = item.picturePath.split(',');
-      this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
-    } else {
-      this.imgUrlList = [];
-    }
     // if (value == 1) {
     //   this.isshow = true;
     //   this.radiomodal = true;
@@ -356,11 +371,10 @@ export default class ChangePalletNew extends BasePage {
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
-        orderCode: this.detailsinfo.orderCode,
+        workId: this.detailsinfo.workId,
       };
-      await this.model.getInspectionOrderInfo(query);
-      this.detailsinfocontent = this.model.OrderInfList;
-      this.detailsinfolist = this.model.OrderInfList.equ;
+      await this.model.getInspectionOrderInfo(query.workId);
+      this.detailsinfolist = this.model.OrderInfList;
     }
   }
   created() {
@@ -370,25 +384,42 @@ export default class ChangePalletNew extends BasePage {
     this.current = index;
   }
   //模态框图片上传
+
   confirm() {
     console.log((this as any).uUpload, 'sssss', this.equipmentindex);
     console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
     if (this.radiomodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     } else if (this.inputmodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     }
   }
   cancel() {
-    this.imgUrlList = this.deleteimgUrlList;
+    this.isshow = false;
+    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+      this.imgList = [];
+    } else {
+      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+      this.imgList = this.imgList.split(',');
+    }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
   }
   showScreenImg(i) {
-    let list = this.imgUrlList;
+    let list = this.imgList;
     uni.previewImage({
       current: i,
       urls: list,
@@ -404,6 +435,17 @@ export default class ChangePalletNew extends BasePage {
         // uni.showLoading();
         //console.log('/////',res);
         let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
             url: 'http://192.168.202.20:9000/prod-api/file/upload',
@@ -419,23 +461,19 @@ export default class ChangePalletNew extends BasePage {
             // 	materialCode: this.materialObj.materialCode,
             // },
             success: (res) => {
-              console.log(res);
               uni.hideLoading();
               if (!res.data) {
                 // this.$refs.toastRef.show({
                 // 	type:"error",
-                // 	text:"上传失败！"
+                // 	text:res.msg
                 // })
                 return;
               }
               let data = JSON.parse(res.data);
-              console.log('123dddd', data);
-              this.imgUrlList = [...this.imgList, data.data.url];
+              this.imgList = [...this.imgList, data.data.url];
               //this.imgListName = [...this.imgListName,data.fileName];
-              // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
               //this.picUrls = this.imgList.join(",");
               //this.picNames = this.imgListName.join(",");
-              console.log('this.imgList', this.imgList);
               uni.hideLoading();
             },
             fail: (err) => {
@@ -452,8 +490,86 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   deleteImg(index) {
-    this.deleteimgUrlList = JSON.parse(JSON.stringify(this.imgUrlList));
-    this.imgUrlList.splice(index, 1);
+    this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath));
+    this.imgList = this.imgList.split(',');
+    this.imgList.splice(index, 1);
+  }
+  scrollLeft1() {
+    return 222 * (this.imgformList.length + 1);
+  }
+  showScreenImg1(i) {
+    let list = this.imgformList;
+    uni.previewImage({
+      current: i,
+      urls: list,
+      // loop: true
+    });
+  }
+  chooseImg1() {
+    uni.chooseImage({
+      count: 9, //默认9
+      // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        // uni.showLoading();
+        //console.log('/////',res);
+        let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
+        tempFilePaths.map((item) => {
+          uni.uploadFile({
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
+            fileType: 'image',
+            filePath: item,
+            header: {
+              Authorization: 'Bearer ' + session.user?.access_token,
+              // 'cosmo-env-sitecode': this.$store.state.siteCode
+            },
+            name: 'file',
+            // formData: {
+            // 	materialCode: this.materialObj.materialCode,
+            // },
+            success: (res) => {
+              uni.hideLoading();
+              if (!res.data) {
+                // this.$refs.toastRef.show({
+                // 	type:"error",
+                // 	text:res.msg
+                // })
+                return;
+              }
+              let data = JSON.parse(res.data);
+              this.imgformList = [...this.imgformList, data.data.url];
+              //this.imgListName = [...this.imgListName,data.fileName];
+              //this.picUrls = this.imgList.join(",");
+              //this.picNames = this.imgListName.join(",");
+              uni.hideLoading();
+            },
+            fail: (err) => {
+              console.log(err);
+              // this.$refs.toastRef.show({
+              // 	type:"error",
+              // 	text:"上传失败！"
+              // })
+              uni.hideLoading();
+            },
+          });
+        });
+      },
+    });
+  }
+  deleteImg1(index) {
+    this.imgformList.splice(index, 1);
   }
   scanCodeOne() {
     uni.scanCode({
@@ -640,6 +756,11 @@ export default class ChangePalletNew extends BasePage {
         }
       }
     }
+    .item-info {
+      border: rgba(121, 121, 121, 1) solid 1px;
+      padding: 7px 8px 7px 8px;
+      border-radius: 5px;
+    }
     .single-left {
       display: flex;
       // align-items: center;
@@ -840,6 +961,9 @@ export default class ChangePalletNew extends BasePage {
   .listbottom ::v-deep .uni-input-input {
     border: 1px solid black;
     width: 98%;
+    padding: 10px 5px;
+    box-sizing: border-box;
+    font-weight: 500;
   }
   ::v-deep .u-form-item {
     padding: 6px 0;
diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue
index ed09e1e..ad944bd 100644
--- a/src/pages/equipment/Repairbx/index.vue
+++ b/src/pages/equipment/Repairbx/index.vue
@@ -33,6 +33,9 @@
         </div>
         <u-form class="form listform" ref="form" label-width="140rpx">
           <!-- 机台 -->
+          <u-form-item label="联系方式:">
+            <u-input v-model="formdata.orderConnection" placeholder="" type="text" />
+          </u-form-item>
           <u-form-item label="故障描述:">
             <u-input v-model="formdata.orderDesc" placeholder="" type="textarea" />
           </u-form-item>
@@ -136,6 +139,8 @@ export default class ChangePalletNew extends BasePage {
     orderDesc: '',
     orderBreakdownTime: '',
     fileList: '',
+    orderConnection: '',
+    orderRepairman: '',
   };
   orderBreakdownTime: any = '';
   isaccord = false;
@@ -226,6 +231,8 @@ export default class ChangePalletNew extends BasePage {
       orderBreakdownTime: this.formdata.orderBreakdownTime,
       fileList: fileList,
       orderSource: '手持PDA',
+      orderRepairman: '',
+      orderConnection: this.formdata.orderConnection,
       //productionState: this.productCodeList.value,
     };
     console.log(params, this.formdata, this.imgUrlList);
diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue
index 761ed21..f731e3c 100644
--- a/src/pages/equipment/Spotcheck/details.vue
+++ b/src/pages/equipment/Spotcheck/details.vue
@@ -295,7 +295,7 @@ export default class ChangePalletNew extends BasePage {
         //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: '/dev-api/file/upload',
+            url: 'http://192.168.202.20:9000/prod-api/file/upload',
             //url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
diff --git a/src/pages/equipment/Upkeep/Sparepartlist.vue b/src/pages/equipment/Upkeep/Sparepartlist.vue
index 3f276f0..bf1079f 100644
--- a/src/pages/equipment/Upkeep/Sparepartlist.vue
+++ b/src/pages/equipment/Upkeep/Sparepartlist.vue
@@ -9,7 +9,7 @@
     </view>
     <view class="single-left">
       <view>备件名称:</view>
-      <u-search placeholder="请输入" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+      <u-search placeholder="请输入" @search="search()" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
       <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
     </view>
     <view style="margin: 20px">
@@ -27,6 +27,12 @@
         </u-col>
       </u-row>
     </view>
+    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm()">
+      <div class="form">
+        <div class="formlable">申领数量</div>
+        <u-input style="" v-model="number1" placeholder="" type="number" />
+      </div>
+    </u-modal>
     <u-toast ref="uToast" />
   </view>
 </template>
@@ -53,829 +59,51 @@ export default class ProductionQtyInsplist extends BasePage {
     },
     {
       label: '备件名称',
-      key: 'rfid',
+      key: 'materialDesc',
       width: 320,
     },
     {
       label: '备件编码',
-      key: 'rfid',
+      key: 'materialCode',
       width: 320,
     },
     {
-      label: '库存数量',
-      key: 'orderCode',
+      label: '总数量',
+      key: 'amount',
     },
     {
-      label: '机台',
-      key: 'machineName',
-    },
-    {
-      label: '产品',
-      key: 'productName',
-      width: 220,
-    },
-    {
-      label: '工单',
-      key: 'workorderCode',
-      width: 220,
+      label: '冻结数量',
+      key: 'storageAmount',
     },
     // {
-    //   label: '是否合格',
-    //   key: 'licensePlateNumber',
+    //   label: '产品',
+    //   key: 'productName',
+    //   width: 220,
     // },
-    {
-      label: '不良描述',
-      key: 'badMeg',
-    },
     // {
-    //   label: '照片',
-    //   key: 'checkPeople',
+    //   label: '工单',
+    //   key: 'workorderCode',
+    //   width: 220,
+    // },
+    // {
+    //   label: '不良描述',
+    //   key: 'badMeg',
     // },
   ];
-  tableData: any = [
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:09:06',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'fcc79188e5814d20823bec29b33d2805',
-      rfid: 'S0000286',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H15',
-      machineName: '烘房15',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:04:47',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'c58ab2b76a9d4148bd0d77a2bbb75374',
-      rfid: 'S0000145',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H18',
-      machineName: '烘房18',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 14:01:32',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '123895b70acc4cf19a160b2b56c76a11',
-      rfid: 'S0000480',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500013-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500013',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H61',
-      machineName: '烘房61',
-      badMeg: null,
-      productId: null,
-      productCode: '000000020000000292',
-      productName: 'Φ125mm无烟白坯',
-      productSpc: 'Φ125mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:50:59',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '1ad4fe9ec1a545d8a1b170f36ff18bd0',
-      rfid: 'S0000267',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:49:45',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '27fa98d1f37b45f885bae71b08b24b30',
-      rfid: 'S0000067',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H18',
-      machineName: '烘房18',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:25:23',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'f81731618e524ec8a132d369d97fd864',
-      rfid: 'S0000247',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H14',
-      machineName: '烘房14',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 13:00:34',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '4d3c9130c0344f47b6433a7e6abe29eb',
-      rfid: 'S0000223',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H15',
-      machineName: '烘房15',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 12:56:09',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: '8579731e3d1544ceb5c2c696a7cbadae',
-      rfid: 'S0000050',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500094-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500094',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H16',
-      machineName: '烘房16',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000280',
-      productName: 'Φ130mm微烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:19:36',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'a2863d392dab4caa92289c2f27522f7e',
-      rfid: 'S0000592',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H11',
-      machineName: '烘房11',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-    {
-      createBy: 'mobile',
-      createTime: '2023-11-06 10:14:12',
-      updateBy: null,
-      updateTime: null,
-      remark: null,
-      poolName: null,
-      deptId: null,
-      id: 'ea26dfe075584bc5ae277337194975a8',
-      rfid: 'S0000565',
-      factoryId: null,
-      factoryCode: '999',
-      workorderId: null,
-      workorderCode: 'DD2023110500095-1',
-      workorderName: null,
-      orderId: null,
-      orderCode: 'DD2023110500095',
-      workBatchCode: null,
-      machineId: null,
-      machineCode: 'H17',
-      machineName: '烘房17',
-      badMeg: null,
-      productId: null,
-      productCode: '20000000284',
-      productName: 'Φ130mm无烟免拆白坯',
-      productSpc: 'Φ130mm',
-      isqua: '1',
-      fileList: [],
-      fileId: '',
-      attr1: null,
-      attr2: null,
-      attr3: null,
-      attr4: null,
-      equipmentTypeCode: null,
-      equipmentCode: null,
-      equipmentName: null,
-      itemCode: null,
-      itemName: null,
-    },
-  ];
+  tableData: any = [];
   orderNo: any = '';
   shouciFocus = true;
+  // 详细
+  detailsinfo: any = {};
+  detailsinfolist: any = {};
+  detailsinfocontent: any = {};
+  // 模态框
+  isshow = false;
+  inputmodal = false;
+  isvalue = false;
+  ischecked = false;
+  radiomodal = false;
+  number1: any = '';
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -886,6 +114,105 @@ export default class ProductionQtyInsplist extends BasePage {
   // }
   onShow() {
     // this.query();
+    console.log(2, this.model.rowdata);
+  }
+  confirm() {
+    if (this.number1 == '' || this.number1 == null) {
+      (this.$refs.uToast as any).show({
+        title: '请输入申领数量',
+        type: 'default',
+      });
+      this.isshow = true;
+      return;
+    }
+    var bool = null;
+    let amount = this.rowdata.amount;
+    let storageAmount = this.rowdata.storageAmount;
+    let maxnumber = parseInt(amount) - parseInt(storageAmount);
+    if (this.number1 > maxnumber) {
+      (this.$refs.uToast as any).show({
+        title: '输入的申领数量不符合',
+        type: 'default',
+      });
+      this.isshow = true;
+      return;
+    }
+    if (this.model.rowdata.length > 0) {
+      bool = this.model.rowdata.some((item) => item.materialCode == this.rowdata.materialCode);
+      console.log(bool);
+      if (!bool) {
+        this.rowdata.spareQuantity = this.number1;
+        this.model.rowdata.push(this.rowdata);
+        // uni.navigateTo({
+        //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+        // });
+        uni.navigateBack({});
+      }
+      if (bool) {
+        this.model.rowdata.forEach((item) => {
+          if (item.materialCode == this.rowdata.materialCode) {
+            let spareQuantity = parseInt(item.spareQuantity) + parseInt(this.number1);
+            let amount = this.rowdata.amount;
+            let storageAmount = this.rowdata.storageAmount;
+            let maxnumber = parseInt(amount) - parseInt(storageAmount);
+            if (spareQuantity > maxnumber) {
+              (this.$refs.uToast as any).show({
+                title: '输入的申领数量不符合',
+                type: 'default',
+              });
+              this.isshow = true;
+              return;
+            }
+            item.spareQuantity = parseInt(item.spareQuantity) + parseInt(this.number1);
+            // console.log(this.detailsinfo)
+            // uni.navigateTo({
+            //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+            // });
+            uni.navigateBack({});
+            // uni.navigateBack({});
+          }
+        });
+
+        // this.rowdata
+        // (this.$refs.uToast as any).show({
+        //   title: '请勿重复申领',
+        //   type: 'default',
+        // });
+        // _this.customToast('请勿重复申领');
+      }
+    } else {
+      this.rowdata.spareQuantity = this.number1;
+      this.model.rowdata.push(this.rowdata);
+      // uni.navigateTo({
+      //   url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+      // });
+      uni.navigateBack({});
+    }
+    console.log(this.model.rowdata, this.page, this.rowdata);
+  }
+  cancel() {
+    this.isshow = false;
+  }
+  goback() {
+    uni.redirectTo({
+      url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+    });
+  }
+  async onLoad(options) {
+    let str = decodeURIComponent(options.listitem);
+    if (str) {
+      this.detailsinfo = JSON.parse(str);
+      let query = {
+        pageNum: 1,
+        pageSize: 10000,
+        materialDesc: this.orderNo,
+      };
+      await this.model.queryhandChecklist(query);
+      this.tableData = this.model.Checklist;
+      this.tableData.map((item, index) => {
+        item.index = index + 1;
+      });
+    }
   }
   changeContent(e) {
     //console.log('eee', e.data);
@@ -900,49 +227,28 @@ export default class ProductionQtyInsplist extends BasePage {
   onSubmit() {
     //debugger
     //console.log('xssss',this.rowdata);
-    var bool = null;
+
     if (JSON.stringify(this.rowdata) === '{}' || this.rowdata === undefined) {
       this.customToast('请选择至少一个备件');
       return;
     }
-    if (this.model.rowdata.length > 0) {
-      bool = this.model.rowdata.some((item) => item.rfid == this.rowdata.rfid);
-      console.log(bool);
-      if (!bool) {
-        this.model.rowdata.push(this.rowdata);
-        uni.navigateBack({});
-      }
-      if (bool) {
-        (this.$refs.uToast as any).show({
-          title: '请勿重复申领',
-          type: 'default',
-        });
-        // _this.customToast('请勿重复申领');
-      }
-    } else {
-      this.model.rowdata.push(this.rowdata);
-      uni.navigateBack({});
-    }
+    this.isshow = true;
 
-    console.log(this.model.rowdata, this.page, this.rowdata);
     // this.uni.navigateTo({
     //   url: this.page.mes.ProductionQtyInspDetail,
     // });
   }
-  async query() {
-    //this.tableData = [];
-    await this.model.queryhandChecklist();
-    //console.log('1234567', this.model.Checklist);
+  async search() {
+    let query = {
+      pageNum: 1,
+      pageSize: 10000,
+      materialDesc: this.orderNo,
+    };
+    await this.model.queryhandChecklist(query);
     this.tableData = this.model.Checklist;
     this.tableData.map((item, index) => {
       item.index = index + 1;
     });
-    //console.log('this.tableData', model.Checklist);
-    //this.productCodeList = this.model.productCodeList[0];
-    //this.histroyItem = this.model.orderNoItemList[0];
-  }
-  search(value) {
-    console.log(value);
   }
   histroyItem: any = {};
   barcode: any = '';
@@ -1130,4 +436,22 @@ export default class ProductionQtyInsplist extends BasePage {
 // .wyb-table-scroll-view {
 //   width: auto !important;
 // }
+.form {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+::v-deep .form .uni-input-input {
+  margin-left: 10px;
+  width: 93%;
+  border: 1px solid;
+  padding: 10px 5px;
+  box-sizing: border-box;
+  outline: none;
+  height: 35px;
+  font-weight: 500;
+}
 </style>
diff --git a/src/pages/equipment/Upkeep/details.vue b/src/pages/equipment/Upkeep/details.vue
index 7af3e70..6d430ba 100644
--- a/src/pages/equipment/Upkeep/details.vue
+++ b/src/pages/equipment/Upkeep/details.vue
@@ -18,8 +18,8 @@
           <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
         </div>
         <div class="details">
-          <div>车间: {{ detailsinfocontent.planWorkshop }}</div>
-          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
+          <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
+          <div>工作中心: {{ detailsinfolist.workshopName }}</div>
         </div>
       </div>
       <view class="single-left">
@@ -27,7 +27,7 @@
         <u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
         <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
       </view>
-      <view class="item" v-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
+      <!-- <view class="item" v-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
         <div class="item1">检查项: {{ item.itemName }}</div>
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
@@ -50,10 +50,17 @@
             </div>
           </div>
         </div>
-      </view>
+      </view> -->
     </view>
-    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="是否停机维修" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfocontent)">
-      <div class="upload-name"></div>
+    <u-modal v-model="isshow" class="modal" :show-cancel-button="true" title="" :show-title="true" @cancel="cancel" @confirm="confirm(detailsinfolist)">
+      <div class="form">
+        <div class="formlable">是否停机维修</div>
+        <u-radio-group v-model="radio" @change="radioGroupChange1(radio)">
+          <u-radio v-for="(item, index) in radioList" :key="index" :name="item.type" :disabled="item.disabled">
+            {{ item.name }}
+          </u-radio>
+        </u-radio-group>
+      </div>
     </u-modal>
     <u-toast ref="uToast" />
   </view>
@@ -65,6 +72,7 @@ import model from './model';
 import chooseOne from '@/components/choose-one/choose-one.vue';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
+import moment from 'moment';
 //import store from '@/store';
 @Component({
   components: {
@@ -125,6 +133,19 @@ export default class ChangePalletNew extends BasePage {
   deleteimgUrlListcope: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
+  radioList: any = [
+    {
+      name: '停机',
+      disabled: false,
+      type: 1,
+    },
+    {
+      name: '不停机',
+      disabled: false,
+      type: 0,
+    },
+  ];
+  radio: any = null;
 
   async onReady() {
     //await this.model.getpalletLocation();
@@ -183,16 +204,18 @@ export default class ChangePalletNew extends BasePage {
       this.form = item;
     }
   }
+  radioGroupChange1(value) {
+    console.log(value);
+  }
   async onLoad(options) {
     let str = decodeURIComponent(options.listitem);
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
-        orderCode: this.detailsinfo.orderCode,
+        workId: this.detailsinfo.workId,
       };
-      await this.model.getInspectionOrderInfo(query);
-      this.detailsinfocontent = this.model.OrderInfList;
-      this.detailsinfolist = this.model.OrderInfList.equ;
+      await this.model.getInspectionOrderInfo(query.workId);
+      this.detailsinfolist = this.model.OrderInfList;
     }
   }
   created() {
@@ -205,19 +228,49 @@ export default class ChangePalletNew extends BasePage {
   confirm(item) {
     this.linkrepairing(item);
   }
-  linkrepairing(item) {
-    uni.navigateTo({
-      url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
-    });
+  async linkrepairing(item) {
+    console.log(this.radio);
+    if (this.radio == null) {
+      (this.$refs.uToast as any).show({
+        title: '请选择是否停机维修',
+        type: 'default',
+      });
+      this.isshow = true;
+      return;
+    }
+
+    let query = {
+      workId: item.workId,
+      workCode: item.workCode,
+      workDownMachine: this.radio,
+      workStartTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+    };
+    console.log(query);
+    await this.model.updateInspectionRecord(query);
+    if (this.model.SubmitCode.code == 200) {
+      // (this.$refs.uToast as any).show({
+      //   title: '成功',
+      //   type: 'success',
+      // });
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+      this.isshow = false;
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'error',
+      });
+    }
   }
   cancel() {
     this.isshow = false;
-    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
-      this.imgList = [];
-    } else {
-      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
-      this.imgList = this.imgList.split(',');
-    }
+    // if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+    //   this.imgList = [];
+    // } else {
+    //   this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+    //   this.imgList = this.imgList.split(',');
+    // }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
@@ -252,7 +305,7 @@ export default class ChangePalletNew extends BasePage {
         //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: '/dev-api/file/upload',
+            url: 'http://192.168.202.20:9000/prod-api/file/upload',
             //url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
@@ -579,5 +632,13 @@ export default class ChangePalletNew extends BasePage {
     max-height: 15px;
     font-size: 13px;
   }
+  .form {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+  }
 }
 </style>
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index b17bc85..3d6d9e4 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="goback()" />
       </view>
       <view class="title">维修</view>
       <view class="right"></view>
@@ -11,26 +11,32 @@
     <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">
       <div class="list-top">
-        <div class="name">工单号: {{ item.planCode }}</div>
-        <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
+        <div class="name">工单号: {{ item.workCode }}</div>
+        <div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
         <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
-      <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
-      <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
-      <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
+      <div class="item1">设备编码: {{ item.equipmentCode }}</div>
+      <div class="item1">维修负责人: {{ item.workPerson }}</div>
+      <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
+      <div class="item1">维修人员: {{ item.workPerson }}</div>
+      <div class="item1">维修组: {{ item.teamName }}</div>
+      <div class="item1">维修组人员: {{ item.teamPerson }}</div>
+      <div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div>
     </view>
 
     <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index">
       <div class="list-top">
-        <div class="name">工单号: {{ item.planCode }}</div>
-        <div class="tag">{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}</div>
+        <div class="name">工单号: {{ item.workCode }}</div>
+        <div class="tag">{{ item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成' }}</div>
         <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
-      <div class="item1">车间编码: {{ item.planWorkshop }}</div>
-      <div class="item1">周期: {{ item.planLoop }}</div>
-      <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
-      <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
+      <div class="item1">设备编码: {{ item.equipmentCode }}</div>
+      <div class="item1">维修负责人: {{ item.workPerson }}</div>
+      <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
+      <div class="item1">维修人员: {{ item.workPerson }}</div>
+      <div class="item1">维修组: {{ item.teamName }}</div>
+      <div class="item1">维修组人员: {{ item.teamPerson }}</div>
+      <div class="item1">是否立即维修: {{ item.workDownMachine == 1 ? '是' : '否' }}</div>
     </view>
   </view>
 </template>
@@ -97,6 +103,7 @@ export default class ChangePalletNew extends BasePage {
     },
   ];
   userinfo: any = null;
+  Sparepartlist: any = [];
   // remove: any = {};
   async onReady() {
     //await this.model.getpalletLocation();
@@ -106,7 +113,12 @@ export default class ChangePalletNew extends BasePage {
     console.log(uni.getStorageSync('userinfo'));
     this.userinfo = uni.getStorageSync('userinfo');
     if (this.userinfo) {
-      await this.model.getTodayTask(this.userinfo.userId);
+      let query = {
+        userId: this.userinfo.userId,
+        workStatus: '0',
+        workOutsource: '0',
+      };
+      await this.model.getTodayTask(query);
       console.log(model.orderNoItemList);
       this.listdata = model.orderNoItemList;
     }
@@ -134,7 +146,7 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userId,
-          workStatus: '1',
+          workStatus: '0',
           workOutsource: '0',
         };
         await this.model.getTaskRecord(query);
@@ -143,16 +155,45 @@ export default class ChangePalletNew extends BasePage {
     }
   }
   linkdetails(item) {
+    this.model.rowdatanull();
+    // this.model.rowdata = []
+    // item.workStatus == 0 ? '待维修' : item.workStatus == 1 ? '维修完成' : item.workStatus == 2 ? '维修中' : '维修未完成';
+    if (item.workStatus == 0) {
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else if (item.workStatus == 2 || item.workStatus == 3) {
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    }
+  }
+  goback() {
     uni.navigateTo({
-      url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      url: `/pages/equipment/index`,
     });
   }
   linkdetailscheck(item) {
-    this.ischecked = true;
-    item.ischecked = true;
-    uni.navigateTo({
-      url: `/pages/equipment/Repair/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)),
-    });
+    this.model.rowdatanull();
+    if (item.workStatus == 0) {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else if (item.workStatus == 2 || item.workStatus == 3) {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairing?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    } else {
+      this.ischecked = true;
+      item.ischecked = true;
+      uni.navigateTo({
+        url: `/pages/equipment/Repair/repairingview?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      });
+    }
   }
 }
 </script>
diff --git a/src/pages/equipment/Upkeep/model.ts b/src/pages/equipment/Upkeep/model.ts
index a1f1535..b0a3875 100644
--- a/src/pages/equipment/Upkeep/model.ts
+++ b/src/pages/equipment/Upkeep/model.ts
@@ -2,48 +2,33 @@ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decor
 import store from '@/store';
 import http from '@/utils/request';
 import { url } from '@/utils/url';
-import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
   dynamic: true,
   store,
-  name: 'page.equipment.Upkeep',
+  name: 'page.equipment.Repair',
 })
 export class ChangePalletNew extends VuexModule {
   rowdata: any = [];
   orderNoItemList: any = [];
   getTaskRecordList: any = [];
-  // 点检：spotInspection
-  // 巡检：inspection
-  // 保养：maintenance
-  async getTodayTask(userId: any) {
-    const result: any = await http.get(url.lanjuequipment.product.Inspection.getTodayTask, {
-      //loginName: session.loginName,
-      params: {
-        userId: userId,
-        planType: 'maintenance',
-      },
-    });
+  @MutationAction
+  async getTodayTask(params: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.getTodayTask, { params: params });
     const orderNoItemList = result.data;
     return { orderNoItemList };
   }
   @MutationAction
-  async getTaskRecord(userId: any) {
-    const result: any = await http.get(url.lanjuequipment.product.Inspection.getTaskRecord, {
-      //loginName: session.loginName,
-      params: {
-        userId: userId,
-        planType: 'maintenance',
-      },
-    });
+  async getTaskRecord(params: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.getTaskRecord, { params: params });
     const getTaskRecordList = result.data;
     return { getTaskRecordList };
   }
   //巡检列表巡检记录
   OrderInfList: any = [];
   @MutationAction
-  async getInspectionOrderInfo(params: any) {
-    const result: any = await http.post(url.lanjuequipment.product.Inspection.getInspectionOrderInfo, params);
+  async getInspectionOrderInfo(workId: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.selectPdaRepairWorkOrderDetails + '/' + workId);
     const OrderInfList: [] = result.data;
     return { OrderInfList };
   }
@@ -51,25 +36,30 @@ export class ChangePalletNew extends VuexModule {
   //巡检提交
   @MutationAction
   async updateInspectionRecord(params: any) {
-    const result: any = await http.post(url.lanjuequipment.product.Inspection.updateInspectionRecord, params);
-    const SubmitCode: [] = result.code;
+    const result: any = await http.put(url.lanjuequipment.product.Repair.updateDowntime, params);
+    const SubmitCode: [] = result;
+    return { SubmitCode };
+  }
+  @MutationAction
+  async updateMaintenanceRecords(params: any) {
+    const result: any = await http.put(url.lanjuequipment.product.Repair.updateMaintenanceRecords, params);
+    const SubmitCode: [] = result;
     return { SubmitCode };
   }
   Checklist: any = [];
   @MutationAction
-  async queryhandChecklist() {
-    const result: any = await http.get(url.lanjumes.product.queryhandChecklist, {
-      //loginName: session.loginName,
-      params: {
-        factoryCode: session.FactoryCode,
-        createBy: session.user?.loginName,
-      },
-    });
+  async queryhandChecklist(params: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.list, { params: params });
     const Checklist: any = result.rows;
     console.log('this.tableData', Checklist);
     // debugger
     return { Checklist };
   }
+  @MutationAction
+  async rowdatanull() {
+    const rowdata: [] = [];
+    return { rowdata };
+  }
 }
 
 export default getModule(ChangePalletNew);
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue
index 17a5e62..3f3fba2 100644
--- a/src/pages/equipment/Upkeep/repairing.vue
+++ b/src/pages/equipment/Upkeep/repairing.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="goback()" />
       </view>
       <view class="title">巡检详情</view>
       <view class="right"></view>
@@ -13,35 +13,35 @@
       <div class="item-name">
         <div class="quest">报修信息</div>
         <div class="details">
-          <div>报修人: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修人: {{ detailsinfolist.orderRepairman }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>保修时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>保修时间: {{ detailsinfolist.orderTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>故障时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>报修来源: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修来源: {{ detailsinfolist.orderSource }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <!-- <div class="details">
+          <div>故障时间: {{ detailsinfolist.planWorkshop }}</div>
+          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
+        </div> -->
         <div class="details">
-          <div>故障时间: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>是否立即维修: {{ detailsinfolist.workHandle }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>是否立即维修: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>联系方式: {{ detailsinfolist.orderConnection }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>联系方式: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>故障描述: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
       </div>
@@ -58,7 +58,7 @@
             <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="select">
               <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
-                <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
+                <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
               </u-radio-group>
@@ -79,44 +79,43 @@
       <!-- <u-button type="success">点击进行备件申领</u-button> -->
       <div class="Pickup">点击进行备件申领</div>
       <div class="Pickupclick">
-        <img @click="linkSparepartlist()" src="../../../static/images/add.png" alt="" />
+        <img @click="linkSparepartlist(detailsinfolist)" src="../../../static/images/add.png" alt="" />
       </div>
     </div>
-    <view class="list" v-for="(item, index) in this.model.rowdata" :key="index">
+    <view class="list" v-for="(item, index) in this.Sparepartlist" :key="index">
       <div class="item-name">
         <div class="quest">备件申领单</div>
+        <div class="deletebtn">
+          <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
+        </div>
         <div class="details">
-          <div>件编码: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件编码: {{ item.materialCode }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件名称: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件名称: {{ item.materialDesc }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>申请数量: {{ detailsinfolist.equipmentCode }}</div>
+          <div>申领数量: {{ item.spareQuantity }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>备件费用: {{ detailsinfolist.equipmentCode }}</div>
+          <div>备件费用: {{ item.equipmentCode }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
-        <div class="details">
-          <div>申请人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+        <!-- <div class="details">
+          <div>申请人: {{ item.applyPeople }}</div>
         </div>
         <div class="details">
-          <div>申请时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+          <div>申请时间: {{ item.planWorkshop }}</div>
         </div>
         <div class="details">
-          <div>审核人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
+          <div>审核人: {{ item.planWorkshop }}</div>
         </div>
         <div class="details">
-          <div>审核时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
+          <div>审核时间: {{ item.planWorkshop }}</div>
+        </div> -->
       </div>
     </view>
     <view class="list listbottom">
@@ -124,12 +123,12 @@
         <div class="quest">维修单</div>
         <u-form class="form" ref="form" label-width="230rpx">
           <u-form-item label="负责人:">
-            {{ detailsinfolist.equipmentCode }}
+            {{ detailsinfolist.workPerson }}
           </u-form-item>
           <!-- 机台 -->
           <u-form-item label="维修结果:">
             <div class="select">
-              <u-radio-group v-model="formdata.detailReach" @change="radioGroupChange1(formdata.detailReac)">
+              <u-radio-group v-model="formdata.workStatus" @change="radioGroupChange1(formdata.workStatus)">
                 <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
@@ -138,33 +137,32 @@
           </u-form-item>
           <!-- 单号 -->
           <u-form-item label="维修费用:">
-            <u-input v-model="orderNoItemList.productCode" placeholder="" />
+            <u-input v-model="formdata.workCost" placeholder="" />
           </u-form-item>
-          <!-- 机台 -->
-          <u-form-item label="维修用时(分钟):">
-            <u-input v-model="orderNoItemList.productSpc" placeholder="" />
+          <!-- <u-form-item label="维修用时(分钟):">
+            <u-input v-model="formdata.productSpc" placeholder="" />
           </u-form-item>
-          <!-- 产品 -->
           <u-form-item label="维修人员签字:">
-            <u-input v-model="orderNoItemList.productName" placeholder="" />
-          </u-form-item>
+            <u-input v-model="formdata.productName" placeholder="" />
+          </u-form-item> -->
+
           <!-- 工单 -->
           <u-form-item label="联系方式:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input v-model="formdata.workConnection" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input v-model="formdata.workReason" placeholder="" />
           </u-form-item>
           <u-form-item label="上传图片:">
-            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
+            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
               <view class="photoList">
-                <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-                  <view class="closeBtn" @click="deleteImg(index)">
+                <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
+                  <view class="closeBtn" @click="deleteImg1(index)">
                     <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
                   </view>
-                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
+                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg1(index)"></image>
                 </view>
-                <view class="itemBox chooseBtn" @click="chooseImg">
+                <view class="itemBox chooseBtn" @click="chooseImg1">
                   <view class="inner">
                     <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                     <text class="desc">添加照片</text>
@@ -195,7 +193,7 @@
         <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
         <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
           <view class="photoList">
-            <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
+            <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
               <view class="closeBtn" @click="deleteImg(index)">
                 <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
               </view>
@@ -211,6 +209,7 @@
         </scroll-view>
       </div>
     </u-modal>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -266,12 +265,12 @@ export default class ChangePalletNew extends BasePage {
   ];
   listselect1: any = [
     {
-      type: 0,
+      type: 1,
       name: '已完成',
       radiovalue: null,
     },
     {
-      type: 1,
+      type: 3,
       name: '未完成',
       radiovalue: null,
     },
@@ -288,43 +287,62 @@ export default class ChangePalletNew extends BasePage {
   filesArr: any = [];
   imgList: any = [];
   imgUrlList: any = [];
-  deleteimgUrlList: any = [];
+  deleteimgList: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
   formdata: any = {};
+  Sparepartlist: any = [];
+  imgformList: any = [];
+  deleteimgList1: any = [];
+  isvalue = false;
   async onReady() {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
-    this.model.rowdata = [];
-    console.log(0);
+    // this.Sparepartlist = []
+    console.log(0, this.model.rowdata, this.Sparepartlist);
   }
   onShow() {
     this.onLoad;
-    console.log(2, this.model.rowdata);
+    this.blur;
+    if (this.model.rowdata.length == 0) {
+      this.model.rowdatanull();
+    } else {
+      this.Sparepartlist = this.model.rowdata;
+    }
+    console.log(1, this.model.rowdata, this.Sparepartlist);
   }
   // 输入框焦点
   blur(item, value, index, index1) {
+    console.log(item, value, index, index1);
     this.radiomodal = false;
     this.inputmodal = false;
+    if (value == null || value == '') {
+      this.isvalue = true;
+    } else {
+      this.isvalue = false;
+    }
+    console.log(this.isvalue, value == null, value == '');
     if (value > item.detailUpLimit || value < item.detailDownLimit) {
+      this.equipmentindex = [];
       this.equipmentindex.push(index);
       this.equipmentindex.push(index1);
       if (item.picturePath != null) {
-        item.picturePath = item.picturePath.split(',');
-        this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
+        this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+        this.imgList = this.imgList.split(',');
       } else {
-        this.imgUrlList = [];
+        this.imgList = [];
       }
-      // this.inputmodal = true;
-      // this.isshow = true;
-      // this.form = item;
+      this.inputmodal = true;
+      this.isshow = true;
+      this.form = item;
     }
   }
+
   changeinput(e) {
-    console.log(e);
+    console.log(e, '11111111');
   }
   input(e) {
-    console.log(e);
+    console.log(e, '00000000');
   }
   //单选
   radioChange(e) {
@@ -332,21 +350,23 @@ export default class ChangePalletNew extends BasePage {
   }
   // 选中任一radio时，由radio-group触发
   radioGroupChange(item, value, index, index1) {
+    console.log(item, value, index, index1);
+    this.equipmentindex = [];
     this.radiomodal = false;
     this.inputmodal = false;
     this.equipmentindex.push(index);
     this.equipmentindex.push(index1);
     if (item.picturePath != null) {
-      item.picturePath = item.picturePath.split(',');
-      this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = this.imgList.split(',');
     } else {
-      this.imgUrlList = [];
+      this.imgList = [];
+    }
+    if (value == 1) {
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
     }
-    // if (value == 1) {
-    //   this.isshow = true;
-    //   this.radiomodal = true;
-    //   this.form = item;
-    // }
   }
   radioGroupChange1(item) {
     console.log(item);
@@ -356,15 +376,20 @@ export default class ChangePalletNew extends BasePage {
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
-        orderCode: this.detailsinfo.orderCode,
+        workId: this.detailsinfo.workId,
       };
-      await this.model.getInspectionOrderInfo(query);
-      this.detailsinfocontent = this.model.OrderInfList;
-      this.detailsinfolist = this.model.OrderInfList.equ;
+      await this.model.getInspectionOrderInfo(query.workId);
+      this.detailsinfolist = this.model.OrderInfList;
     }
   }
+  goback() {
+    uni.redirectTo({
+      url: `/pages/equipment/Repair/index?listitem=` + encodeURIComponent(JSON.stringify(this.detailsinfo)),
+    });
+  }
   created() {
     this.onLoad;
+    console.log(2, this.model.rowdata, this.Sparepartlist);
   }
   change(index) {
     this.current = index;
@@ -374,21 +399,37 @@ export default class ChangePalletNew extends BasePage {
     console.log((this as any).uUpload, 'sssss', this.equipmentindex);
     console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
     if (this.radiomodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     } else if (this.inputmodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     }
   }
   cancel() {
-    this.imgUrlList = this.deleteimgUrlList;
+    this.isshow = false;
+    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+      this.imgList = [];
+    } else {
+      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+      this.imgList = this.imgList.split(',');
+    }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
   }
   showScreenImg(i) {
-    let list = this.imgUrlList;
+    let list = this.imgList;
     uni.previewImage({
       current: i,
       urls: list,
@@ -404,10 +445,21 @@ export default class ChangePalletNew extends BasePage {
         // uni.showLoading();
         //console.log('/////',res);
         let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
-            url: 'http://192.168.202.20:9000/prod-api/file/upload',
-            //url: '/dev-api/file/upload',
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
             fileType: 'image',
             filePath: item,
             header: {
@@ -419,23 +471,19 @@ export default class ChangePalletNew extends BasePage {
             // 	materialCode: this.materialObj.materialCode,
             // },
             success: (res) => {
-              console.log(res);
               uni.hideLoading();
               if (!res.data) {
                 // this.$refs.toastRef.show({
                 // 	type:"error",
-                // 	text:"上传失败！"
+                // 	text:res.msg
                 // })
                 return;
               }
               let data = JSON.parse(res.data);
-              console.log('123dddd', data);
-              this.imgUrlList = [...this.imgList, data.data.url];
+              this.imgList = [...this.imgList, data.data.url];
               //this.imgListName = [...this.imgListName,data.fileName];
-              // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
               //this.picUrls = this.imgList.join(",");
               //this.picNames = this.imgListName.join(",");
-              console.log('this.imgList', this.imgList);
               uni.hideLoading();
             },
             fail: (err) => {
@@ -452,8 +500,91 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   deleteImg(index) {
-    this.deleteimgUrlList = JSON.parse(JSON.stringify(this.imgUrlList));
-    this.imgUrlList.splice(index, 1);
+    this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath));
+    this.imgList = this.imgList.split(',');
+    this.imgList.splice(index, 1);
+  }
+  scrollLeft1() {
+    return 222 * (this.imgformList.length + 1);
+  }
+
+  showScreenImg1(i) {
+    let list = this.imgformList;
+    uni.previewImage({
+      current: i,
+      urls: list,
+      // loop: true
+    });
+  }
+  chooseImg1() {
+    uni.chooseImage({
+      count: 9, //默认9
+      // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        // uni.showLoading();
+        //console.log('/////',res);
+        let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
+        tempFilePaths.map((item) => {
+          uni.uploadFile({
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
+            fileType: 'image',
+            filePath: item,
+            header: {
+              Authorization: 'Bearer ' + session.user?.access_token,
+              // 'cosmo-env-sitecode': this.$store.state.siteCode
+            },
+            name: 'file',
+            // formData: {
+            // 	materialCode: this.materialObj.materialCode,
+            // },
+            success: (res) => {
+              uni.hideLoading();
+              if (!res.data) {
+                // this.$refs.toastRef.show({
+                // 	type:"error",
+                // 	text:res.msg
+                // })
+                return;
+              }
+              let data = JSON.parse(res.data);
+              this.imgformList = [...this.imgformList, data.data.url];
+              //this.imgListName = [...this.imgListName,data.fileName];
+              //this.picUrls = this.imgList.join(",");
+              //this.picNames = this.imgListName.join(",");
+              uni.hideLoading();
+            },
+            fail: (err) => {
+              console.log(err);
+              // this.$refs.toastRef.show({
+              // 	type:"error",
+              // 	text:"上传失败！"
+              // })
+              uni.hideLoading();
+            },
+          });
+        });
+      },
+    });
+  }
+  deleteImg1(index) {
+    this.imgformList.splice(index, 1);
+  }
+  deleteSparepart(index) {
+    this.model.rowdata.splice(index, 1);
+    this.Sparepartlist = this.model.rowdata;
   }
   scanCodeOne() {
     uni.scanCode({
@@ -467,10 +598,72 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   async onSubmit() {
-    if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+    this.detailsinfolist.detailList.forEach((item) => {
+      if (item.standardList.length > 0) {
+        item.standardList.forEach((item1) => {
+          if (item1.standardType == 'quantify') {
+            if (item1.detailReach == null || item1.detailReach == '') {
+              // console.log(this.isvalue);
+              this.isvalue = true;
+            }
+          }
+        });
+      }
+    });
+    // if (this.orderNo == '' || this.orderNo.length == 0) {
+    //   this.customToast('请输入nficl');
+    //   return;
+    // }
+    console.log(this.detailsinfolist, this.isvalue);
+    if (this.isvalue) {
+      (this.$refs.uToast as any).show({
+        title: '检查标准不能为空',
+        type: 'default',
+      });
       return;
     }
+    if (this.formdata.workStatus == '' || this.formdata.workStatus == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '请选择维修结果',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.formdata.workCost == '' || this.formdata.workCost == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '维修费用不能为空',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.formdata.workConnection == '' || this.formdata.workConnection == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '联系方式不能为空',
+        type: 'default',
+      });
+      return;
+    }
+    let query = this.detailsinfolist;
+    query.applyList = this.Sparepartlist;
+    query.fileList = this.imgList.join(',');
+    query.workStatus = this.formdata.workStatus;
+    query.workCost = this.formdata.workCost;
+    query.workConnection = this.formdata.workConnection;
+    query.workReason = this.formdata.workReason;
+    console.log(query, this.isvalue);
+    await this.model.updateInspectionRecord(query);
+    if (this.model.SubmitCode.code == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'default',
+      });
+      uni.navigateBack({});
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'default',
+      });
+    }
     // if (this.badMeg == '') {
     //   this.customToast('请输入不良描述');
     //   return;
@@ -482,9 +675,9 @@ export default class ChangePalletNew extends BasePage {
       this.isaccord = true;
     }
   }
-  linkSparepartlist() {
+  linkSparepartlist(item) {
     uni.navigateTo({
-      url: `/pages/equipment/Repair/Sparepartlist?listitem=`,
+      url: `/pages/equipment/Repair/Sparepartlist?listitem=` + encodeURIComponent(JSON.stringify(item)),
     });
   }
 }
@@ -537,6 +730,7 @@ export default class ChangePalletNew extends BasePage {
     padding: 7px 8px 7px 12px;
     box-sizing: border-box;
     .item-name {
+      position: relative;
       .quest {
         // width: 367px;
         // border-radius: 5px;
@@ -549,6 +743,15 @@ export default class ChangePalletNew extends BasePage {
         font-weight: 600;
         color: black;
       }
+      .deletebtn {
+        .btn1 {
+          width: 80px;
+          height: 36px;
+          position: absolute;
+          top: 0px;
+          right: 0px;
+        }
+      }
       .details {
         display: flex;
         font-size: 16px;
@@ -840,6 +1043,9 @@ export default class ChangePalletNew extends BasePage {
   .listbottom ::v-deep .uni-input-input {
     border: 1px solid black;
     width: 98%;
+    padding: 10px 5px;
+    box-sizing: border-box;
+    font-weight: 500;
   }
   ::v-deep .u-form-item {
     padding: 6px 0;
diff --git a/src/pages/equipment/Upkeep/repairingview.vue b/src/pages/equipment/Upkeep/repairingview.vue
index ec57d3d..6f2b8a4 100644
--- a/src/pages/equipment/Upkeep/repairingview.vue
+++ b/src/pages/equipment/Upkeep/repairingview.vue
@@ -9,39 +9,51 @@
       <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">
       <div class="item-name">
+        <div class="quest">工单号: {{ detailsinfolist.orderCode }}</div>
+        <div class="details">
+          <div>设备编码: {{ detailsinfolist.equipmentCode }}</div>
+          <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div>
+        </div>
+        <div class="details">
+          <!-- <div>车间: {{ detailsinfocontent.planWorkshop }}</div> -->
+          <div>工作中心: {{ detailsinfolist.workshopName }}</div>
+        </div>
+      </div>
+      <div class="item-name item-info">
         <div class="quest">报修信息</div>
         <div class="details">
-          <div>报修人: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修人: {{ detailsinfolist.orderRepairman }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>保修时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>保修时间: {{ detailsinfolist.orderTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>故障时间: {{ detailsinfolist.equipmentCode }}</div>
+          <div>故障时间: {{ detailsinfolist.orderBreakdownTime }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>报修来源: {{ detailsinfolist.equipmentCode }}</div>
+          <div>报修来源: {{ detailsinfolist.orderSource }}</div>
           <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <!-- <div class="details">
+          <div>故障时间: {{ detailsinfolist.planWorkshop }}</div>
+          <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div>
+        </div> -->
         <div class="details">
-          <div>故障时间: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>是否立即维修: {{ detailsinfolist.workHandle }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>是否立即维修: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>联系方式: {{ detailsinfolist.orderConnection }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
         <div class="details">
-          <div>联系方式: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>故障描述: {{ detailsinfocontent.planWorkshop }}</div>
+          <div>故障描述: {{ detailsinfolist.workFaultDesc }}</div>
           <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
         </div>
       </div>
@@ -55,7 +67,7 @@
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
           <div class="item1 item2" v-if="item1.standardType == 'qualitative'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="select">
               <u-radio-group v-model="item1.detailReach" @change="radioGroupChange(item1, item1.detailReach, index, index1)">
                 <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="item1.detailReach == n.type ? false : true">
@@ -65,10 +77,10 @@
             </div>
           </div>
           <div class="item1 item2" v-if="item1.standardType == 'quantify'">
-            <div style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
+            <div @click="checkimg(item1, item1.detailReach, index, index1)" style="white-space: nowrap">检查标准: {{ item1.standardName }}</div>
             <div class="input-box" id="input-box1">
               实际值:
-              <input class="input" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
+              <input class="input" :disabled="item1.detailReach == null ? true : true" v-model="item1.detailReach" @blur="blur(item1, item1.detailReach, index, index1)" @change="changeinput(item1)" @input="input(item1)" type="text" name="" id="" />
               单位:mm
             </div>
           </div>
@@ -82,55 +94,19 @@
         <img @click="linkSparepartlist()" src="../../../static/images/add.png" alt="" />
       </div>
     </div> -->
-    <view class="list" v-for="(item, index) in this.model.rowdata" :key="index">
-      <div class="item-name">
-        <div class="quest">备件申领单</div>
-        <div class="details">
-          <div>件编码: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>备件名称: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请数量: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>备件费用: {{ detailsinfolist.equipmentCode }}</div>
-          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>申请时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>审核人: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-        <div class="details">
-          <div>审核时间: {{ detailsinfocontent.planWorkshop }}</div>
-          <!-- <div style="margin-left: 42px">工作中心: {{ detailsinfocontent.workCenterName }}</div> -->
-        </div>
-      </div>
-    </view>
+
     <view class="list listbottom">
       <div class="item-name">
         <div class="quest">维修单</div>
         <u-form class="form" ref="form" label-width="230rpx">
           <u-form-item label="负责人:">
-            {{ detailsinfolist.equipmentCode }}
+            {{ detailsinfolist.workPerson }}
           </u-form-item>
           <!-- 机台 -->
           <u-form-item label="维修结果:">
             <div class="select">
-              <u-radio-group v-model="formdata.detailReach" @change="radioGroupChange1(formdata.detailReac)">
-                <u-radio @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
+              <u-radio-group v-model="detailsinfolist.workStatus" @change="radioGroupChange1(formdata.workStatus)">
+                <u-radio :disabled="detailsinfolist.detailReach == n.type ? false : true" @change="radioChange" v-for="(n, indexn) in listselect1" :key="indexn" :name="n.type">
                   {{ n.name }}
                 </u-radio>
               </u-radio-group>
@@ -138,55 +114,78 @@
           </u-form-item>
           <!-- 单号 -->
           <u-form-item label="维修费用:">
-            <u-input v-model="orderNoItemList.productCode" placeholder="" />
+            <u-input :disabled="detailsinfolist.workCost == null ? true : true" v-model="detailsinfolist.workCost" placeholder="" />
           </u-form-item>
-          <!-- 机台 -->
-          <u-form-item label="维修用时(分钟):">
-            <u-input v-model="orderNoItemList.productSpc" placeholder="" />
+          <!-- <u-form-item label="维修用时(分钟):">
+            <u-input v-model="formdata.productSpc" placeholder="" />
           </u-form-item>
-          <!-- 产品 -->
           <u-form-item label="维修人员签字:">
-            <u-input v-model="orderNoItemList.productName" placeholder="" />
-          </u-form-item>
+            <u-input v-model="formdata.productName" placeholder="" />
+          </u-form-item> -->
+
           <!-- 工单 -->
           <u-form-item label="联系方式:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <u-input :disabled="detailsinfolist.workConnection == null ? true : true" v-model="detailsinfolist.workConnection" placeholder="" />
           </u-form-item>
           <u-form-item label="原因分析:">
-            <u-input v-model="orderNoItemList.workorderCode" placeholder="" />
+            <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="scrollLeft()">
+          <u-form-item label="图片:">
+            <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft1()">
               <view class="photoList">
-                <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-                  <view class="closeBtn" @click="deleteImg(index)">
+                <view class="itemBox photoBox" v-for="(img, index) in imgformList" :key="index">
+                  <!-- <view class="closeBtn" @click="deleteImg1(index)">
                     <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
-                  </view>
-                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
+                  </view> -->
+                  <image class="img" :src="img" mode="aspectFit" @click="showScreenImg1(index)"></image>
                 </view>
-                <view class="itemBox chooseBtn" @click="chooseImg">
-                  <view class="inner">
+                <view class="itemBox chooseBtn">
+                  <!-- <view class="inner">
                     <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                     <text class="desc">添加照片</text>
-                  </view>
+                  </view> -->
                 </view>
               </view>
             </scroll-view>
           </u-form-item>
         </u-form>
-        <u-button @click="onSubmit" type="primary">提交</u-button>
+        <!-- <u-button @click="onSubmit" type="primary">提交</u-button> -->
       </div>
     </view>
-    <view class="bottom-bar">
+    <view class="list" v-for="(item, index) in detailsinfolist.applyList" :key="index">
       <div class="item-name">
+        <div class="quest">备件申领单</div>
+        <!-- <div class="deletebtn">
+          <u-button type="error" @click="deleteSparepart(index)" class="btn1">删除</u-button>
+        </div> -->
         <div class="details">
-          <div>点检人: 刘XX</div>
-          <div style="margin-left: 42px">点检时间: 2023-08-09</div>
+          <div>备件编码: {{ item.materialCode }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
         <div class="details">
-          <div>是否异常: 是</div>
-          <div style="margin-left: 42px">报修单: 90272931234</div>
+          <div>备件名称: {{ item.materialDesc }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
         </div>
+        <div class="details">
+          <div>申领数量: {{ item.spareQuantity }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
+        </div>
+        <div class="details">
+          <div>备件费用: {{ item.equipmentCode }}</div>
+          <!-- <div style="margin-left: 42px">设备名称: {{ detailsinfolist.equipmentName }}</div> -->
+        </div>
+        <!-- <div class="details">
+          <div>申请人: {{ item.applyPeople }}</div>
+        </div>
+        <div class="details">
+          <div>申请时间: {{ item.planWorkshop }}</div>
+        </div>
+        <div class="details">
+          <div>审核人: {{ item.planWorkshop }}</div>
+        </div>
+        <div class="details">
+          <div>审核时间: {{ item.planWorkshop }}</div>
+        </div> -->
       </div>
     </view>
     <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel" @confirm="confirm">
@@ -195,17 +194,17 @@
         <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
         <scroll-view class="scroll-view_H" scroll-x="true" :scroll-left="scrollLeft()">
           <view class="photoList">
-            <view class="itemBox photoBox" v-for="(img, index) in imgUrlList" :key="index">
-              <view class="closeBtn" @click="deleteImg(index)">
+            <view class="itemBox photoBox" v-for="(img, index) in imgList" :key="index">
+              <!-- <view class="closeBtn" @click="deleteImg(index)">
                 <image class="img" src="../../../static/images/iconCloseGray.svg" mode="scaleToFill"></image>
-              </view>
+              </view> -->
               <image class="img" :src="img" mode="aspectFit" @click="showScreenImg(index)"></image>
             </view>
-            <view class="itemBox chooseBtn" @click="chooseImg">
-              <view class="inner">
+            <view class="itemBox chooseBtn">
+              <!-- <view class="inner">
                 <image class="img" src="../../../static/images/upload-pic-icon.svg" mode="scaleToFill"></image>
                 <text class="desc">添加照片</text>
-              </view>
+              </view> -->
             </view>
           </view>
         </scroll-view>
@@ -288,6 +287,7 @@ export default class ChangePalletNew extends BasePage {
   filesArr: any = [];
   imgList: any = [];
   imgUrlList: any = [];
+  imgformList: any = [];
   deleteimgUrlList: any = [];
   orderNoItemList: any = {};
   picturePath: any = 'https://cdn.uviewui.com/uview/swiper/1.jpg,https://cdn.uviewui.com/uview/swiper/2.jpg';
@@ -304,20 +304,41 @@ export default class ChangePalletNew extends BasePage {
   }
   // 输入框焦点
   blur(item, value, index, index1) {
+    console.log(item, value, index, index1);
     this.radiomodal = false;
     this.inputmodal = false;
-    if (value > item.detailUpLimit || value < item.detailDownLimit) {
-      this.equipmentindex.push(index);
-      this.equipmentindex.push(index1);
-      if (item.picturePath != null) {
-        item.picturePath = item.picturePath.split(',');
-        this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
-      } else {
-        this.imgUrlList = [];
-      }
-      // this.inputmodal = true;
-      // this.isshow = true;
-      // this.form = item;
+    // if (value > item.detailUpLimit || value < item.detailDownLimit) {
+    //   this.equipmentindex = [];
+    //   this.equipmentindex.push(index);
+    //   this.equipmentindex.push(index1);
+    //   if (item.picturePath != null) {
+    //     this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+    //     this.imgList = this.imgList.split(',');
+    //   } else {
+    //     this.imgList = [];
+    //   }
+    //   this.inputmodal = true;
+    //   this.isshow = true;
+    //   this.form = item;
+    // }
+  }
+  checkimg(item, value, index, index1) {
+    this.equipmentindex = [];
+    this.radiomodal = false;
+    this.inputmodal = false;
+    this.equipmentindex.push(index);
+    this.equipmentindex.push(index1);
+    if (item.picturePath != null) {
+      this.imgList = JSON.parse(JSON.stringify(item.picturePath));
+      this.imgList = this.imgList.split(',');
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
+    } else {
+      this.imgList = [];
+      this.isshow = true;
+      this.radiomodal = true;
+      this.form = item;
     }
   }
   changeinput(e) {
@@ -336,12 +357,6 @@ export default class ChangePalletNew extends BasePage {
     this.inputmodal = false;
     this.equipmentindex.push(index);
     this.equipmentindex.push(index1);
-    if (item.picturePath != null) {
-      item.picturePath = item.picturePath.split(',');
-      this.imgUrlList = JSON.parse(JSON.stringify(item.picturePath));
-    } else {
-      this.imgUrlList = [];
-    }
     // if (value == 1) {
     //   this.isshow = true;
     //   this.radiomodal = true;
@@ -356,11 +371,10 @@ export default class ChangePalletNew extends BasePage {
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
-        orderCode: this.detailsinfo.orderCode,
+        workId: this.detailsinfo.workId,
       };
-      await this.model.getInspectionOrderInfo(query);
-      this.detailsinfocontent = this.model.OrderInfList;
-      this.detailsinfolist = this.model.OrderInfList.equ;
+      await this.model.getInspectionOrderInfo(query.workId);
+      this.detailsinfolist = this.model.OrderInfList;
     }
   }
   created() {
@@ -370,25 +384,42 @@ export default class ChangePalletNew extends BasePage {
     this.current = index;
   }
   //模态框图片上传
+
   confirm() {
     console.log((this as any).uUpload, 'sssss', this.equipmentindex);
     console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]]);
     if (this.radiomodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     } else if (this.inputmodal) {
-      this.imgUrlList = this.imgUrlList.join();
-      this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgUrlList;
+      if (this.imgList.length == 0) {
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = null;
+      } else {
+        this.imgList = this.imgList.join(',');
+        this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath = this.imgList;
+        console.log(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]], this.imgList);
+      }
     }
   }
   cancel() {
-    this.imgUrlList = this.deleteimgUrlList;
+    this.isshow = false;
+    if (this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath == null) {
+      this.imgList = [];
+    } else {
+      this.imgList = this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath;
+      this.imgList = this.imgList.split(',');
+    }
   }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
   }
   showScreenImg(i) {
-    let list = this.imgUrlList;
+    let list = this.imgList;
     uni.previewImage({
       current: i,
       urls: list,
@@ -404,6 +435,17 @@ export default class ChangePalletNew extends BasePage {
         // uni.showLoading();
         //console.log('/////',res);
         let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
         tempFilePaths.map((item) => {
           uni.uploadFile({
             url: 'http://192.168.202.20:9000/prod-api/file/upload',
@@ -419,23 +461,19 @@ export default class ChangePalletNew extends BasePage {
             // 	materialCode: this.materialObj.materialCode,
             // },
             success: (res) => {
-              console.log(res);
               uni.hideLoading();
               if (!res.data) {
                 // this.$refs.toastRef.show({
                 // 	type:"error",
-                // 	text:"上传失败！"
+                // 	text:res.msg
                 // })
                 return;
               }
               let data = JSON.parse(res.data);
-              console.log('123dddd', data);
-              this.imgUrlList = [...this.imgList, data.data.url];
+              this.imgList = [...this.imgList, data.data.url];
               //this.imgListName = [...this.imgListName,data.fileName];
-              // this.imgUrlList = [...this.imgUrlList, imgUrlList[index]];
               //this.picUrls = this.imgList.join(",");
               //this.picNames = this.imgListName.join(",");
-              console.log('this.imgList', this.imgList);
               uni.hideLoading();
             },
             fail: (err) => {
@@ -452,8 +490,86 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   deleteImg(index) {
-    this.deleteimgUrlList = JSON.parse(JSON.stringify(this.imgUrlList));
-    this.imgUrlList.splice(index, 1);
+    this.imgList = JSON.parse(JSON.stringify(this.detailsinfolist.detailList[this.equipmentindex[0]].standardList[this.equipmentindex[1]].picturePath));
+    this.imgList = this.imgList.split(',');
+    this.imgList.splice(index, 1);
+  }
+  scrollLeft1() {
+    return 222 * (this.imgformList.length + 1);
+  }
+  showScreenImg1(i) {
+    let list = this.imgformList;
+    uni.previewImage({
+      current: i,
+      urls: list,
+      // loop: true
+    });
+  }
+  chooseImg1() {
+    uni.chooseImage({
+      count: 9, //默认9
+      // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        // uni.showLoading();
+        //console.log('/////',res);
+        let tempFilePaths: any = res.tempFilePaths;
+
+        //      (this.$refs.uToast as any).show({
+        //     title: '成功',
+        //     type: 'success',
+        //   });
+        //   uni.navigateBack({});
+        // } else {
+        //   (this.$refs.uToast as any).show({
+        //     title: '失败',
+        //     type: 'error',
+        //   });
+        tempFilePaths.map((item) => {
+          uni.uploadFile({
+            // url: 'http://192.168.202.20:9000/prod-api/file/upload',
+            url: '/dev-api/file/upload',
+            fileType: 'image',
+            filePath: item,
+            header: {
+              Authorization: 'Bearer ' + session.user?.access_token,
+              // 'cosmo-env-sitecode': this.$store.state.siteCode
+            },
+            name: 'file',
+            // formData: {
+            // 	materialCode: this.materialObj.materialCode,
+            // },
+            success: (res) => {
+              uni.hideLoading();
+              if (!res.data) {
+                // this.$refs.toastRef.show({
+                // 	type:"error",
+                // 	text:res.msg
+                // })
+                return;
+              }
+              let data = JSON.parse(res.data);
+              this.imgformList = [...this.imgformList, data.data.url];
+              //this.imgListName = [...this.imgListName,data.fileName];
+              //this.picUrls = this.imgList.join(",");
+              //this.picNames = this.imgListName.join(",");
+              uni.hideLoading();
+            },
+            fail: (err) => {
+              console.log(err);
+              // this.$refs.toastRef.show({
+              // 	type:"error",
+              // 	text:"上传失败！"
+              // })
+              uni.hideLoading();
+            },
+          });
+        });
+      },
+    });
+  }
+  deleteImg1(index) {
+    this.imgformList.splice(index, 1);
   }
   scanCodeOne() {
     uni.scanCode({
@@ -640,6 +756,11 @@ export default class ChangePalletNew extends BasePage {
         }
       }
     }
+    .item-info {
+      border: rgba(121, 121, 121, 1) solid 1px;
+      padding: 7px 8px 7px 8px;
+      border-radius: 5px;
+    }
     .single-left {
       display: flex;
       // align-items: center;
@@ -840,6 +961,9 @@ export default class ChangePalletNew extends BasePage {
   .listbottom ::v-deep .uni-input-input {
     border: 1px solid black;
     width: 98%;
+    padding: 10px 5px;
+    box-sizing: border-box;
+    font-weight: 500;
   }
   ::v-deep .u-form-item {
     padding: 6px 0;
diff --git a/src/pages/mes/ChangePalletNew/index.vue b/src/pages/mes/ChangePalletNew/index.vue
index 71d5953..1543029 100644
--- a/src/pages/mes/ChangePalletNew/index.vue
+++ b/src/pages/mes/ChangePalletNew/index.vue
@@ -194,6 +194,7 @@ export default class ChangePalletNew extends BasePage {
     this.productCodeList = {};
     this.productCodelocList = {};
     this.shouciFocus = false;
+    this.orderNoItemList = {};
     this.model.empty();
     this.$nextTick(() => {
       this.shouciFocus = true;
diff --git a/src/pages/mes/ProductionQtyInsp/index.vue b/src/pages/mes/ProductionQtyInsp/index.vue
index 7ca1616..256fbb9 100644
--- a/src/pages/mes/ProductionQtyInsp/index.vue
+++ b/src/pages/mes/ProductionQtyInsp/index.vue
@@ -43,7 +43,8 @@
         <u-input :disabled="true" v-model="orderNoItemList.workorderCode" placeholder="" />
       </u-form-item>
       <u-form-item label="缓存区">
-        <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductLOC" showKey="label" valKey="value" :val="productLocList.value" :options="model.DictList" />
+        <u-input :disabled="true" v-model="productLocList.lable" placeholder="" />
+        <!-- <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductLOC" showKey="label" valKey="value" :val="productLocList.value" :options="model.DictList" /> -->
       </u-form-item>
       <!-- 是否合格 -->
       <u-form-item label="是否合格">
@@ -120,7 +121,10 @@ export default class productCheckReceipt extends BasePage {
   //   this.remove = e.pickerName;
   // }
   orderNo: any = '';
-  productLocList: any = {};
+  productLocList: any = {
+    value: '3',
+    lable: '烘房缓存区',
+  };
   badMeg = '';
   border = true;
   height = 100;
@@ -276,10 +280,6 @@ export default class productCheckReceipt extends BasePage {
       this.customToast('该rfid不可用，不可质检');
       return;
     }
-    if (this.productLocList.value == '' || this.productLocList.value == undefined) {
-      this.customToast('请选择缓存区');
-      return;
-    }
     if (this.productCodeList.value == '' || this.productCodeList.value == undefined) {
       this.customToast('请选择是否合格');
       return;
@@ -332,7 +332,6 @@ export default class productCheckReceipt extends BasePage {
       this.orderNo = '';
       this.badMeg = '';
       this.productCodeList = {};
-      this.productLocList = {};
       this.imgUrlList = [];
       this.imgList = [];
       this.orderNoItemList = {};
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index d7e15dd..9346944 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.10';
+  version = '0.0.11';
   checkversion: any = {};
   onLoad() {
     // this.model.getMenuList();
diff --git a/src/utils/request.ts b/src/utils/request.ts
index c5c8d54..109461b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -23,11 +23,11 @@ http.interceptors.request.use(
   (config: any) => {
     //console.log('123456',config)
     //生产请将注释解开重要重要
-    if (config.url.includes('/api')) {
-      config.baseURL = 'http://192.168.202.23:5001';
-    } else {
-      config.baseURL = 'http://192.168.202.34:30000';
-    }
+    // if (config.url.includes('/api')) {
+    //   config.baseURL = 'http://192.168.202.23:5001';
+    // } else {
+    //   config.baseURL = 'http://192.168.202.34:30000';
+    // }
     // 所有请求默认提示加载中
     if (!loading) {
       uni.showLoading({ title: '加载中' });
@@ -36,7 +36,8 @@ http.interceptors.request.use(
     }
     // 在请求发送之前做一些处理
     config.header['Referrer-Policy'] = 'strict-origin-when-cross-origin';
-    // config.header['poolName'] = 'ds_1000';
+    config.header['poolName'] = session.PoolName;
+    // config.header['poolName'] = '';
     try {
       const token = session.user.access_token; //store.state.session.accessToken;
       if (token) {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 2ab88fa..9326ee2 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
 // const qianzhuione = '/prod-api';
 export const url = {
   wmspda: {
@@ -88,11 +88,17 @@ export const url = {
       // 维修
       Repair: {
         // 获取今日任务 获取历史记录
-        getTodayTask: qianzhuione + '/device/devicePDA/getMaintenanceRecords',
+        getTodayTask: qianzhuione + '/device/devicePDA/getMaintenancePendRecords',
         // 获取历史记录
         getTaskRecord: qianzhuione + '/device/devicePDA/getMaintenanceRecords',
-        // 获取历史记录
+        // 获取维修工单信息
         selectPdaRepairWorkOrderDetails: qianzhuione + '/device/devicePDA/selectPdaRepairWorkOrderDetails',
+        // 是否维修
+        updateDowntime: qianzhuione + '/device/devicePDA/updateDowntime',
+        // 维修提交
+        updateMaintenanceRecords: qianzhuione + '/device/devicePDA/updateMaintenanceRecords',
+        // 备件list
+        list: qianzhuione + '/device/sparePartsLedger/list',
       },
     },
   },