safecheck-client 3.0.33-36 → 3.0.33-38

package/src/filiale/rongchuang/pc/NewCheckpaper.vue

@@ -1,4 +1,4 @@
-<style scoped>
+<style scoped id="printStyle">
 .img {
   border: 1px solid #9773ed;
   width: auto;
@@ -57,74 +57,14 @@ div {
       <div @click="back()">
         <img src="../../../assets/back.png" style="margin: 0px"/>
       </div>
-      <div style="margin-top:20px">
-        <button class="button_search" @click="updateSpotCheck('合格')">合格</button>
-      </div>
-      <div style="margin-top:20px">
-        <button class="button_search" @click="NoSpotCheck">不合格</button>
-      </div>
     </div>
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
         <div class="col-md-5" style="margin-right: 2%;margin-left: 2%;height: 100%;overflow: scroll">
           <div style="width: 100%;margin: auto">
-            <table class="table table-striped table-bordered" style="margin-bottom: 6px">
-              <thead>
-              <tr>
-                <th colspan="6" style="text-align: center">用户基本信息</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户编号:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_userinfo_code }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用户名称:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_user_name }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">证件号码:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_idnumber }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">用户类型:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_check_type }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">用户电话:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_user_phone }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">区 / 县:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_area }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">备注信息:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_comments }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">小区名称:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_residential_area }}</td>
-              </tr>
-              <tr>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px">详细住址:</td>
-                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_address }}</td>
-              </tr>
-              </tbody>
-            </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered" style="margin-top: 40px"
+                   v-show="paperdata.f_entry_status=='入户'">
               <thead>
               <tr>
                 <th colspan="4" style="text-align: center">用户安检概况</th>
@@ -143,109 +83,100 @@ div {
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">燃气使用:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_usegas }}</td>
               </tr>
-              <tr>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{
-                    paperdata.f_client_evaluation
-                  }}
-                </td>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ ajresult }}</td>
-              </tr>
               <tr>
                 <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">备注:</td>
                 <td colspan="3"
                     style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
-                  {{ paperdata.f_remarks }}
+                  {{ paperdata.f_repair_approved_note }}
                 </td>
               </tr>
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" style="margin-top: 35px"
+                   v-show="paperdata.f_entry_status=='入户'">
+              <thead>
               <tr>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
-                <td colspan="3"
-                    style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
-             <span v-for="deviceCollect in deviceCollects">
-                      <span class="li-font">
-                        {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
-                      </span>
-                <br>
-             <span v-if="deviceCollect.value == '有隐患'">
-               <lable>
-                 隐患:
-               </lable>
-               <span class="li-font" v-for="val in deviceCollect.devices">
-                        {{ val }}&nbsp;&nbsp;&nbsp;
-                      </span><br>
-             </span>
+                <th style="text-align: center">总体安检照片</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 550px;background: #FFFFFF">
+                    <div class="img" v-for="img in paperdata.f_overall_imgs">
+                      <img-self-plus :list="paperdata.f_overall_imgs " :src="img.f_overall_path" style="float: left"
+                                     width="150"
+                                     height="200"></img-self-plus>
+                    </div>
+                  </div>
+
 
-           </span>
                 </td>
-              </tr>
 
+              </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status!='入户'">
+            <table class="table table-striped table-bordered" style="width: 100%"
+                   v-show="paperdata.f_entry_status=='入户' && (paperdata.f_sign_path || f_user_path) ">
               <thead>
               <tr>
-                <th colspan="4" style="text-align: center">用户安检概况</th>
+                <th style="text-align: center">用户签名照片</th>
               </tr>
               </thead>
               <tbody>
               <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_onsite_time }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_offsite_time }}</td>
-              </tr>
-              <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
-                <td colspan="2" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
-                  {{ paperdata.f_entry_status }}
+                <td style="margin: auto;text-align: center" v-if="paperdata.f_sign_path">
+                  <div class="container" style="max-width: 500px;background: #FFFFFF"  >
+                    <div class="img" style="float: none">
+                      <img-self-plus :src="'rs/image/file/'+paperdata.f_sign_path" width="200" height="200"></img-self-plus>
+                    </div>
+                  </div>
                 </td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">
-                  <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">
-                    {{ dev.lname }}
-                    查看{{ data.f_entry_status }}照片
-                  </button-link>
+                <td style="margin: auto;text-align: center" v-if="f_user_path">
+                  <div class="container" style="max-width: 550px;background: #FFFFFF" >
+                    <div class="img" style="float: none">
+                      <img-self-plus :src="'rs/image/file/'+f_user_path"
+                                     width="200"
+                                     height="200"></img-self-plus>
+                    </div>
+                  </div>
                 </td>
               </tr>
-
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered"
+                   v-show="paperdata.f_entry_status=='入户' && paperdata.f_defect_notified">
               <thead>
               <tr>
-                <th style="text-align: center">总体安检照片</th>
+                <th style="text-align: center">安检通知书/隐患整改通知书</th>
               </tr>
               </thead>
               <tbody>
               <tr>
                 <td style="margin: auto;text-align: center">
-                  <div class="container" style="max-width: 550px;background: #FFFFFF">
-                    <div class="img" v-for="img in paperdata.f_overall_imgs">
-                      <img-self-safe :src="img.f_overall_path" style="float: left" width="150"
-                                     height="200"></img-self-safe>
+                  <div class="container" style="max-width: 500px;background: #FFFFFF">
+                    <div class="img" style="float: none">
+                      <img-self-plus :src="paperdata.f_notified_path" width="486" height="300"></img-self-plus>
                     </div>
                   </div>
-
-
                 </td>
-
               </tr>
               </tbody>
             </table>
-            <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
+            <table class="table table-striped table-bordered"
+                   v-show="paperdata.f_entry_status=='入户'&& paperdata.f_video_path">
               <thead>
               <tr>
-                <th style="text-align: center">用户签名照片</th>
+                <th style="text-align: center">安检视频</th>
               </tr>
               </thead>
               <tbody>
               <tr>
                 <td style="margin: auto;text-align: center">
                   <div class="container" style="max-width: 500px;background: #FFFFFF">
-                    <div class="img" style="float: none">
-                      <img-self-safe :src="paperdata.f_sign_path" width="486" height="300"></img-self-safe>
-                    </div>
+                    <video width="320" height="200" controls v-if="paperdata.f_video_path">
+                      <source :src="paperdata.f_video_path" type="video/mp4">
+                    </video>
                   </div>
                 </td>
               </tr>
