审核

src/api/oneTbale.js

@@ -67,3 +67,13 @@ export function exportIncomeInspectInfo(query) {
     responseType: 'blob'
   })
 }
+
+// 7.审批
+export function approveInformation(data) {
+  return request({
+    url: '/incomeinspectinfo/approve',
+    method: 'put',
+    data,
+    headers: { 'Content-Type': 'application/json;charset=utf8' }
+  })
+}

src/views/check/oneTbale.vue

@@ -41,7 +41,7 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="lot number" prop="jcNum" style="width: 20%">
+      <el-form-item label="lot number" prop="jcNum">
         <el-input
           v-model="queryParams.jcNum"
           placeholder="请输入lot number"
@@ -234,7 +234,6 @@
 <script>
 import {
   listIncomeInspectInfo,
-  getIncomeInspectInfo,
   addIncomeInspectInfo,
   updateIncomeInspectInfo,
   exportIncomeInspectInfo,
@@ -388,11 +387,19 @@ export default {
       return search
     },
     /** 审批按钮*/
+    /**
+     * controls 操作 1:审核 2:修改 3:查看
+     * approveStatus 状态 0 cg 1 待审核 2 已通过 3 已驳回
+     * **/
     handleApprove(row) {
       const id = row.businessId
       this.$router.push({
         path: 'checkList',
-        query: { businessId: id }
+        query: {
+          businessId: id,
+          controls: '1',
+          approveStatus: row.approveStatus
+        }
       })
     },
     /** 查看按钮*/
@@ -556,7 +563,11 @@ export default {
       const id = row.businessId
       this.$router.push({
         path: 'checkList',
-        query: { businessId: id }
+        query: {
+          businessId: id,
+          controls: '2',
+          approveStatus: row.approveStatus
+        }
       })
 
       // getIncomeInspectInfo(id).then(response => {

src/views/checkList.vue

@@ -19,17 +19,18 @@
           <div class="formLabel">
             <div class="left">
               <el-form-item label="LOT:">
-                <el-input v-model="inspectInfoList.jcLot" class="scanInput" />
+                <el-input v-model="inspectInfoList.jcLot" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="scanInput" />
                 <el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>
               </el-form-item>
-              <el-form-item label="PN:">
-                <el-input v-model="inspectInfoList.jcPn" class="normalInput" />
+              <el-form-item label="厂家:">
+                <el-input v-model="inspectInfoList.jcCj" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
+                <!--                <el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>-->
               </el-form-item>
-              <el-form-item label="rank:">
-                <el-input v-model="inspectInfoList.jcRank" class="normalInput" />
+              <el-form-item label="PN:">
+                <el-input v-model="inspectInfoList.jcPn" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
               </el-form-item>
               <el-form-item label="数量:">
-                <el-input v-model="inspectInfoList.jcNum" class="normalInput" />
+                <el-input v-model="inspectInfoList.jcNum" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
               </el-form-item>
             </div>
             <div class="right">
@@ -37,8 +38,8 @@
               <!--              <el-form-item class="topContain">-->
               <!--&lt;!&ndash;                <el-input type="text" v-model="oneForm.rank" class="topInput" />&ndash;&gt;-->
               <!--              </el-form-item>-->
-              <el-form-item label="厂家:">
-                <el-input v-model="inspectInfoList.jcCj" class="normalInput" />
+              <el-form-item label="rank:">
+                <el-input v-model="inspectInfoList.jcRank" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="normalInput" />
               </el-form-item>
               <!--              外观-->
               <div class="appearanceDiv">
@@ -46,10 +47,10 @@
                 <div class="appearance">
                   <div class="appearanceForm">
                     <el-form-item label="抽样:" class="sample">
-                      <el-input v-model="inspectInfoList.jcFacadeCy" class="smallInput" />
+                      <el-input v-model="inspectInfoList.jcFacadeCy" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="smallInput" />
                     </el-form-item>
                     <el-form-item label="不良:" class="badness">
-                      <el-input v-model="inspectInfoList.jcFacadeBl" class="smallInput" />
+                      <el-input v-model="inspectInfoList.jcFacadeBl" :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')" class="smallInput" />
                     </el-form-item>
                   </div>
                 </div>
@@ -77,6 +78,7 @@
                         <el-input
                           v-model="inspectJbAl2o3List.standardOne"
                           class="inspectionStandardsInput"
+                          :disabled="(this.controlsForm.controls == '1' && this.controlsForm.approveStatus === '1')"
                           @blur="getInspect"
                         />
                       </el-form-item>
@@ -93,7 +95,10 @@
                     <div v-for="(item,index) in recode1" :key="index" :class="index === 0? 'oneContent': 'Content'">
                       <div class="number">{{ index + 1 }}</div>
                       <div class="recordData">
-                        <el-input v-model="item.recordData" />
+                        <el-input
+                          v-model="item.recordData"
+                          :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "
+                        />
                       </div>
                       <div class="Value">{{ item.differenceValue }}</div>
                       <div class="averageValue">{{ item.differenceValue1 }}</div>
@@ -119,6 +124,7 @@
                       <el-form-item label="检验标准2:" label-width="80">
                         <el-input
                           v-model="inspectJbAl2o3List.standardTwo"
+                          :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "
                           class="inspectionStandardsInput"
                           @blur="getInspect"
                         />
@@ -136,7 +142,7 @@
                     <div v-for="(item,index) in recode2" :key="index" :class="index === 0? 'oneContent': 'Content'">
                       <div class="number">{{ index + 11 }}</div>
                       <div class="recordData">
-                        <el-input v-model="item.recordData" />
+                        <el-input v-model="item.recordData" :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' "/>
                       </div>
                       <div class="Value">{{ item.differenceValue }}</div>
                       <div class="averageValue">{{ item.differenceValue1 }}</div>
@@ -172,6 +178,7 @@
                           v-model="inspectJbAl2o3List.limitOne"
                           class="inspectionStandardsInput"
                           @blur="getInspectNext"
+                          :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
                         />
                       </el-form-item>
                     </el-form>
@@ -181,6 +188,7 @@
                           v-model="inspectJbAl2o3List.limitTwo"
                           class="inspectionStandardsInput"
                           @blur="getInspectNext"
+                          :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
                         />
                       </el-form-item>
                     </el-form>
@@ -194,7 +202,7 @@
                     <div v-for="(item,index) in recode3" :key="index" :class="index === 0? 'oneContent': 'Content'">
                       <div class="number">{{ index + 1 }}</div>
                       <div class="recordData">
-                        <el-input v-model="item.recordData" />
+                        <el-input v-model="item.recordData" :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' " />
                       </div>
                       <div class="Value">{{ item.differenceValue }}</div>
                     </div>
@@ -214,87 +222,87 @@
               <div class="threeRegion">
                 <div class="leftRegion">
                   <el-form-item label="firstHdN:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.firstHdN" class="inspectJbAlInput" />
+                    <el-input v-model="inspectJbAl2o3List.firstHdN" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' " class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="firstHdPn:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.firstHdPn" class="inspectJbAlInput" />
+                    <el-input v-model="inspectJbAl2o3List.firstHdPn" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' " class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="firstHdRes:">
-                    <el-radio-group v-model="inspectJbAl2o3List.firstHdRes">
+                    <el-radio-group v-model="inspectJbAl2o3List.firstHdRes" :disabled="this.controlsForm.controls ==='1'&& this.controlsForm.approveStatus ==='1' ">
                       <el-radio label="1">合格</el-radio>
                       <el-radio label="2">不合格</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                  <el-form-item label="wxN:">
-                    <el-input v-model="inspectJbAl2o3List.wxN" />
+                  <el-form-item label="wxN:" class="inspectJbAlInputBody">
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxN" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wxPn:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wxPn" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxPn" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wxRes:">
-                    <el-radio-group v-model="inspectJbAl2o3List.wxRes">
+                    <el-radio-group class="radioGroupWxRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wxRes">
                       <el-radio label="1">合格</el-radio>
                       <el-radio label="2">不合格</el-radio>
                     </el-radio-group>
                   </el-form-item>
                   <el-form-item label="cyN:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.cyN" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyN" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="cyPn:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.cyPn" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyPn" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="cyRes:">
-                    <el-radio-group v-model="inspectJbAl2o3List.cyRes">
+                    <el-radio-group class="radioGroupCyRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.cyRes">
                       <el-radio label="1">合格</el-radio>
                       <el-radio label="2">不合格</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                  <el-form-item label="finalRes:">
-                    <el-radio-group v-model="inspectJbAl2o3List.finalRes">
+                  <el-form-item label="finalRes:"  >
+                    <el-radio-group class="radioGroupfinalRes" :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.finalRes">
                       <el-radio label="1">合格</el-radio>
                       <el-radio label="2">不合格</el-radio>
                     </el-radio-group>
                   </el-form-item>
                   <el-form-item label="noProject:">
-                    <el-input v-model="inspectJbAl2o3List.noProject" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.noProject" class="inspectJbAlInputProject" />
                   </el-form-item>
                   <el-form-item label="wgKx:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgKx" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgKx" class="inspectJbAlInput" />
                   </el-form-item>
                 </div>
                 <div class="rightRegion">
                   <el-form-item label="wgLlw:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgLlw" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgLlw" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgWlw:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgWlw" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgWlw" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgJbwq:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgJbwq" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgJbwq" class="inspectJbAlInputJbwq" />
                   </el-form-item>
                   <el-form-item label="wgZk:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgZk" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgZk" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgSh:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgSh" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgSh" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgBm:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgBm" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgBm" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgTc:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgTc" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgTc" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgQg:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgQg" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgQg" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgCq:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgCq" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgCq" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgFf:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgFf" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgFf" class="inspectJbAlInput" />
                   </el-form-item>
                   <el-form-item label="wgTf:" class="inspectJbAlInputBody">
-                    <el-input v-model="inspectJbAl2o3List.wgTf" class="inspectJbAlInput" />
+                    <el-input :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectJbAl2o3List.wgTf" class="inspectJbAlInput" />
                   </el-form-item>
                   <!--                <el-input class="tableInput" />-->
                 </div>
@@ -309,7 +317,7 @@
         <div class="uploadLabel">附件:</div>
         <div class="uploadImg">
           <div class="peviewImg">
-            <div class="imgDisplay" v-if="imgList.length > 0">
+            <div v-if="imgList.length > 0" class="imgDisplay">
               <div v-for="(item,index) in imgList" :id="step(index)" class="OneImg">
                 <el-image
                   class="OneElImg"
@@ -318,19 +326,19 @@
                   :preview-src-list="item.srcList"
                   @click.stop="handleClickStop(index)"
                 />
-               <!--   按钮区  -->
-                <div class="OneElImgButton">
+                <!--   按钮区  -->
+                <div class="OneElImgButton" v-if="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')">
                   <div>
-                    <el-button type="primary" icon="el-icon-upload" circle @click="downloadImage(item)"></el-button>
+                    <el-button type="primary" icon="el-icon-upload" circle @click="downloadImage(item)" />
                   </div>
                   <div>
-                    <el-button type="danger" icon="el-icon-delete" circle @click="handleDelete(index)"></el-button>
+                    <el-button type="danger" icon="el-icon-delete" circle @click="handleDelete(index)" />
                   </div>
                 </div>
               </div>
             </div>
 
-            <div class="uploadButton" @click="handleTakePhotos">
+            <div  v-if="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="uploadButton" @click="handleTakePhotos">
               <div class="uploadContent">
                 <div class="imgContainer">
                   <img class="img" src="@/assets/image/shangchuan.png">
@@ -363,7 +371,7 @@
       <div class="inspectionResults">
         <el-form :model="inspectInfoList" label-width="42">
           <el-form-item label="检验结果:">
-            <el-radio-group v-model="inspectInfoList.jcResult">
+            <el-radio-group :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" v-model="inspectInfoList.jcResult">
               <el-radio label="1">合格</el-radio>
               <el-radio label="2">不合格</el-radio>
             </el-radio-group>
@@ -372,20 +380,21 @@
             <el-input
               v-model="inspectInfoList.remarks"
               type="textarea"
+              :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')"
               :rows="4"
               placeholder="请输入备注"
             />
           </el-form-item>
         </el-form>
       </div>
-      <hr class="twoHr">
+      <hr class="twoHr" v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')">
       <div v-if="showPartIv" class="partIv">
         <div class="auditor">审核人: {{ inspectsForm.approveUser }}</div>
         <div class="auditTime">审核时间: {{ inspectsForm.approveDate }}</div>
         <div class="auditStatus">审核状态: {{ inspectsForm.approveStatus }}</div>
       </div>
 
-      <div v-show="showAuditOpinion" class="auditOpinion">
+      <div  v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="auditOpinion">
         <el-form :model="inspectsForm">
           <el-form-item label="审核意见:" label-width="42" class="myForm">
             <el-input
@@ -397,13 +406,13 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="showButton" class="submitButton">
+      <div v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')" class="submitButton">
         <el-button class="buttoon" type="primary" @click="submitControl">保存</el-button>
         <el-button class="buttoon" type="primary" @click="present">提交</el-button>
       </div>
-      <div v-if="!showButton" class="submitButton">
-        <el-button class="buttoon" type="primary">同意</el-button>
-        <el-button class="buttoon" type="primary">驳回</el-button>
+      <div  v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="submitButton">
+        <el-button class="buttoon" type="primary" @click="approve">同意</el-button>
+        <el-button class="buttoon" type="primary" @click="reject">驳回</el-button>
       </div>
     </div>
   </div>
@@ -411,21 +420,25 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import { addIncomeInspectInfo } from '@/api/oneTbale'
+import { addIncomeInspectInfo, approveInformation, getIncomeInspectInfo } from '@/api/oneTbale'
 import { parseTime } from '@/utils'
 import { getInfo } from '@/api/login'
-import {downLoadFile} from "@/utils/checkList";
+import { downLoadFile } from '@/utils/checkList'
 
 export default {
   name: 'CheckList',
   data() {
     return {
+      controlsForm: {
+        controls: '2',
+        approveStatus: '0'
+      },
       imgList: [
         {
           businessId: 1,
           url: 'http://49.232.167.247:20010/eduServer/11/20240301/CD7D683B1CF24D8DBD933F0C60D5D8ED.png',
           srcList: ['http://49.232.167.247:20010/eduServer/11/20240301/CD7D683B1CF24D8DBD933F0C60D5D8ED.png']
-        },
+        }
         // {
         //   businessId: 2,
         //   url: require('@/assets/image/cadTwo.png'),
@@ -486,9 +499,8 @@ export default {
       // 审核部分
       inspectsForm: {
         approveUser: 'XXX',
-        approveNote: 'XXXXX',
-        approveDate: '2024-05-08',
-        approveStatus: '已审核'
+        approveNote: '',
+        approveDate: '2024-05-08'
       },
       // 表单二
       inspectJbAl2o3List: {
@@ -539,16 +551,172 @@ export default {
       recode3: []
     }
   },
+  // 路由跳转,是存储页面的值
+  beforeRouteLeave(to, from, next) {
+    const obj = {
+      from3: this.controlsForm,
+      from1: this.inspectInfoList,
+      from2: this.inspectJbAl2o3List,
+      recode1: this.recode1,
+      recode2: this.recode2,
+      recode3: this.recode3
+    }
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: obj
+    })
+    next()
+  },
   created() {
     this.resetRecord()
     this.judgmentParam()
   },
   methods: {
+    // 审核驳回
+    reject() {
+      const obj = {
+        businessId: this.inspectInfoList.businessId,
+        approveNote: this.inspectsForm.approveNote,
+        approveStatus: '3'
+      }
+      approveInformation(obj).then(res => {
+        console.log('审核结果',res)
+        if (res.code === 200) {
+          this.$message.error('该审核已驳回')
+          this.$router.push({
+            path: '/checkOneTbale'
+          })
+        }
+      })
+    },
+    // 审核通过
+    approve() {
+      const obj = {
+        businessId: this.inspectInfoList.businessId,
+        approveNote: this.inspectsForm.approveNote,
+        approveStatus: '9'
+      }
+      approveInformation(obj).then(res => {
+        console.log('审核结果',res)
+        if (res.code === 200) {
+          this.$message.success('审核通过')
+          this.$router.push({
+            path: '/checkOneTbale'
+          })
+        }
+      })
+    },
+    // 获取详情
+    getRecordInfo(id) {
+      getIncomeInspectInfo(id).then(response => {
+        console.log(response)
+        this.inspectInfoList.businessId = id
+        this.inspectInfoList.jcPn = response.data.jcPn
+        this.inspectInfoList.jcCj = response.data.jcCj
+        this.inspectInfoList.jcCode = response.data.jcCode
+        this.inspectInfoList.jcLot = response.data.jcLot
+        this.inspectInfoList.jcNum = response.data.jcNum
+        this.inspectInfoList.jcRank = response.data.jcRank
+        this.inspectInfoList.jcFacadeCy = response.data.jcFacadeCy
+        this.inspectInfoList.jcFacadeBl = response.data.jcFacadeBl
+        this.inspectInfoList.jcResult = response.data.jcResult
+        this.inspectInfoList.remarks = response.data.remarks
+        console.log(this.inspectInfoList)
+        console.log('-----------------------------------------------')
+        this.inspectJbAl2o3List.oneJcUser = response.data.oneJcUser
+        this.inspectJbAl2o3List.oneJcDate = response.data.oneJcDate
+        this.inspectJbAl2o3List.twoJcUser = response.data.twoJcUser
+        this.inspectJbAl2o3List.twoJcDate = response.data.twoJcDate
+        this.inspectJbAl2o3List.limitOne = response.data.limitOne
+        this.inspectJbAl2o3List.limitTwo = response.data.limitTwo
+        this.inspectJbAl2o3List.businessId = response.data.businessId
+        this.inspectJbAl2o3List.standardOne = response.data.standardOne
+        this.inspectJbAl2o3List.standardTwo = response.data.standardTwo
+        this.inspectJbAl2o3List.standardOneData = response.data.standardOneData
+        this.inspectJbAl2o3List.standardTwoData = response.data.standardTwoData
+        // this.inspectJbAl2o3List.recordData = response.data.recordData
+        this.inspectJbAl2o3List.inspector = response.data.inspector
+        this.inspectJbAl2o3List.firstHdN = response.data.firstHdN
+        this.inspectJbAl2o3List.firstHdPn = response.data.firstHdPn
+        this.inspectJbAl2o3List.firstHdRes = response.data.firstHdRes
+        this.inspectJbAl2o3List.wxN = response.data.wxN
+        this.inspectJbAl2o3List.wxPn = response.data.wxPn
+        this.inspectJbAl2o3List.wxRes = response.data.wxRes
+        this.inspectJbAl2o3List.cyN = response.data.cyN
+        this.inspectJbAl2o3List.cyPn = response.data.cyPn
+        this.inspectJbAl2o3List.cyRes = response.data.cyRes
+        this.inspectJbAl2o3List.finalRes = response.data.finalRes
+        this.inspectJbAl2o3List.noProject = response.data.noProject
+        this.inspectJbAl2o3List.wgKx = response.data.wgKx
+        this.inspectJbAl2o3List.wgLlw = response.data.wgLlw
+        this.inspectJbAl2o3List.wgWlw = response.data.wgWlw
+        this.inspectJbAl2o3List.wgJbwq = response.data.wgJbwq
+        this.inspectJbAl2o3List.wgZk = response.data.wgZk
+        this.inspectJbAl2o3List.wgSh = response.data.wgSh
+        this.inspectJbAl2o3List.wgBm = response.data.wgBm
+        this.inspectJbAl2o3List.wgTc = response.data.wgTc
+        this.inspectJbAl2o3List.wgQg = response.data.wgQg
+        this.inspectJbAl2o3List.wgCq = response.data.wgCq
+        this.inspectJbAl2o3List.wgFf = response.data.wgFf
+        this.inspectJbAl2o3List.wgTf = response.data.wgTf
+        this.inspectJbAl2o3List.limitData = response.data.limitData
+        this.inspectJbAl2o3List.ossId = response.data.ossId
+        // this.recode1.recordData =
+        // const qwe = []
+        // qwe =
+        // console.log(this.inspectJbAl2o3List.standardOneData.split(','))
+        // this.recode1.recordData = this.inspectJbAl2o3List.standardOneData.split(',')
+        this.getRecordList(this.inspectJbAl2o3List.standardOneData.split(','))
+        this.getRecordTwoList(this.inspectJbAl2o3List.standardTwoData.split(','))
+        this.getRecordThreeList(this.inspectJbAl2o3List.limitData.split(','))
+        console.log(this.recode1)
+        console.log(this.inspectJbAl2o3List)
+      })
+    },
+    // 数组1
+    getRecordList(list1) {
+      for (let i = 0; i < 10; i++) {
+        this.recode1[i].recordData = list1[i]
+      }
+    },
+    // 数组2
+    getRecordTwoList(list1) {
+      for (let i = 0; i < 10; i++) {
+        this.recode2[i].recordData = list1[i]
+      }
+    },
+    // 数组3
+    getRecordThreeList(list1) {
+      for (let i = 0; i < 10; i++) {
+        this.recode3[i].recordData = list1[i]
+      }
+    },
     judgmentParam() {
       if (this.$route.query.businessId !== undefined) {
         console.log(this.$route.query.businessId)
+        this.controlsForm.controls = this.$route.query.controls
+        this.controlsForm.approveStatus = this.$route.query.approveStatus
+        this.getRecordInfo(this.$route.query.businessId)
+      } else {
+        if (this.$store.getters.searchParams[this.$route.path]) {
+          const { searchParams } = this.$store.getters; const { path } = this.$route
+          const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+          const obj = { ...param }
+          this.inspectInfoList = obj.from1
+          this.inspectJbAl2o3List = obj.from2
+          this.recode1 = obj.recode1
+          this.recode2 = obj.recode2
+          this.recode3 = obj.recode3
+          this.controlsForm = obj.from3
+        }
       }
     },
+    // splitString(recodeList){
+    //   const splitrecord1 =[]
+    //   for (let i = 0; i <recodeList.length; i++) {
+    //         = recodeList[i]
+    //   }
+    // },
     parseTime,
     // 获取检验时间和检验人
 
@@ -559,10 +727,10 @@ export default {
      * @return:
      **/
     downloadImage(item) {
-      let urlList = item.url.split('/')
-      console.log('urlList',urlList)
-      let fileName = urlList[urlList.length-1]
-      console.log('fileName',fileName)
+      const urlList = item.url.split('/')
+      console.log('urlList', urlList)
+      const fileName = urlList[urlList.length - 1]
+      console.log('fileName', fileName)
       const obj = {
         downloadUrl: item.url,
         fileName: fileName
@@ -609,16 +777,14 @@ export default {
       // xhr.send();
     },
 
-
-
     /**
      * @description: 删除照片
      * @author: gaoyu
      * @param: index
      * @return:
      **/
-    handleDelete(index){
-      this.imgList.splice(index,1)
+    handleDelete(index) {
+      this.imgList.splice(index, 1)
     },
     /**
      * @description: 动态生成id
@@ -637,17 +803,17 @@ export default {
         tokenMsg: getToken()
       }
       this.$WebView.openCamera(params).then(res => {
-        console.log('res',res)
+        console.log('res', res)
         this.imgUrlForm = JSON.parse(res)
-        console.log('imgUrlForm',this.imgUrlForm)
-        let obj = {
+        console.log('imgUrlForm', this.imgUrlForm)
+        const obj = {
           businessId: this.imgUrlForm.businessId,
           url: this.imgUrlForm.url,
           srcList: []
         }
         obj.srcList.push(this.imgUrlForm.url)
         this.imgList.push(obj)
-        console.log('imgList',this.imgList)
+        console.log('imgList', this.imgList)
       })
     },
     getInspect() {
@@ -955,6 +1121,7 @@ export default {
         console.log('re', response)
         if (response.code === 200) {
           this.msgSuccess('保存成功')
+          this.getRecordInfo(response.data.incomeInspectInfo.businessId)
         }
       })
     },
@@ -1980,7 +2147,7 @@ export default {
         .inspectDate {
           display: flex;
           justify-content: space-between;
-          width: 26%;
+          width: 30%;
           font-family: Microsoft YaHei, Microsoft YaHei-400;
           font-weight: 400;
         }
@@ -1996,7 +2163,7 @@ export default {
         .inspectPerson {
           display: flex;
           justify-content: space-between;
-          width: 13%;
+          width: 19%;
           font-family: Microsoft YaHei, Microsoft YaHei-400;
           font-weight: 400;
         }
@@ -2116,7 +2283,22 @@ export default {
             text-align: right;
           }
           .inspectJbAlInput{
-            width: 86%;
+            width: 85%;
+          }
+          .inspectJbAlInputProject{
+            width: 84%;
+          }
+          .inspectJbAlInputJbwq{
+            width: 85%;
+          }
+          .radioGroupWxRes{
+            margin-left: 21px;
+          }
+          .radioGroupCyRes{
+            margin-left: 24px;
+          }
+          .radioGroupfinalRes{
+            margin-left: 10px;
           }
           //height: 100%;
           //border: 1px solid #d9d9d9;
@@ -2132,6 +2314,9 @@ export default {
           .inspectJbAlInput{
             width: 86%;
           }
+          .inspectJbAlInputJbwq{
+            width: 85%;
+          }
           //height: 100%;
           //border: 1px solid #d9d9d9;
           //border-radius: 4px;
@@ -2175,7 +2360,6 @@ export default {
             }
           }
 
-
           .twoImg {
             .twoElImg {
               width: 112px;