diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue
index 43d41fa..2da2f74 100644
--- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue
+++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue
@@ -2,37 +2,80 @@
   <div class="report">
     <div class="rpHeader">
       <div class="rphLeft">
-        <QtReport ref="reportQT" :realRes="realRes" :pdSubType="pdSubType" v-if="pdSubType === 39 || pdSubType === 47">
+        <QtReport
+          ref="reportQT"
+          :realRes="realRes"
+          :pdSubType="pdSubType"
+          v-if="pdSubType === 39 || pdSubType === 47"
+        >
         </QtReport>
-        <RtReport ref="reportRT" :realRes="realRes" :pdSubType="pdSubType" v-else></RtReport>
+        <RtReport
+          ref="reportRT"
+          :realRes="realRes"
+          :pdSubType="pdSubType"
+          v-else
+        ></RtReport>
       </div>
       <div class="rphRight">
         <div class="box1">
           <span class="sp1"></span><span class="sp2">产品检验报告PDF</span>
         </div>
-        <div class="pdfContent" v-loading="pdfLoading" element-loading-text="PDF生成中..."
-          element-loading-spinner="el-icon-loading">
-          <iframe class="pdfPage" :src="pdfPath" frameborder="0" v-if="pdfLoading === false"></iframe>
+        <div
+          class="pdfContent"
+          v-loading="pdfLoading"
+          element-loading-text="PDF生成中..."
+          element-loading-spinner="el-icon-loading"
+        >
+          <iframe
+            class="pdfPage"
+            :src="pdfPath"
+            frameborder="0"
+            v-if="pdfLoading === false"
+          ></iframe>
         </div>
       </div>
     </div>
     <div class="rpShow">
       <el-tabs type="card">
         <el-tab-pane label="查看待检验产品">
-          <div class="earth" id="cesiumView" @click="pickValue" style="overflow: hidden; position: relative"></div>
+          <div
+            class="earth"
+            id="cesiumView"
+            @click="pickValue"
+            style="overflow: hidden; position: relative"
+          ></div>
           <div class="cstop">
-            <el-form :inline="true" :model="rpDataMsg" class="demo-form-inline" :disabled="true">
+            <el-form
+              :inline="true"
+              :model="rpDataMsg"
+              class="demo-form-inline"
+              :disabled="true"
+            >
               <el-form-item label="卫星" class="ysjMsg">
-                <el-input class="ysjMsgMrg" v-model="rpDataMsg.satellite" placeholder="采样卫星"></el-input>
+                <el-input
+                  class="ysjMsgMrg"
+                  v-model="rpDataMsg.satellite"
+                  placeholder="采样卫星"
+                ></el-input>
               </el-form-item>
               <el-form-item label="载荷名称" class="ysjMsg">
-                <el-input v-model="rpDataMsg.load" placeholder="载荷方式"></el-input>
+                <el-input
+                  v-model="rpDataMsg.load"
+                  placeholder="载荷方式"
+                ></el-input>
               </el-form-item>
               <el-form-item label="空间分辨率" class="ysjMsg2">
-                <el-input v-model="rpDataMsg.spatialRes" placeholder="空间分辨率"></el-input>
+                <el-input
+                  v-model="rpDataMsg.spatialRes"
+                  placeholder="空间分辨率"
+                ></el-input>
               </el-form-item>
               <el-form-item label="时间" class="ysjMsg">
-                <el-input class="ysjMsgMrg" v-model="formatDateStr" placeholder="采样时间"></el-input>
+                <el-input
+                  class="ysjMsgMrg"
+                  v-model="formatDateStr"
+                  placeholder="采样时间"
+                ></el-input>
               </el-form-item>
               <el-form-item label="级别" prop="resource" class="ysjMsg2">
                 <el-radio-group v-model="rpDataMsg.level">
@@ -40,28 +83,51 @@
                   <el-radio label="4"></el-radio>
                   <el-radio label="5"></el-radio>
                   <!-- <el-radio label="其他"></el-radio> -->
-                </el-radio-group> </el-form-item><br />
+                </el-radio-group> </el-form-item
+              ><br />
               <el-form-item label="坐标系统" class="ysjMsg">
-                <el-input v-model="rpDataMsg.coordinateSys" placeholder="坐标系统"></el-input>
+                <el-input
+                  v-model="rpDataMsg.coordinateSys"
+                  placeholder="坐标系统"
+                ></el-input>
               </el-form-item>
               <el-form-item label="最小纬度" class="ysjMsg">
-                <el-input v-model="rpDataMsg.minLat" placeholder="最小纬度"></el-input>
+                <el-input
+                  v-model="rpDataMsg.minLat"
+                  placeholder="最小纬度"
+                ></el-input>
               </el-form-item>
               <el-form-item label="最大纬度" class="ysjMsg2">
-                <el-input style="margin-left: 6px" v-model="rpDataMsg.maxLat" placeholder="最大纬度"></el-input>
+                <el-input
+                  style="margin-left: 6px"
+                  v-model="rpDataMsg.maxLat"
+                  placeholder="最大纬度"
+                ></el-input>
               </el-form-item>
               <el-form-item label="最小经度" class="ysjMsg">
-                <el-input v-model="rpDataMsg.minLon" placeholder="最小经度"></el-input>
+                <el-input
+                  v-model="rpDataMsg.minLon"
+                  placeholder="最小经度"
+                ></el-input>
               </el-form-item>
               <el-form-item label="最大经度" class="ysjMsg2">
