safecheck-client 3.0.34-1 → 3.0.34-100

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

@@ -1,160 +1,160 @@
-<template>
-  <div style="width: 100%;height: 100%">
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">公&emsp;&emsp;司</label>
-      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
-    </div>
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">{{ roleLable }}</label>
-      <v-select :value="selVal" v-model='selVal'
-                :value-single="!valueMultiple"
-                class="select_list select"
-                :options='users' :placeholder='roleName'
-                :close-on-select = 'valueClose'
-                :multiple="valueMultiple"
-                :width="rightWidth"
-                @change="valuechange">
-      </v-select>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      },
-      resobjprop: {
-        default: {}
-      },
-      valueClose: {
-        type: Boolean,
-        default: true
-      }
-    },
-    data() {
-      return {
-         source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        //source: `root.getResourceById($${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolesnames$).indexOf($${this.roleName}$) != -1)`,
-        allUsers: [],
-        users: [],
-        selVal: '',
-        organizationname:this.$login.f.f_fengongsi,
-        resids: [],
-        changeval: ''
-      }
-    },
-    watch: {
-      'value'(val) {
-        console.log("969696", val)
-        if (val) {
-          if (this.valueMultiple) {
-
-          } else {
-            this.selVal = val
-          }
-
-        }
-      }
-    },
-    async ready() {
-      await this.search()
-      await this.filterUser(this.resids)
-    },
-    methods: {
-      async search() {
-        let http = new HttpResetClass()
-        const res = await http.load('POST', '/rs/search', {
-          data: {
-            source: this.source,
-            userid: this.$login.f.id
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        this.allUsers = res.data
-      },
-      valuechange(val) {
-        console.log(`val instanceof Array======${!val instanceof Array}`)
-        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
-          return
-        }
-        if (this.valueMultiple && Array.isArray(val)) {
-          if (val && val.length > 0) {
-            let valuesele = `(`
-            for (let i = 0; i < val.length; i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
-          } else {
-            this.value = ''
-          }
-        } else {
-          this.value = val
-        }
-        // this.changeval = val
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        this.organizationname = obj.res[0]
-        this.filterUser(this.resids)
-        this.$dispatch('re-res', obj)
-      },
-      async filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if (resids.length > 0 && typeof resids[0] == "object") {
-          resids = resids[0]
-        }
-        if (resids[0]) {
-          this.source = `tool.getChildrenOfResName($${this.roleName}$)`
-          await this.search()
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if (this.organizationname == user.organizationname || !user.organizationname){
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if (!this.valueMultiple && this.users.length > 0) {
-          this.users = [{label: '全部', value: ''}, ...this.users]
-        }
-        let temp = []
-        this.users = this.users.filter(item => {
-          if (!temp.includes(item.label)) {
-            temp.push(item.label)
-            return true
-          }
-          return false
-        })
-        this.$emit('alluser', this.allUsers)
-        //tag
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div style="width: 100%;height: 100%">
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">公&emsp;&emsp;司</label>
+      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
+    </div>
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">{{ roleLable }}</label>
+      <v-select :value="selVal" v-model='selVal'
+                :value-single="!valueMultiple"
+                class="select_list select"
+                :options='users' :placeholder='roleName'
+                :close-on-select = 'valueClose'
+                :multiple="valueMultiple"
+                :width="rightWidth"
+                @change="valuechange">
+      </v-select>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      },
+      valueClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+         source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        //source: `root.getResourceById($${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolesnames$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal: '',
+        organizationname:this.$login.f.f_fengongsi,
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value'(val) {
+        console.log("969696", val)
+        if (val) {
+          if (this.valueMultiple) {
+
+          } else {
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    async ready() {
+      await this.search()
+      await this.filterUser(this.resids)
+    },
+    methods: {
+      async search() {
+        let http = new HttpResetClass()
+        const res = await http.load('POST', '/rs/search', {
+          data: {
+            source: this.source,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.allUsers = res.data
+      },
+      valuechange(val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)) {
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0; i < val.length; i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
+          } else {
+            this.value = ''
+          }
+        } else {
+          this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        this.organizationname = obj.res[0]
+        this.filterUser(this.resids)
+        this.$dispatch('re-res', obj)
+      },
+      async filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if (resids.length > 0 && typeof resids[0] == "object") {
+          resids = resids[0]
+        }
+        if (resids[0]) {
+          this.source = `tool.getChildrenOfResName($${this.roleName}$)`
+          await this.search()
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if (this.organizationname == user.organizationname || !user.organizationname){
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if (!this.valueMultiple && this.users.length > 0) {
+          this.users = [{label: '全部', value: ''}, ...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item => {
+          if (!temp.includes(item.label)) {
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        this.$emit('alluser', this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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>
 
@@ -172,6 +186,10 @@
         </div>
 
       </div>
+      <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
+        <label class="text-left font">隐患整改通知单单号</label>
+        <input v-model="paper.f_repairorder_id" :value="paper.f_repairorder_id"   type="text">
+      </div>
       <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
         <label class="text-left font">副操</label>
         <v-select
@@ -338,7 +356,7 @@
     </div>
   </modal>
 
-    <!--停用框-->
+  <!--停用框-->
   <modal :show.sync="showTYModel" v-ref:modal>
     <div slot="modal-header" class="modal-header">
       <h4 class="modal-title">
@@ -592,55 +610,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() {
@@ -707,7 +725,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -728,6 +745,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

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/SafecheckDevices.vue

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag