safecheck-client 3.0.34-9 → 3.0.34-90

package/src/filiale/baiyin/android.js

@@ -3,6 +3,7 @@ import Vue from "vue";
 
 // 手机特殊目录注册到该文件中
 let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
 }
 

package/src/filiale/baiyin/pc/CheckSearchUser.vue

@@ -729,8 +729,8 @@ export default {
           args.condition += " and f_last_check_date <= '" + args.model.f_check_end + "'"
         }
       }*/
-      args.condition += " and f_filialeid in  " + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)})`)
-      let con = ' f_filialeid in  ' + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)})`)
+      args.condition += " and f_filialeid in  " + (this.model.f_filialeids ? this.model.f_filialeids : `('${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}')`)
+      let con = ' f_filialeid in  ' + (this.model.f_filialeids ? this.model.f_filialeids : `('${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}')`)
       con += args.model.f_userinfo_code ? ` and f_userinfo_code like '%${args.model.f_userinfo_code}%'`:''
       /*con += args.model.f_user_name ? ` and f_user_name like '%${args.model.f_user_name}%'` : ''
       con += args.model.f_residential_area ? ` and f_residential_area like '%${args.model.f_residential_area}%'` : ''

package/src/filiale/baiyin/pc/DefectListNew.vue

@@ -510,9 +510,9 @@ export default {
       this.solveModal.preData.defectImg1 = row.f_p1_path?'/rs/image/file/' + row.f_p1_path:''
       this.solveModal.preData.defectImg2 = row.f_p2_path?'/rs/image/file/' + row.f_p2_path:''
       this.solveModal.preData.defectImg3 = row.f_p3_path?'/rs/image/file/' + row.f_p3_path:''
-      this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
-      this.solveModal.preData.repairedImg2 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
-      this.solveModal.preData.repairedImg3 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
+      this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_dealpath
+      this.solveModal.preData.repairedImg2 = row.f_other_dealpath1 ? ('/rs/image/file/' + row.f_other_dealpath1) : ''
+      this.solveModal.preData.repairedImg3 = row.f_other_dealpath2 ? ('/rs/image/file/' + row.f_other_dealpath2) : ''
       this.solveModal.preData.repairedImg4 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
       this.solveModal.uploadData.id = row.id
       this.solveModal.preData.type = type

package/src/filiale/baiyin/pc/PaperList.vue

@@ -163,7 +163,7 @@
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开户时间</label>
+                <label class="font_normal_body">建档时间</label>
                 <datepicker
                   :value.sync="model.f_check_gasstart"
                   placeholder='开始时间' style="width: 60%"
@@ -171,11 +171,11 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_gasstart"
-                  condition="f_gas_date > ='{} 00:00:00'">
+                  condition="f_createfile_date > ='{} 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">开户时间</label>
+                <label class="font_normal_body">建档时间</label>
                 <datepicker
                   :value.sync="model.f_check_gasend"
                   placeholder='结束时间' style="width: 60%"
@@ -183,7 +183,7 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_gasend"
-                  condition="f_gas_date <=  '{} 23:59:59'">
+                  condition="f_createfile_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.safeAudit && $parent.$parent.criteriaShow ">
@@ -333,7 +333,7 @@
                 <nobr>备注</nobr>
               </th>
               <th>
-                <nobr>开户时间</nobr>
+                <nobr>建档时间</nobr>
               </th>
               <th v-if="$parent.$parent.$parent.safeAudit">
                 <nobr>审核人</nobr>
@@ -374,7 +374,7 @@
             <td style="text-align: center">{{ row.f_offsite_time }}</td>
             <td style="text-align: center">{{ row.f_checker_name }}</td>
             <td style="text-align: center">{{ row.f_repair_approved_note }}</td>
-            <td style="text-align: center">{{ row.f_gas_date }}</td>
+            <td style="text-align: center">{{ row.f_createfile_date }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_by }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approvedstart_time }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_time }}</td>
@@ -502,7 +502,7 @@ export default {
           'f_checker_name': '安检员',
           'f_safecheck_type':'安检类型',
           'f_repair_approved_note': '备注',
-          'f_gas_date': '开户时间',
+          'f_createfile_date': '建档时间',
           'f_plan_name': '计划名称'
         },
         fun: this.$login.f,

package/src/filiale/bayan/android/AddPlanItem.vue

@@ -174,6 +174,14 @@
                   <p class="panel-title col-xs-4 text-left font">最后安检状态</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>
                 </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">表具状态</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_table_state }}</p>
+                </div>
+                <div class="row" v-if="row.f_table_state = '停用'">
+                  <p class="panel-title col-xs-4 text-left font">原因</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_table_state }}</p>
+                </div>
               </div>
             </div>
 

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -77,6 +77,20 @@
         </ol>
       </div>
     </div>
+    <div class="form-group col-sm-12 col-xs-12 col-md-12 info"  :class="style__">
+      <div class="text-center">
+        <label class="font">客户意见反馈：</label>
+      </div>
+      <div class="col-md-12 col-sm-12 col-xs-12">
+        <ol class="showIi">
+          <li>检查说明：</li>
+          <li>1.已对客户燃气设施进行了安全检查</li>
+          <li>2.已对客户进行了安全用气知识宣传，并发放宣传资料</li>
+          <li>3.已对客户资料进行了登记</li>
+          <li>4.已向隐患用户告知说明隐患整改项目,并充分向用户告知了存在的隐患内容及注意事项，用户已获悉其中的内容</li>
+        </ol>
+      </div>
+    </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
       <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
 
@@ -338,7 +352,7 @@
     </div>
   </modal>
 
-    <!--停用框-->
+  <!--停用框-->
   <modal :show.sync="showTYModel" v-ref:modal>
     <div slot="modal-header" class="modal-header">
       <h4 class="modal-title">
@@ -592,55 +606,55 @@ export default {
   methods: {
     //对用户停用
     async backlistTY() {
-        if (!this.tyCause) {
-          this.$showMessage("请填写停用原因！")
-          return
-        }
-        let http = new HttpResetClass()
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "f_userfiles_id,version",
-            tablename: "t_userfiles",
-            condition: "f_table_state in ('正常','停用','封堵') and f_userinfo_id= '" + this.paper.f_userinfoid + "'",
-            orderitem: "f_userfiles_id"
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        if (res2.data.length==0){
-          this.$showMessage('已成功停用')
-          this.showTYModel = false
-          return
-        }
-        let data = {
-          f_userfiles_id: {
-            f_userfiles_id: res2.data[0].f_userfiles_id,
-            f_table_state: '停用',
-            version: res2.data[0].version
-          },
-          f_userfile_id: res2.data[0].f_userfiles_id,
-          f_user_id: this.paper.f_userinfo_code,
-          f_userinfo_id: "'"+this.paper.f_userinfoid+"'",
-          f_user_name: this.paper.f_user_name,
-          f_othereason: this.tyCause,
-          f_operat_type: '停用',
-          f_describe: `${Vue.user.name}对客户${this.paper.f_user_name}进行停用操作`,
-          f_state: '有效',
-          f_user_phone: this.paper.f_user_phone,
-          f_operator: Vue.user.name,
-          f_operatorid: Vue.user.id,
-          f_orgid: Vue.user.orgid,
-          f_orgname: Vue.user.orgs,
-          f_depid: Vue.user.depids,
-          f_depname: Vue.user.deps,
-          f_zoneid: Vue.user.zoneid,
-          f_zones: Vue.user.zones
+      if (!this.tyCause) {
+        this.$showMessage("请填写停用原因！")
+        return
+      }
+      let http = new HttpResetClass()
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "f_userfiles_id,version",
+          tablename: "t_userfiles",
+          condition: "f_table_state in ('正常','停用','封堵') and f_userinfo_id= '" + this.paper.f_userinfoid + "'",
+          orderitem: "f_userfiles_id"
         }
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
-          data, {resolveMsg: null, rejectMsg: null}).then((row) => {
-          this.$showMessage('已成功停用')
-          this.paper.f_table_state = '停用'
-          this.$parent.$parent.data.f_table_state = '停用'
-          this.showTYModel = false
-        })
+      }, {resolveMsg: null, rejectMsg: null})
+      if (res2.data.length==0){
+        this.$showMessage('已成功停用')
+        this.showTYModel = false
+        return
+      }
+      let data = {
+        f_userfiles_id: {
+          f_userfiles_id: res2.data[0].f_userfiles_id,
+          f_table_state: '停用',
+          version: res2.data[0].version
+        },
+        f_userfile_id: res2.data[0].f_userfiles_id,
+        f_user_id: this.paper.f_userinfo_code,
+        f_userinfo_id: "'"+this.paper.f_userinfoid+"'",
+        f_user_name: this.paper.f_user_name,
+        f_othereason: this.tyCause,
+        f_operat_type: '停用',
+        f_describe: `${Vue.user.name}对客户${this.paper.f_user_name}进行停用操作`,
+        f_state: '有效',
+        f_user_phone: this.paper.f_user_phone,
+        f_operator: Vue.user.name,
+        f_operatorid: Vue.user.id,
+        f_orgid: Vue.user.orgid,
+        f_orgname: Vue.user.orgs,
+        f_depid: Vue.user.depids,
+        f_depname: Vue.user.deps,
+        f_zoneid: Vue.user.zoneid,
+        f_zones: Vue.user.zones
+      }
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
+        data, {resolveMsg: null, rejectMsg: null}).then((row) => {
+        this.$showMessage('已成功停用')
+        this.paper.f_table_state = '停用'
+        this.$parent.$parent.data.f_table_state = '停用'
+        this.showTYModel = false
+      })
     },
     //停用取消按钮
     tyCancel() {

package/src/filiale/bayan/android/PhoneUpUserinfo.vue

@@ -285,21 +285,21 @@
                       :options="deviceBrandOption[row.f_devices_type]"
                       close-on-select value-single></v-select> -->
           </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备型号:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">生产日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_service_life" />
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">设备型号:</label>-->
+<!--            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">生产日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_service_life" />-->
+<!--          </div>-->
           <!--          <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">到期日期:</label>
             &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_expire_date"  />&ndash;&gt;
@@ -311,31 +311,31 @@
                         :show-reset-button="reset" readonly="readonly">
             </datepicker>
           </div>-->
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"
-                                                                      v-model="row.f_input_person" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安装日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin:  5px 0">
-            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_devices_num" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">管道类型:</label>
-            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"
-                  v-model="row.f_pipe_type"
-                  placeholder='请选择管道类型'
-                  :width='wid'
-                  readonly
-                  :options="pipetypes"
-                  close-on-select value-single></v-select>
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"-->
+<!--                                                                      v-model="row.f_input_person" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安装日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin:  5px 0">-->
+<!--            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_devices_num" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">管道类型:</label>-->
+<!--            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"-->
+<!--                  v-model="row.f_pipe_type"-->
+<!--                  placeholder='请选择管道类型'-->
+<!--                  :width='wid'-->
+<!--                  readonly-->
+<!--                  :options="pipetypes"-->
+<!--                  close-on-select value-single></v-select>-->
+<!--          </div>-->
           <!--<div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备状态:</label><input type="text" class="form-control rightipt" readonly  v-model="row.f_userinfodevices_state"  />
           </div>-->

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -84,6 +84,13 @@
                     close-on-select>
           </v-select>
         </div>
+        <div class="row" style="margin-top: 10px">
+          <label class="font_normal_body">选择站点</label>
+          <right-tree
+            islist
+            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+            @re-res="getSiteRes"></right-tree>
+        </div>
         <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给维修员'">
           <label class="font_normal_body">维&ensp;修&ensp;员</label>
           <v-select
@@ -93,13 +100,6 @@
             placeholder='请选择维修员'
             close-on-select></v-select>
         </div>
-        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给站点'">
-          <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
-          <right-tree
-            islist
-            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
-            @re-res="getSiteRes"></right-tree>
-        </div>
         <!--<div class="row" style="margin-top: 10px">
           <label class="font_normal_body">报修类型</label>
           <v-select :value.sync="selectData.f_repairtype"
@@ -255,7 +255,7 @@
               "基表编号":{"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":4,"type":"string","readonly":true,isshow:false},
               "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
               "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
               "累购气量":{"index":7,"type":"number","readonly":true},
@@ -279,7 +279,7 @@
               "基表编号":{"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":4,"type":"string","readonly":true,isshow:false},
               "初始表底":{"index":5,"type":"string","isshow":false,"readonly":true},
               "累购金额":{"index":6,"type":"string","readonly":true},
               "表累购金额":{"index":7,"type":"string","readonly":false},
@@ -362,7 +362,7 @@
         }
         console.log("准备保存！")
         this.disableTimer()
-        this.getEmp()
+        // this.getEmp()
         this.showModal2=true
       },
       cancel1(){
@@ -377,14 +377,37 @@
       getSiteRes(obj) {
         console.log('siteRes ---> ')
         console.log(obj)
-        if(obj.resids[0]){
-          this.selectData.f_meetunit = obj.res.join('.')
-          this.selectData.f_reciever = obj.resids.join('.')
-          this.selectData.f_outlets = obj.res[obj.res.length - 1]
+        if(this.selectData.dispatchType=='派发给站点'){
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+            this.selectData.f_reciever = obj.resids.join('.')
+            this.selectData.f_outlets = obj.res[obj.res.length - 1]
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
         }else {
-          this.selectData.f_meetunit = ''
-          this.selectData.f_reciever = ''
-          this.selectData.f_outlets = ''
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
+          this.repairers = []
+          let vali = {
+            source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+            userid: `${obj.resids[0]}`
+          }
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            res.data.forEach((item) => {
+              if (item.state == '在职'){
+                this.repairers.push({label: `${item.name}`, value: item.name})
+              }
+            })
+          })
         }
       },
       rectification(){
@@ -417,7 +440,7 @@
           toRepair=null
         }else{
           console.log('派发给维修员---------'+this.selectData.f_repairman)
-          act={f_meetunit:'',f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
+          act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
           toRepair='一级派单'
         }
         let repData={
@@ -438,16 +461,16 @@
         this.save()
       },
       // 获取维修员
-      getEmp() {
-        this.repairers=[]
-        let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          res.data.forEach((user)=>{
-            this.repairers.push({label:user.name, value: user.name})
-          })
-        })
-      },
+      // getEmp() {
+      //   this.repairers=[]
+      //   let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
+      //   let http = new HttpResetClass()
+      //   http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     res.data.forEach((user)=>{
+      //       this.repairers.push({label:user.name, value: user.name})
+      //     })
+      //   })
+      // },
       closely(isdelete){
         try {
           var startOrStopAudioClipStr;
@@ -1308,6 +1331,9 @@
             } else {
               this.rowCodata = codata
             }
+            if (this.rowCodata.f_deputy_director){
+              HostApp.setPreference('f_deputy_director',this.rowCodata.f_deputy_director)
+            }
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1924,6 +1950,7 @@
         this.data.isupdateplanitem = this.$appdata.getSingleValue('在线安检回更有计划') ? this.$appdata.getSingleValue('在线安检回更有计划') : 'false'
         // 预约安检单工单编号
         this.data.f_SafeToRepair_id = this.item.f_service_id
+        this.data.f_deputy_director = HostApp.getPreference('f_deputy_director').data || ''
         this.data.ename = Vue.user.ename
         this.data.f_outlets = Vue.user.f_parentname
         this.data.f_meetunit = Vue.user.orgpathnames
@@ -2042,15 +2069,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2104,15 +2122,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2372,15 +2381,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2547,9 +2547,9 @@
               delete this.config['燃气表']['items']['气量异常差值']
             }
 
-            if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
-              that.config = that.config2
-            }
+            // if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
+            //   that.config.燃气表 = that.config2.燃气表
+            // }
 
             //tag)
             if (value.data[0].f_devices) {

package/src/filiale/bayan/android/SafecheckUserInfo.vue

@@ -243,6 +243,11 @@
                 this.$parent.$parent.item.f_plan_meters[0].f_metergasnums || this.$parent.$parent.item.f_plan_meters[0].f_initial_base
               }}</p>
           </div>
+          <div class="row">
+            <p class="panel-title col-xs-4 text-left font">上次隐患</p>
+            <p class="panel-title col-xs-8 text-left input-font">
+              {{ this.$parent.$parent.item.f_plan_meters[0].f_defect_text || '无' }}</p>
+          </div>
         </div>
       </div>
     </div>

package/src/filiale/bayan/pc/PaperList.vue

@@ -856,6 +856,7 @@ export default {
       ////tag
       //获取气表品牌
       this.getTableBrands()
+      this.getAllMeterBook()
       let gen = select(this)
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)