From 14c65eb51787104c1962b347ee15e425600cda09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 7 Nov 2024 18:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=B5=8B=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E4=B8=8E=E6=9C=80=E5=90=8E=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/orderdetails.vue | 70 ++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index be1692a..6fea123 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -60,10 +60,10 @@
     </view>
     <view class="x-box">
       <view class="h-title">订单详情</view>
-      <view class="on-input">
-        <view class="o-left">订单编号：</view>
-        <view class="o-right">{{ detailData.orderNo }}</view>
-      </view>
+      <!--      <view class="on-input">-->
+      <!--        <view class="o-left">订单编号：</view>-->
+      <!--        <view class="o-right">{{ detailData.orderNo }}</view>-->
+      <!--      </view>-->
       <view class="on-input">
         <view class="o-left">折扣：</view>
         <view class="o-right">{{ detailData.reduceMoney / 100 }}</view>
@@ -72,14 +72,14 @@
         <view class="o-left">优惠金额：</view>
         <view class="o-right">{{ detailData.couponDiscount / 100 }}</view>
       </view>
-      <view class="on-input">
-        <view class="o-left">核销人：</view>
-        <view class="o-right">{{ detailData.validationRealName }}</view>
-      </view>
-      <view class="on-input">
-        <view class="o-left">核销时间：</view>
-        <view class="o-right">{{ detailData.validationTime }}</view>
-      </view>
+      <!--      <view class="on-input">-->
+      <!--        <view class="o-left">核销人：</view>-->
+      <!--        <view class="o-right">{{ detailData.validationRealName }}</view>-->
+      <!--      </view>-->
+      <!--      <view class="on-input">-->
+      <!--        <view class="o-left">核销时间：</view>-->
+      <!--        <view class="o-right">{{ detailData.validationTime }}</view>-->
+      <!--      </view>-->
       <view class="bottomxx" v-if="isOnline&&isOnline==0&&orderStatus&&orderStatus==0" @click="xling = true">
         <view class="">结算</view>
       </view>
@@ -105,7 +105,8 @@
 
     </view>
 
-    <view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1" @click="hge = true;getProject()">
+    <view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1"
+          @click="hge = true;getProject()">
       <view class="">结束检测</view>
     </view>
     <view class="annniu"
@@ -115,7 +116,7 @@
     </view>
     <u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change"
               @cancel="cancel"></u-picker>
-    <u-popup  :show="hge" @close="closehge" :round="10" @open="openxl">
+    <u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
       <view class="popup-box">
         <view class="on-inputx">
           <text>说明：</text>
@@ -247,6 +248,7 @@ export default {
       tbindex: 1,
       isOnline: 1,
       hge: false,
+      orImages:false,
       show: false,
       xling: false,
       baseUrl: this.$baseUrl,
@@ -267,7 +269,7 @@ export default {
       shelist: [],
       isPass: "1",
       remark: '',
-      csId:'',
+      csId: '',
       sfou: [{
         text: '合格',
         value: "1"
@@ -336,10 +338,21 @@ export default {
         params: {
           inspectionId: this.inspectionId
         }
-      }).then(res=>{
-        console.log('获取项目',res.data)
+      }).then(res => {
         this.selectProject = res.data
-        console.log('项目', this.selectProject)
+        //查询当前是否是第一个节点或最后一个节点
+        let data = {
+          inspectionId: this.inspectionId,
+          workNodeId: this.workNodeId
+        }
+        request({
+          url: '/system/info/orImages',
+          method: 'get',
+          params: data
+        }).then(res => {
+          console.log('是否需要上传图片', res.data)
+          this.orImages = res.data
+        })
       })
     },
     jisuan() {
@@ -391,10 +404,10 @@ export default {
         status = 3
       } else if (this.tbindex == 1 && this.isRetrial == 1) {
         console.log('这是重审')
-        if (this.csId == '' || this.csId == undefined){
+        if (this.csId == '' || this.csId == undefined) {
           uni.showToast({
-            title:'请选择要返回的节点',
-            icon:'none'
+            title: '请选择要返回的节点',
+            icon: 'none'
           })
           return
         }
@@ -406,7 +419,17 @@ export default {
         console.log('这是退办理')
         status = 1
       }
-      console.log('图片2', this.fileList2)
+      //判断当前节点是否需要上传图片
+      if (this.orImages) {
+        //判断是否有图片
+        if (this.fileList2.length == 0) {
+          uni.showToast({
+            title: '请上传图片',
+            icon: 'none'
+          })
+          return
+        }
+      }
       let inspectionInfo = {
         inspectionInfoId: this.inspectionInfoId,
         isPass: this.isPass,
@@ -1005,11 +1028,13 @@ image {
   align-items: center;
   justify-content: center;
 }
+
 .box_ {
   width: 100%;
   display: flex;
   flex-wrap: wrap;
 }
+
 .box_button {
   border-radius: 6px;
   border: 1px solid #999;
@@ -1022,6 +1047,7 @@ image {
   margin-right: 5px;
   margin-bottom: 5px;
 }
+
 .box_button_x {
   border-radius: 6px;
   border: 1px solid #0D2E8D;