safecheck-client 3.0.34-6 → 3.0.34-61

package/src/components/android/QRCode/QRCodeBinding.vue

@@ -0,0 +1,300 @@
+<template>
+  <div style="height: 100%">
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">负责人姓名:</label>
+          <input v-model="bindingData.f_head_name" class="form-control rightipt" type="text"/>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">负责人职务:</label>
+          <v-select v-model="bindingData.f_head_post" :options='headPostTypes' :value.sync="bindingData.f_head_post" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='类型' style="margin-left: 5%;"
+                    value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">负责人电话:</label>
+          <input v-model="bindingData.f_head_phone" class="form-control rightipt" type="text"/>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">绑定类型:</label>
+          <v-select v-model="bindingData.f_type" :options='types' :value.sync="bindingData.f_type" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='类型' style="margin-left: 5%;"
+                    value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div v-if="bindingData.f_type == '小区'" class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">小区名称:</label>
+          <v-select v-model="bindingData.f_userinfo" :options='residentialAreas' :value.sync="bindingData.f_userinfo" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='小区名称'
+                    style="margin-left: 5%;" value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div v-if="bindingData.f_type == '用户'" class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt" style="width: 30%;">用户名称:</label>
+          <v-select v-model="bindingData.f_userinfo" :options='userNames' :value.sync="bindingData.f_userinfo" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='用户名称' @select-search="refreshUser"
+                    style="margin-left: 5%;" menu-mode="align-button"
+                    value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div class="panel-body">
+        <label class="row auto text-left col-md-4 col-xs-4">备注</label>
+        <div class="col-md-12 col-sm-12 col-xs-12">
+          <textarea v-model="bindingData.f_comments" class="form-control"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">图片:</label>
+          <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+            <img-self v-if="bindingData.f_head_pic" :src="bindingData.f_head_pic" width="140" height="140"></img-self>
+            <button v-if="!bindingData.f_head_pic" type="button" name="button" class="btn btn-primary" @click="takePictures('com.aofeng.hybrid.android.peripheral.CameraActivity')">拍照</button>
+            <button v-if="!bindingData.f_head_pic" type="button" name="button" class="btn btn-primary" @click="takePictures('com.aofeng.hybrid.android.peripheral.ActionMultiplePickActivity')">相册</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div class="panel-body">
+        <div style="display: flex;justify-content: center;">
+          <button class="col-sm-3 btn btn-primary" @click="binding()">绑定</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
+
+
+export default {
+  title: '二维码绑定',
+  data() {
+    return {
+      bindingData: {},
+      residentialAreas: [{label: '请选择', value: ''}],
+      userNames: [{label: '请选择', value: ''}],
+      headPostTypes:[{label: '请选择', value: ''} ,...this.$appdata.getParam('负责人职务')],
+      types: [{label: '请选择', value: ''}, {label: '小区', value: '小区'}, {label: '用户', value: '用户'}]
+    }
+  },
+  props: {
+    row: {
+      type: Object
+    }
+  },
+  methods: {
+    async fetchUsers(condition) {
+      try {
+        const response = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+          data: {
+            items: 'ui.f_user_name,ui.f_userinfo_id,ui.f_userinfo_code',
+            tablename: 't_userinfo ui LEFT JOIN t_userfiles uf on ui.f_userinfo_id = uf.f_userinfo_id',
+            condition: condition,
+            orderitem: '1'
+          }
+        });
+        return response.data;
+      } catch (error) {
+        return [];
+      }
+    },
+    async refreshUser(val) {
+      let condition = `1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用') and (ui.f_user_name like '${val}%' or ui.f_userinfo_code like '${this.bindingData.f_userinfo_code}%')`;
+      const users = await this.fetchUsers(condition);
+      users.forEach(item => {
+        if (!this.userNames.some(user => user.value.f_userinfo_id == item.f_userinfo_id)) {
+          this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: item })
+        }
+      })
+    },
+    cameraCallBack(prop,fileName) {
+      this.$set('bindingData.f_head_pic',fileName)
+    },
+    takePictures(page){
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let prop = 'QRCode'
+      this.fileName = Util.guid() +'.jpg'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: page,
+        param: {
+          file: this.fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+          watermark: ''
+        }
+      })
+    },
+    async binding() {
+      if (!this.bindingData.f_head_pic){
+        this.$showMessage('请上传图片')
+        return
+      }
+      let tableImages = []
+      if (!this.row.f_head_pic){
+        tableImages.push({
+          path:this.bindingData.f_head_pic
+        })
+      }
+      let data = {
+        tableImages: tableImages
+      }
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'imagesUploadAndroid', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+        'data': data, 'backresult': 1
+      })
+    },
+    async commitCallBack(jo) {
+      if (jo.state == 'ok') {
+        if (this.bindingData.f_userinfo && this.bindingData.f_type == '用户'){
+          this.bindingData.f_user_name = this.bindingData.f_userinfo.split(':')[0].trim()
+          this.bindingData.f_userinfo_id = this.bindingData.f_userinfo.split(':')[1].trim()
+        }else if (this.bindingData.f_userinfo && this.bindingData.f_type == '小区') {
+          this.bindingData.f_user_name = this.bindingData.f_userinfo.split(':')[0].trim()
+          this.bindingData.f_userinfo_id = this.bindingData.f_userinfo.split(':')[1].trim()
+        }
+        const res = JSON.parse(jo.result)
+        let sql = ''
+        if (res.images && res.images.length > 0){
+          sql = `update t_qr_code set f_head_name = '${this.bindingData.f_head_name}',f_head_post = '${this.bindingData.f_head_post}',f_head_phone = '${this.bindingData.f_head_phone}',f_type = '${this.bindingData.f_type}',f_user_name = '${this.bindingData.f_user_name}',f_userinfo_id = '${this.bindingData.f_userinfo_id}',f_comments = '${this.bindingData.f_comments}',f_head_pic='${res.images[0].imgfileName}' where id = '${this.bindingData.id}'`
+        }else {
+          sql = `update t_qr_code set f_head_name = '${this.bindingData.f_head_name}',f_head_post = '${this.bindingData.f_head_post}',f_head_phone = '${this.bindingData.f_head_phone}',f_type = '${this.bindingData.f_type}',f_user_name = '${this.bindingData.f_user_name}',f_userinfo_id = '${this.bindingData.f_userinfo_id}',f_comments = '${this.bindingData.f_comments}' where id = '${this.bindingData.id}'`
+        }
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/runSQL`, {data: {sql: sql}}).then(()=>{
+          this.$showMessage('绑定成功')
+          this.$dispatch('confirm')
+        }).catch(()=>{
+          this.$showMessage('绑定失败')
+        })
+      }else {
+        this.$showMessage('图片上传失败')
+      }
+    },
+  },
+  async ready() {
+    this.bindingData = JSON.parse(JSON.stringify(this.row))
+    if(this.bindingData.f_head_pic && !this.bindingData.url){
+      this.bindingData.f_head_pic = `${this.$androidUtil.getProxyUrl()}/rs/image/file/${this.bindingData.f_head_pic}`
+    }
+    if (this.bindingData.url && !this.bindingData.f_head_pic){
+      this.bindingData.f_head_pic = `${this.$androidUtil.getProxyUrl()}${this.bindingData.url}`
+    }
+    if (this.bindingData.f_head_pic && this.bindingData.url){
+      this.bindingData.f_head_pic = `${this.$androidUtil.getProxyUrl()}${this.bindingData.url}`
+    }
+    let residentialArea = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      data: {
+        items: 'f_residential_area,id',
+        tablename: 't_area',
+        condition: `1=1 and f_residential_area is not null`,
+        orderitem: '1'
+      }
+    })
+    residentialArea.data.forEach(item => {
+      if (item.id == this.bindingData.f_userinfo_id){
+        this.bindingData.f_userinfo = `${item.f_residential_area}:${item.id}`
+      }
+      this.residentialAreas.push({label: item.f_residential_area, value: `${item.f_residential_area}:${item.id}`});
+    })
+    const users = await this.fetchUsers(`1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用')`)
+    users.forEach(item => {
+      if (this.bindingData.f_userinfo_id == item.f_userinfo_code){
+        this.bindingData.f_userinfo = `${item.f_user_name}:${item.f_userinfo_code}`
+      }
+      this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: `${item.f_user_name}:${item.f_userinfo_code}` })
+    })
+  }
+}
+</script>
+<style lang="less" scoped>
+.butt3 {
+  float: right;
+  width: 12px;
+  margin: 1% 2% 0 0;
+}
+
+.rightipt {
+  width: 60%;
+  float: left;
+  margin-left: 5%;
+}
+
+.righttxt {
+  border: none;
+  margin-left: 5px;
+  /*border-left: 5px solid #A2C2EB;*/
+  float: left;
+  width: 25%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.spanboder {
+  border-bottom: 2px solid #499edf;
+  padding-bottom: 8px
+}
+
+#upuserinfo_sel /deep/ ul {
+  width: 100% !important;
+  left: 0 !important;
+}
+
+.btn-photo {
+  border: 0;
+  border-radius: 7px;
+  background-color: #7dc1f4;
+  font: 15px PingFang-SC-Bold;
+  height: 20%;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+.div-photo {
+  width: auto;
+  height: auto;
+  /* margin-top: 10px; */
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+</style>
+<style lang="less">
+#upuserinfo_sel ul {
+  width: 100% !important;
+  left: 0 !important;
+}
+</style>

package/src/components/android/QRCode/QRCodePage.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-5">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">二维码编号：</label>
+              </div>
+              <div class="col-xs-7" >
+                <input class="search_input input-font" style="width: 70%" placeholder="请输入或扫码" v-model="model.id"/>
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-5">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">负责人：</label>
+              </div>
+              <div class="col-xs-7">
+                <v-select :value.sync="model.f_head_name" class="input-font"
+                          :options='$parent.$parent.head_names' placeholder='请选择负责人' :value-single="true"
+                          v-model="model.f_head_name" close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-5">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户名称：</label>
+              </div>
+              <div class="col-xs-7" >
+                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入用户名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-5">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-7" >
+                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入小区名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row" style="padding: 5px;">
+                  <p class="panel-title col-xs-5 text-left font">二维码编号</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.id  }}</p>
+                </div>
+                <div class="row" style="padding: 5px;">
+                  <p class="panel-title col-xs-5 text-left font">负责人二维码编号</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_head_code  }}</p>
+                </div>
+                <div class="row" style="padding: 5px;">
+                  <p class="panel-title col-xs-5 text-left font">安检情况二维码编号</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_safecheck_code }}</p>
+                </div>
+                <div class="row" style="padding: 5px;">
+                  <p class="panel-title col-xs-5 text-left font">负责人姓名</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_head_name }}</p>
+                </div>
+                <div class="row" style="padding: 5px;" v-if="row.f_type == '用户'">
+                  <p class="panel-title col-xs-5 text-left font">用户编号</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_userinfo_id}}</p>
+                </div>
+                <div class="row" style="padding: 5px;">
+                  <p class="panel-title col-xs-5 text-left font">小区/用户名称</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_user_name}}</p>
+                </div>
+                <div class="row" style="padding: 5px;">
+                  <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.$parent.handle(row)">处理</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+export default {
+  title: '二维码绑定',
+  data () {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, 50, {
+        items: '"tqr.id,tqr.f_head_code,tqr.f_safecheck_code,tqr.f_head_name,tqr.f_user_name,tqr.f_head_post,tqr.f_head_phone,tqr.f_type,tqr.f_head_pic,tqr.f_userinfo_id,tf.f_downloadpath as url"',
+        tablename: '"t_qr_code tqr left join t_files tf on tf.f_businessid = tqr.id and f_table_name = \'t_qr_code\'"',
+        orderitem: '"1"'
+      }),
+      QRCode:{},
+      head_names:[{ label: '请选择', value: '' }]
+    }
+  },
+  ready () {
+    new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        items: 'f_head_name',
+        tablename: 't_qr_code',
+        condition: `1=1 and f_head_name is not null`,
+        orderitem: '1'
+      }}).then(res=>{
+      res.data.forEach(item=>{
+        this.head_names.push({label:item.f_head_name,value:item.f_head_name})
+      })
+    })
+  },
+  computed: {
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      this.this.$refs.paged.$refs.cri.model.id=datapa
+    },
+    handle(row){
+      var pardate = {
+        _this:this,
+        tittle:'二维码绑定',
+        safe:true
+      }
+      let _this = this
+      this.$dispatch('gotoson',pardate)
+      this.$goto('qr-code-binding', {row: row}, 'self',function () {
+        _this.search()
+      })
+    },
+    search(){
+      let condition = `1=1`
+      if (this.$refs.paged.$refs.cri.model.id) {
+        condition += ` and (f_head_code = '${this.$refs.paged.$refs.cri.model.id}' or f_safecheck_code= '${this.$refs.paged.$refs.cri.model.id}')`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_head_name) {
+        condition += ` and f_head_name like '%${this.$refs.paged.$refs.cri.model.f_head_name}%'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_user_name) {
+        condition += ` and f_user_name like '%${this.$refs.paged.$refs.cri.model.f_user_name}%'`
+      }
+      this.model.search(condition)
+    }
+
+  }
+}
+</script>
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>

package/src/components/android/SafecheckDevices.vue

@@ -456,9 +456,9 @@ export default {
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
         const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+        this.f_items[prop].f_longitude = obj.longitude
+        this.f_items[prop].f_latitude = obj.latitude
       }
-      this.f_items[prop].f_longitude = obj.longitude
-      this.f_items[prop].f_latitude = obj.latitude
       //tag
       //tag
       HostApp._open_a_page({type: 'boomerang',

package/src/components/android/SafecheckOrderV.vue

@@ -2437,17 +2437,13 @@
           //tag
           if (this.role == 'inspect') {
             //tag
-            if(this.item.f_no_checkplan != '无计划安检' ){
-              if (this.item.f_no_checkplan == '复检') {
-                value = this.$androidUtil.path({
-                  alias: 'getUserinfomation',
-                  data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-                })
-              } else {
-                value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
-              }
-            }else {
-              value.data =[]
+            if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
+              value = this.$androidUtil.path({
+                alias: 'getUserinfomation',
+                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+              })
+            } else {
+              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
             }
           } else {
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
@@ -2624,7 +2620,7 @@
             })
         }
       }else{
-        if(this.parentPage && this.parentPage=='AddPlanItem'){
+        if(this.parentPage && (this.parentPage ==  'CurrentCreate' || this.parentPage == 'AddPlanItem') ){
           //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {