safecheck-client 3.0.30-3 → 3.0.30-34

package/src/filiale/kelai/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
   'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },

package/src/filiale/pingxiang/pc/DefectPaperNew.vue

@@ -545,7 +545,7 @@ export default {
       cbcs:[],
       thead: '',
       headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细'],
-      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content'],
+      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext'],
     }
   },
   props:{

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

@@ -123,6 +123,10 @@
         <input type="checkbox" v-model="paper.f_gas_manual" /><label class="text-left font" >安全用气手册</label>
       </div>
     </div>
+    <div class="row">
+      <label for="readsafe" class="text-left font">蓝牙状态:{{blueState}}</label>
+      <button type="button" @click="initBlueState()">重新连接</button>
+    </div>
     <div class="form-group col-md-12 col-sm-12 col-xs-12"  :class="style__">
       <div  class="form-group col-md-12 col-sm-12 col-xs-12">
         <input type="checkbox" v-model="paper.f_defect_notified" class="showIi" />隐患整改单
@@ -463,6 +467,7 @@
     title: '用户反馈',
     data() {
       return {
+        blueState:'',
         defectImgs: [],
         defectToolTip: [],
         defectReason: [],
@@ -525,6 +530,25 @@
       Radio
     },
     methods: {
+      initBlueState(){
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          if (state && state.state == -1){
+            this.$showMessage('蓝牙连接未打开，打开后重新尝试')
+            return
+          }
+          this.blueState = '连接失败，请重试'
+          this.$androidUtil.print(JSON.stringify([{ type: 4, value: 2, unit: 'line' }]))
+          let state2 = HostApp.getBluetoothState()
+          if (state2 && state2.state == 3){
+            this.blueState = '连接完成'
+          }else {
+            this.blueState = '连接失败，请重试'
+          }
+        }
+      },
       timeSet(val) {
         //////tag
         if (!val) {
@@ -759,6 +783,16 @@
           return hasError
       },
       print() {
+        let state = HostApp.getBluetoothState()
+        if (state && state.state == 3){
+          this.blueState = '连接完成'
+        }else {
+          this.blueState = '连接失败，请重试'
+        }
+        if (state && state.state == -1){
+          this.$showMessage('蓝牙未打开，请确认蓝牙是否打开')
+          return
+        }
       let errString = this.verify()
       if (errString) {
         ////tag
@@ -1193,6 +1227,12 @@
       },
     },
     async ready() {
+      let state = HostApp.getBluetoothState()
+      if (state && state.state == 3){
+        this.blueState = '连接完成'
+      }else {
+        this.blueState = '连接失败，请重试'
+      }
       this.isRecodr = this.$appdata.getSingleValue('无限制录音');
       // await this.isoverDate()
       ////tag

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

@@ -481,9 +481,6 @@ export default {
       if (!this.selectPcd.id) {
         checked = {ischeck: false, msg: '请选择省市区！'}
       }
-      if (!this.selectStreet.id) {
-        checked = {ischeck: false, msg: '请选择街道！'}
-      }
       if (!this.userinfo.addressinfo.f_address) {
         checked = {ischeck: false, msg: '新地址不能为空！'}
       }
@@ -494,6 +491,9 @@ export default {
         if (!this.userinfo.addressinfo.f_room) {
           checked = {ischeck: false, msg: '新输入门牌号！'}
         }
+        if (!this.selectStreet.id) {
+          checked = {ischeck: false, msg: '请选择街道！'}
+        }
       }
       if (this.userinfo.meterinfo[0].f_meter_classify == '机表' && this.userinfo_old.meterinfo[0].f_meternumber) {
 
@@ -616,6 +616,9 @@ export default {
       }
       this.$showMessage('确定是否修改上传用户信息？', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
+          this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area ? this.selectArea.f_residential_area : ''
+          this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id ? this.selectArea.id : ''
+          this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area ? this.selectArea.f_slice_area : ''
           this.excessive = true
           let address = {}
           address.f_filialeid = this.userinfo.addressinfo.f_filialeid
@@ -695,6 +698,9 @@ export default {
       }
       this.$showMessage('确定是否修改上传审核用户信息？', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
+          this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area ? this.selectArea.f_residential_area : ''
+          this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id ? this.selectArea.id : ''
+          this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area ? this.selectArea.f_slice_area : ''
           this.excessive = true
           let address = {}
           address.f_filialeid = this.userinfo.addressinfo.f_filialeid

package/src/filiale/tongchuan/android/SafecheckDevices.vue

@@ -891,6 +891,7 @@
         let it = {
           type: this.config[this.device.device].items[item].type,
           f_item_name: item,
+          f_alias_name: this.config[this.device.device].items[item].alias_name,
           checkmust: this.config[this.device.device].items[item].checkmust,
           f_item_value: f_item_value,
           f_is_defect: '',

package/src/filiale/tongchuan/pc/PaperDefectMain.vue

@@ -568,6 +568,8 @@
         excelHeaders: {
           'f_device_type': '检查项',
           'f_item_name': '隐患名称',
+          'f_item_value': '隐患原因',
+          'f_alias_name': '隐患别名',
           'f_userinfo_code': '客户编号',
           'f_user_name': '客户姓名',
           'f_user_phone': '客户电话',

package/src/filiale/wenxi/pc/DefectPaper.vue

@@ -362,7 +362,7 @@
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
-        <plan-chooser :f.sync="this.$login.f" v-ref:chooser></plan-chooser>
+        <plan-chooser :f.sync="$login.f" v-ref:chooser></plan-chooser>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
         <button class="button_search" @click="ok">确认</button>