-                <el-input v-model="rpDataMsg.maxLon" placeholder="最大经度"></el-input>
+                <el-input
+                  v-model="rpDataMsg.maxLon"
+                  placeholder="最大经度"
+                ></el-input>
               </el-form-item>
             </el-form>
           </div>
         </el-tab-pane>
         <el-tab-pane label="查看样本数据">
-          <el-table :header-cell-style="headerRowClass" :cell-style="tableRowClassName"
-            style="width: 98%; margin-left: 1%; margin-top: 15px" :data="sampleData" :stripe="true" height="520">
+          <el-table
+            :header-cell-style="headerRowClass"
+            :cell-style="tableRowClassName"
+            style="width: 98%; margin-left: 1%; margin-top: 15px"
+            :data="sampleData"
+            :stripe="true"
+            height="520"
+          >
             <el-table-column type="index" label="序号" width="80">
             </el-table-column>
             <el-table-column prop="samplesId" label="样本编号" sortable>
@@ -82,13 +148,23 @@
                 {{ scope.row.dataTime | formatDate }}
               </template> -->
             </el-table-column>
-            <el-table-column prop="collectDate" label="预处理时间" sortable align="center">
+            <el-table-column
+              prop="collectDate"
+              label="预处理时间"
+              sortable
+              align="center"
+            >
               <template slot-scope="scope">
                 {{ scope.row.collectDate }}
                 <!-- {{ scope.row.addTime | formatDate }} -->
               </template>
             </el-table-column>
-            <el-table-column prop="reliability" label="可信度" sortable align="center"></el-table-column>
+            <el-table-column
+              prop="reliability"
+              label="可信度"
+              sortable
+              align="center"
+            ></el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -411,51 +487,54 @@ export default {
     },
     // 提交检验结果以及报告结果
     submitReport() {
-      // 更新订单状态
-      const os = 2; //审核完成
-      this.updateOrder(os);
-      // 上传报告
-      const rpm = this.reportMsg;
-      const pp = this.pdfPath;
-      if (pp !== null || pp !== undefined) {
-        const pos = pp.lastIndexOf("/");
-        const pdfName = pp.substr(pos + 1);
-        const rf = new FormData();
-        rf.append("orderId", rpm.orderId);
-        rf.append("reportName", pdfName);
-        rf.append("reportPath", pp);
-        addReportMsg(rf).then((res) => {
-          // console.log(res);
-          if (res.code === 200) {
-            this.$message({
-              type: "success",
-              message: "订单处理成功",
+      saveValidationRes(this.reportMsg).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            message: "提交成功，检验完成",
+            type: "success",
+          });
+          const os = 2; //审核完成
+          this.updateOrder(os);
+          // 上传报告
+          const rpm = this.reportMsg;
+          const pp = this.pdfPath;
+          if (pp !== null || pp !== undefined) {
+            const rpMsg = {
+              orderId: rpm.orderId,
+              path: pp,
+            };
+            saveReport(rpMsg).then((res) => {
+              if (res.code === 200) {
+                this.$message({
+                  type: "success",
+                  message: "订单处理成功",
+                });
+                this.$router.push({ name: "待处理的检验订单" });
+              }
             });
-            updateOrderMsg({
-              id: rpm.orderId,
-              auditId: rpm.userId,
-              auditName: localStorage.userName,
-            });
-            disOrderStatus(rpm.orderId);
-            this.$router.push({ name: "待处理的检验订单" });
           }
-        });
-      }
+        }
+      });
     },
     // 重新检验
     reExamine() {
-      const os = 8;
+      const os = 0;
       this.updateOrder(os);
+      this.$router.push({ path: "http://211.157.180.211:18085/" });
       // this.$router.push(`http://10.0.3.157:18030/kjwebAdmin/#/Order/DJYOrder?orderid=${this.reportMsg.orderId}&token=WEB%2a1673425993482%40L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19`);
     },
     // 更新订单状态
     updateOrder(orderStatus) {
-      const rpm = this.reportMsg;
-      const up = new FormData();
-      up.append("orderId", rpm.orderId);
-      up.append("orderStatus", orderStatus);
-      up.append("userId", rpm.userId);
-      updateOrderStage(up);
+      updateOrderStage(
+        qs.stringify(
+          {
+            orderId: this.orderId,
+            orderStatus: orderStatus,
+            userId: this.userId,
+          },
+          { indices: false }
+        )
+      );
     },
     pickValue() {
       cu.handleClick();
@@ -620,7 +699,7 @@ export default {
   background-color: #354595;
 }
 
-/deep/.cstop .el-radio__input.is-checked+.el-radio__label {
+/deep/.cstop .el-radio__input.is-checked + .el-radio__label {
   color: #606266;
 }
 
@@ -643,7 +722,7 @@ export default {
   color: black;
 }
 
-/deep/.el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
+/deep/.el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
   color: white;
   background-color: #409eff;
   border-color: #409eff;
@@ -655,7 +734,7 @@ export default {
   //   display: block;
 }
 
-/deep/.el-tabs--card>.el-tabs__header .el-tabs__nav {
+/deep/.el-tabs--card > .el-tabs__header .el-tabs__nav {
   display: block;
   left: 41.5%;
   // transform: translateX(-50%);
@@ -664,12 +743,12 @@ export default {
   position: relative;
 }
 
-/deep/.el-tabs--card>.el-tabs__header {
+/deep/.el-tabs--card > .el-tabs__header {
   border-bottom: 0;
   // border-bottom: 1px solid #E4E7ED;
 }
 
-/deep/.el-tabs--card>.el-tabs__header .el-tabs__nav {
+/deep/.el-tabs--card > .el-tabs__header .el-tabs__nav {
   border-bottom: 1px solid #e4e7ed;
 }
 </style>