@@ -275,49 +206,43 @@ div {
         <div class style="width: 1%;height: 100%;background-color: #F1F8FF;float: left;"></div>
         <div class="col-md-6" style="height: 100%;overflow: scroll">
           <div style="width: 95%;margin-left: 5%">
-            <table class="table table-striped table-bordered" v-for="config in deviceconfig2">
-              <thead v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
+            <table class="table table-striped table-bordered" v-for="config in deviceconfig2" style="margin-top: 35px">
+              <thead >
               <tr>
-                <th style="text-align: center">{{ config.checkname }}</th>
+                <th style="text-align: center">{{ config.f_device_type }}</th>
               </tr>
               </thead>
-              <tbody v-show="!(config.checkname!='燃气表'&&paperdata.f_entry_status!='入户')">
-              <tr v-for="dev in config.items">
-                <td v-if="dev.type!='text'">
+              <tr v-for="dev in config.f_items">
+                <td>
                   <div class="row">
                     <div class="col-md-8" style="text-align: center;">
                       <label>
-                        <button-link type="button" class="btn btn-link" @click="showpicture(config.checkname,dev.lname)"
-                                     :style="isred(config.checkname,dev.lname)?'color:red':'color:black'">
-                          {{ dev.lname }}
+                        <button-link type="button" class="btn btn-link"
+                                     :style="'color:black'">
+                          {{ dev.f_item_name }}
                         </button-link>
                       </label>
                     </div>
                     <div class="col-md-4" style="text-align: center">
                       <label style="font-weight: normal"
                              v-if="dev.type!='picture'">{{
-                          getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无'
+                          dev.f_item_lists[0].f_item_value
                         }}</label>
                       <label style="font-weight: normal" v-if="dev.type=='picture'">
-                        <div v-show="getDevicePath(config.checkname,dev.lname)">
+                        <div v-if="dev.f_path">
                           <button-link style="color: black" type="button" class="btn btn-link"
-                                       @click="showpath(getDevicePath(config.checkname,dev.lname),dev.lname)">查看照片
+                                       @click="showpath('rs/image/file/'+dev.f_path)">查看照片
                           </button-link>
                         </div>
-                        <div v-show="!getDevicePath(config.checkname,dev.lname)">无照片</div>
+                        <div v-else>无照片</div>
                       </label>
                     </div>
                   </div>
                 </td>
-                <td v-if="dev.type==='text'">
-                  <label style="width: 100%;text-align: center">{{ dev.lname }}</label>
-                </td>
               </tr>
-              </tbody>
             </table>
           </div>
         </div>
-
       </div>
     </div>
   </div>
@@ -329,13 +254,13 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self-safe v-if="showimg1" :src="showimg1" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="showimg1" :src="showimg1" width="240" height="300"></img-self-plus>
           </div>
           <div class="col-md-6">
-            <img-self-safe v-if="showimg2" :src="showimg2" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="showimg2" :src="showimg2" width="240" height="300"></img-self-plus>
           </div>
           <div class="col-md-6" v-for="item in otherDarginShowImgs">
-            <img-self-safe v-if="item.path" :src="item.path" width="240" height="300"></img-self-safe>
+            <img-self-plus v-if="item.path" :src="item.path" width="240" height="300"></img-self-plus>
           </div>
         </div>
       </div>
@@ -352,12 +277,34 @@ div {
       <div class="from-group">
         <div class="row">
           <div class="col-md-6">
-            <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3" width="300"
-                           height="400"></img-self-safe>
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3"
+                           width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path"
+                           :src="showimg5" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path"
+                           :src="showimg6" width="282"
+                           height="400"></img-self-plus>
           </div>
           <div class="col-md-6">
-            <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4" width="300"
-                           height="400"></img-self-safe>
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path"
+                           :src="showimg4" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path"
+                           :src="showimg7" width="282"
+                           height="400"></img-self-plus>
+          </div>
+          <div class="col-md-6">
+            <img-self-plus v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path"
+                           :src="showimg8" width="282"
+                           height="400"></img-self-plus>
           </div>
         </div>
       </div>
@@ -366,38 +313,39 @@ div {
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
-  <modal :show.sync="showSpotCheckButton" v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      安检抽检
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group">
-        <div class="row">
-          <lable>抽检不合格原因</lable>
-          <textarea v-model="spotCheckMessage"></textarea>
+  <modal :show.sync="showModel" :width="'50%'" :backdrop="false">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        安检审核备注
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row">
+        <div class="form-group col-sm-4">
+          <label class="font_normal_body">审核备注:</label>
+          <textarea v-model="message"></textarea>
         </div>
       </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-success" @click='SpotCheckSuccess'>确认</button>
-      <button type="button" class="btn btn-success" @click='SpotCheckCancel'>取消</button>
-    </footer>
+    </div>
+    <div slot="modal-footer" class="modal-footer" style="text-align: center">
+      <button class="button_search" style="margin-right: 15px" @click="auditFailOK()">确定</button>
+      <button class="button_search" style="margin-right: 15px" @click="auditFailCancel()">取消</button>
+    </div>
   </modal>
 </template>
 
 <script>
-import ObjConfig from '../../../utils/GerJsonObjectConfig'
+import html2pdf from 'html2pdf.js'
 import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
 import Radio from 'vue-client/src/vue-strap/src/radioBtn'
 import Vue from 'vue'
 import * as Util from '../../Util'
-import {jsonSort} from '../../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
 
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/tel_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -407,38 +355,54 @@ let asyncReady = async function (self) {
     })/*.then(res=>{*/
     //tag
     //tag)
+    console.log(res)
     if (!res.data[0].f_dir) {
       self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     } else {
       //this.f_dir=res.data[0].f_dir
+      let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
       try {
-        let res1 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: null,
-          rejectMsg: null
+        let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+          resolveMsg: '获取居民配置项成功！',
+          rejectMsg: '获取居民配置项出错！'
         })/*.then(res=>{*/
         //tag
         //this.safeConfig["民用配置项"]=Object.assign({},res.data)
+        if (!Vue.config.safecheck) {
+          Vue.config = {safecheck: {}}
+        }
         Vue.config.safecheck.DevicesConfig = res1.data
+        console.log(Vue.config.safecheck.DevicesConfig)
         /*})*/
-        let res2 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: null,
-          rejectMsg: null
+        let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+          resolveMsg: '获取非居民配置项成功！',
+          rejectMsg: '获取非居民配置项出错！'
         })/*.then(res=>{*/
         //tag
         //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
-
+        Vue.config.safecheck.DevicesSetConfig = {}
       } catch (e) {
-
+        self.$showMessage("获取配置文件失败" + e)
+        self.loading = false
       }
     }
+    if (self.data.f_recheck_id) {
+      let res3 = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+        data: {
+          items: '*',
+          tablename: 't_check_paper',
+          condition: `id  = '${self.data.f_recheck_id}'`,
+          orderitem: 'id'
+        }
+      })
+      self.lastCheckData = res3.data[0]
+    }
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
       throw error
     }
+    this.loading = false
   }
 }
 export default {
@@ -446,17 +410,23 @@ export default {
   props: ['f_plan_id', 'item', 'role'],
   data() {
     return {
+      f_user_path:'',
+      message: '',
+      showButton: false,
+      showModel: false,
       data: {
         f_devices: [],
         f_defect_content: ''
       },
+      showPdfDownload: this.$appdata.getSingleValue('安检结果pdf下载') ? this.$appdata.getSingleValue('安检结果pdf下载') : false,
+      lastCheckData: {},
       paperdata: {},
       picturename: '隐患照片',
       defectDevice: {},
       hasDevice: false,
       deviceCollect: {},
       deviceCollects: [],
-      isshow: false,
+      isshow: true,
       ajresult: '',
       loading: true,
       imgshow: false,
@@ -467,6 +437,10 @@ export default {
       showimg2: '',
       showimg3: '',
       showimg4: '',
+      showimg5: '',
+      showimg6: '',
+      showimg7: '',
+      showimg8: '',
       hiddenDangerImgNumber: 0, //配置项中隐患照片数
       otherDarginShowImgs: [],//其他隐患图片
       startClick: false, //开始安检按钮是否可点击
@@ -482,6 +456,7 @@ export default {
       configAJ: [],
       configRQ: [],
       deviceconfig: {},
+      newConfig: '',
       deviceconfig2: [],
       f_devices: [],
       config: {
@@ -489,29 +464,19 @@ export default {
           "checkmust": true,
           "index": 1,
           "items": {
-            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "气表表号": {"index": 1, "type": "string", "readonly": true},
+            "基表编号": {"index": 1, "type": "string", "readonly": true},
             "气表型号": {"index": 2, "type": "string", "readonly": true},
             "气表品牌": {"index": 3, "type": "string", "readonly": true},
-            "气表类型": {"index": 4, "type": "string", "readonly": true},
-            "进气方向": {
-              "index": 5,
-              "type": "selector",
-              "options": [{"data": "左表", "isdefault": false}, {"data": "右表", "isdefault": false}],
-              "checkmust": true
-            },
-            "初始表底": {"index": 6, "type": "number", "isshow": false, "readonly": true},
-            "上期表读数": {"index": 7, "type": "number", "readonly": true, isshow: false},
-            "累购气量": {"index": 8, "type": "number", "readonly": true},
-            "累购金额": {"index": 8, "type": "number", "readonly": true},
-            "已用气量": {"index": 9, "type": "number", "checkmust": false},//基表数
-            "已用金额": {"index": 9, "type": "number", "checkmust": false},
-            "剩余气量": {"index": 10, "type": "number", "checkmust": false},//累购-已用
+            "进气方向": {"index": 4, "type": "string", "readonly": true},
+            "初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
+            "累购气量": {"index": 7, "type": "number", "readonly": true},
+            "已用气量": {"index": 8, "type": "number", "checkmust": false},//基表数
+            "剩余气量": {"index": 9, "type": "number", "checkmust": false},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额": {"index": 10, "type": "number", "checkmust": false},
-            "气量异常差值": {"index": 11, "type": "number", "readonly": true},
-            "金额异常差值": {"index": 11, "type": "number", "readonly": true},
-            "表箱号": {"index": 12, "type": "string", "readonly": true}
+            "气量异常差值": {"index": 10, "type": "number", "readonly": true},
+            "表箱号": {"index": 11, "type": "string", "readonly": true},
+            "燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         }
@@ -522,34 +487,22 @@ export default {
           "checkmust": true,
           "index": 1,
           "items": {
-            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "气表表号": {"index": 1, "type": "string", "readonly": true},
+            "基表编号": {"index": 1, "type": "string", "readonly": true},
             "气表型号": {"index": 2, "type": "string", "readonly": true},
             "气表品牌": {"index": 3, "type": "string", "readonly": true},
-            "气表类型": {"index": 4, "type": "string", "readonly": true},
-            "进气方向": {
-              "index": 5,
-              "type": "selector",
-              "options": [{"data": "左表", "isdefault": false}, {"data": "右表", "isdefault": false}],
-              "checkmust": true
-            },
-            "初始表底": {"index": 6, "type": "number", "isshow": false, "readonly": true},
-            "上期表读数": {"index": 7, "type": "number", "readonly": true, isshow: false},
-            "累购气量": {"index": 8, "type": "number", "readonly": true},
-            "累购金额": {"index": 8, "type": "number", "readonly": true},
-            "已用气量": {"index": 9, "type": "number", "checkmust": false},//基表数
-            "已用金额": {"index": 9, "type": "number", "checkmust": false},
-            "剩余气量": {"index": 10, "type": "number", "checkmust": false},//累购-已用
+            "进气方向": {"index": 4, "type": "string", "readonly": true},
+            "初始表底": {"index": 5, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 6, "type": "number", "readonly": true, isshow: false},
+            "累购金额": {"index": 7, "type": "number", "readonly": true},
+            "已用金额": {"index": 8, "type": "number", "checkmust": false},
             //显示屏数  --实际剩余气量
-            "剩余金额": {"index": 10, "type": "number", "checkmust": false},
-            "气量异常差值": {"index": 11, "type": "number", "readonly": true},
-            "金额异常差值": {"index": 11, "type": "number", "readonly": true},
-            "表箱号": {"index": 12, "type": "string", "readonly": true}
+            "剩余金额": {"index": 9, "type": "number", "checkmust": false},
+            "金额异常差值": {"index": 10, "type": "number", "readonly": true},
+            "表箱号": {"index": 11, "type": "string", "readonly": true},
+            "燃气表照片": {"index": 12, "type": "picture", "checkmust": false},
           }
         }
       },
-      showSpotCheckButton: false,
-      spotCheckMessage:''
     }
   },
   components: {
@@ -572,7 +525,6 @@ export default {
       },
       set(val) {
         if (this.isStrat) {
-          //;
           this.$goto(val, {userinfo: this.data}, 'paper-router')
         } else {
           this.$showMessage('未开始安检！')
@@ -586,38 +538,75 @@ export default {
     }
   },
   methods: {
-    updateSpotCheck(value) {
-      var reqData = {
-        paperId:this.item.id,
-        userName: this.$login.f.name,
-        spotCheckState: '已抽检',
-        spotCheckResult: value,
-        spotCheckMessage:this.spotCheckMessage
+    exportToPDF() {
+      const element = document.getElementById('toPdf') // 替换为您要导出的页面元素的ID
+      html2pdf(element)
+    },
+
+    showAudit() {
+      var audit = this.$appdata.getSingleValue('安检审核');
+      if (audit == '是' && (this.item.f_approved == '未审核' || !this.item.f_approved)) {
+        this.showButton = true
+      }
+    },
+    //安检审核成功
+    auditSuccesss() {
+      this.loading = true;
+      var reqdata = {
+        audit_result: '通过',
+        operator: "success",
+        audit_time: Util.getNowDate(),
+        user_name: this.$login.f.name,
+        id: this.item.id,
+        f_check_item_id: this.item.f_check_item_id
       }
-      new HttpResetClass().load('POST', 'rs/logic/updateSpotCheck', reqData).then(res => {
-        if (res.data = 200) {
-          this.$showMessage('安检抽检完成')
+      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.loading = false;
+          this.$back()
         }
       })
     },
-    NoSpotCheck() {
-      this.showSpotCheckButton = true
+    auditFail() {
+      this.showModel = true;
     },
-    SpotCheckSuccess() {
-      this.updateSpotCheck('不合格')
-      this.spotCheckMessage = ''
-      this.showSpotCheckButton = false
+    auditFailOK() {
+
+      this.loading = true;
+      var reqdata = {
+        message: this.message,
+        audit_result: '不通过',
+        operator: "fail",
+        audit_time: Util.getNowDate(),
+        user_name: this.$login.f.name,
+        id: this.item.id,
+        f_check_item_id: this.item.f_check_item_id
+      }
+      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.loading = false;
+          this.message = '';
+          this.showModel = false;
+          this.$back()
+        }
+      })
     },
-    SpotCheckCancel() {
-      this.spotCheckMessage = ''
-      this.showSpotCheckButton = false
+    auditFailCancel() {
+      this.showModel = false;
+      this.message = '';
     },
+
     devicesCollect() {
       //tag
       //tag)
       //tag)
       //tag
-
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
@@ -634,11 +623,15 @@ export default {
               f_device_type = this.data[device][item].f_device_type
             }
             // //tag
+            let deviceelse = []
             let deviceInfos = []
             for (let i in this.data[device][item].f_items) {
               let defects = ''
+
               let items = this.data[device][item].f_items[i]
-              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
+
+
+              if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox' || items.type === 'picture') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
 
@@ -646,10 +639,19 @@ export default {
                   //tag)
                   //tag)
                   //tag)
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+
+                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name] && (items.isdefect && (items.isdefect == 'true' || items.isdefect == true))) {
+                    continue
+                  }
+                  /*if(items.f_is_defect != true && items.f_is_defect != 'true'){
                     continue
+                  }*/
+                  if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    defects = `${defects}:${items.f_item_value}/`
                   }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  /*let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
                   for (let option in options) {
                     if (options[option].data == f_item_value) {
                       if (options[option].isdefect == 'true' || options[option].isdefect == true) {
@@ -659,16 +661,18 @@ export default {
                         // let level = options[option].level
                       }
                     }
-                  }
+                  }*/
                   //tag)
                 }
                 if (defects != '') {
-                  deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
+                  console.log('有隐患items', items)
+                  deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}${items.f_else ? items.f_else : ''}`)
                 }
-              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
+              } else if ((items.type === 'string' || items.type === 'number') && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+
               } else if (items.f_item_name == '金额异常差值') {
                 var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
                 //tag
@@ -690,6 +694,17 @@ export default {
                   }
                 }
               }
+              if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+                // console.log('this.config[this.data[device][item].f_device_type]', this.config[this.data[device][item].f_device_type])
+                // console.log('this.deviceconfig2', this.deviceconfig2)
+                for (let dev in this.deviceconfig2) {
+                  if (this.deviceconfig2[dev].checkname == this.data[device][item].f_device_type) {
+                    this.deviceconfig2[dev].items.push({
+                      lname: items.f_item_name
+                    })
+                  }
+                }
+              }
               //tag)
               //tag
               //tag
@@ -705,6 +720,9 @@ export default {
             this.$set('deviceCollect.name', f_device_type)
             this.$set('deviceCollect.value', checkResult)
             this.$set('deviceCollect.devices', deviceInfos)
+            this.$set('deviceCollect.else', deviceelse)
+            console.log('deviceCollect.devices', this.deviceCollect.devices)
+            console.log('deviceCollect.else', this.deviceCollect.else)
             //tag)
             if (this.deviceCollect.name) {
               //tag
@@ -721,8 +739,13 @@ export default {
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
+      this.showimg5 = this.data.f_noanswer1_path
+      this.showimg6 = this.data.f_noanswer2_path
       this.showimg4 = this.data.f_rejectcheck_path
+      this.showimg7 = this.data.f_rejectcheck1_path
+      this.showimg8 = this.data.f_rejectcheck2_path
       this.paperdata = this.data
+      this.f_user_path = this.paperdata.f_user_pictures ? JSON.parse(this.paperdata.f_user_pictures)[0].f_user_path : ''
       this.loading = false
     },
     imgclose() {
@@ -863,7 +886,8 @@ export default {
               if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
                 if (this.devicesAll[i][j].f_items[k].f_item_lists[0]) {
                   for (let l = 0; l < this.devicesAll[i][j].f_items[k].f_item_lists.length; l++) {
-                    aa += this.devicesAll[i][j].f_items[k].f_item_lists[l].f_item_value + ' '
+                    let val = this.devicesAll[i][j].f_items[k].f_item_lists[l].f_item_value
+                    aa += (val === null ? '空' : val) + ' '
                   }
                   return aa
                 }
@@ -894,7 +918,7 @@ export default {
       let keyall = Object.keys(this.data)
       for (let i = 0; i < keyall.length; i++) {
         //tag)
-        if (keyall[i].startsWith('device') && keyall[i] != 'deviceundefined') {
+        if ((keyall[i].startsWith('f_devices') || keyall[i].startsWith('devices')) && keyall[i] != 'deviceundefined') {
           this.devicesAll.push(this.data[keyall[i]])
           //tag
         }
@@ -1225,106 +1249,18 @@ export default {
     }
   },
   ready() {
-    this.putDevices()
-    if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
-      if (this.role != 'inspect') {
-        let that = this
-        let id
-        if (this.role == 'view') {
-          id = this.item.id
-        } else if (this.role == 'androidview') {
-          id = this.item.f_paper_id
-        }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-            //tag
-            if (respanse.data.length != 0) {
-              // 包含 其它 特殊处理的数组
-              // 对应位置
-
-              //tag
-
-              that.data = Object.assign(that.data, respanse.data[0])
-              if (respanse.data[0].f_devices) {
-                for (let da in that.devices) {
-                  that.$set('data.device' + that.devices[da].n, [])
-                }
-                respanse.data[0].f_devices.forEach((item) => {
-                  for (let de in that.devices) {
-                    if (that.devices[de].device == item.f_device_type) {
-                      item.f_items.forEach((f_item) => {
-                        //tag
-                        //tag
-                        let itemValues = []
-                        f_item.f_item_lists.forEach((tempItem) => {
-                          //tag
-                          if (tempItem.f_item_value !== 'null') {
-                            itemValues.push(tempItem.f_item_value)
-                          }
-                        })
-                        f_item.f_item_value = itemValues
-                      })
-                      that.data['device' + that.devices[de].n].push({
-                        f_device_type: item.f_device_type,
-                        f_items: item.f_items
-                      })
-                    }
-                  }
-                })
-              }
-              Util.replaceFalse(that.data)
-              Util.booleanFilter(that.data)
-              if (this.role == 'view') {
-                Util.ratifyPics(that.data)
-                Util.ratifyPics(that.picture)
-              } else {
-                Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
-              }
-              //tag
-            }
-            // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
-            this.isshow = true
-            asyncReady(this).then(() => {
-              //tag
-              //tag)
-              if (this.data.f_check_type == '民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              } else if (this.data.f_check_type == '非民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              }
-              if (this.data.f_collection_type == '按金额') {
-                let aaa = Object.assign({}, this.config2["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
-                //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-                //tag)
-              } else {
-                let aaa = Object.assign({}, this.config["燃气表"].items, this.deviceconfig["燃气表"].items)
-                this.deviceconfig["燃气表"].items = aaa
-                //tag)
-              }
-              this.deviceconfig2 = ObjConfig.getObjConfig(this.deviceconfig)
-              this.deviceconfig2[0].items = jsonSort(this.deviceconfig2[0].items, "index")
-              this.deviceconfig2[1].items = jsonSort(this.deviceconfig2[1].items, "index")
-              this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
-              this.getDeviceAll()
-
+    setTimeout(() => {
+      this.loading = false;
+    }, 3000)
+    this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.id}'`}}).then((respanse) => {
+      //tag
+      this.paperdata = respanse.data[0]
+      this.paperdata.f_overall_imgs.forEach(item=>{
+        item.f_overall_path = 'rs/image/file/'+item.f_overall_path
+      })
+      this.deviceconfig2 = Object.assign(this.data, respanse.data[0].f_devices)
+    })
 
-            })
-          }
-        ).catch(
-          (respanse) => {
-            //tag
-            alert('查找安检单失败')
-          })
-      }
-    }
 
   },
   watch: {