telephone-clients 3.0.104-3 → 3.0.104-31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-3",
+  "version": "3.0.104-31",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/guoxin/Console.vue

@@ -179,7 +179,16 @@
       }
       this.showip = !this.showip
     },
+    created() {
+      window.addEventListener('beforeunload', this.handleBeforeUnload);
+    },
     methods: {
+      handleBeforeUnload(){
+        if(this.$webSocket){
+          this.zhimang();
+          this.$webSocket.closeWebsocket()
+        }
+      },
       changeGroup(){
         let name = this.groupName == '话务分组' ? '值班分组':'话务分组'
         this.$showMessage(`确定要更改分组为${name}吗？`, ['confirm', 'cancel']).then(res=>{

package/src/components/pc/RepairsWork.vue

@@ -248,6 +248,7 @@
           f_meetunit: '',
           f_phone: '',
           f_user_name: '',
+          failure:'',
           f_address: '',
           f_json: '',
           f_repair_date: Util.getNowDate(),
@@ -292,13 +293,17 @@
         'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
         'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
         userid: this.$login.f.id,
+        is_to_other :false,
         repairers: []   // 维修员
       }
     },
     ready() {
       // 获取sendType.json配置信息   获取派单类型  转站点，转维修员，自选模式
         getSendType(this)
-
+        if (this.$appdata.getSingleValue('转班组长') && this.$appdata.getSingleValue('转班组长') == 'true'){
+          this.is_to_other = true
+          this.source = 'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($班组长$)))'
+        }
     },
     methods: {
       // 当维修员发生改变，获取维修员手机号
@@ -621,6 +626,11 @@
         }
         data.model.f_state = null
         this.saveing = true
+
+        if (this.is_to_other){
+          data.is_to_other = 'true'
+        }
+
         return this.$resetpost(url, data).then((data) => {
            if(data.data && data.data.id){
                 this.id = JSON.parse(data.data.id).id

package/src/components/pc/WorkList.vue

@@ -646,7 +646,8 @@ export default {
     },
     proc (selectone, type) {
       this.editflag = type
-      this.selectone = selectone
+      //this.selectone = selectone
+      this.selectone = Object.assign({},selectone)
     },
     complanReview (itemVal, type) {
       //tag

package/src/components/sendsingle/onlinequeryuser.vue

@@ -76,7 +76,7 @@
                 <label  class="font text-left">用户姓名：</label>
               </div>
               <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model="model.f_user_name" condition="ui.f_user_name = '{}'" />
+                <input  class="search_input input-font" v-model="model.f_user_name" condition="ui.f_user_name like '%{}%'" />
               </div>
             </div>
             <div class="row app-row">

package/src/components/temp/HandplanInfo.vue

@@ -45,7 +45,7 @@
     title: '抄表记录',
     data () {
       return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_handplan with (nolock)"', orderitem: '"id desc"'}),
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"id desc"'}),
         show: false,
         row: Object
       }
@@ -62,6 +62,11 @@
       'user' (val) {
         if(this.user) {
           this.model.rows = []
+          if(val.f_meter_classify == '物联网表'){
+              this.model.tablename = 't_web_handplan with (nolock)'
+          }else{
+            this.model.tablename = 't_handplan with (nolock)'
+          }
           this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
         }
       },
@@ -71,6 +76,12 @@
     },
     ready () {
       if (this.user && this.user.f_userinfo_id) {
+        if(this.user.f_meter_classify == '物联网表'){
+          debugger
+          this.model.tablename = 't_web_handplan with (nolock)'
+        }else{
+          this.model.tablename = 't_handplan with (nolock)'
+        }
         this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
       }
     }

package/src/components/temp/InstructInfo.vue

@@ -45,7 +45,7 @@
     title: '指令查看',
     data () {
       return {
-        model: new PagedList('rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_callback_date desc"'}),
+        model: new PagedList('rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_instruct_date desc"'}),
         show: false,
         row: Object
       }

package/src/filiale/hanzhong/telephone.js

@@ -4,7 +4,7 @@ import Vue from "vue";
 //pc和手机分别注册到两个文件中
 let specialComp = {
   'console': (resolve) => {
-    require(['./pc/console'], resolve)
+    require(['./pc/Console'], resolve)
   },
   'record-list': (resolve) => {
     require(['./pc/RecordList'], resolve)

package/src/filiale/jiaocheng/android/createQRcode.vue

@@ -0,0 +1,204 @@
+<template>
+  <div style="height: auto;width: 100%">
+    <div partial>
+      <div class=""  align="center">
+        <div class="" ><img src="../../../assets/scanCode.png">请扫描下方二维码进行购气</div>
+        <div class="row app-row">
+          <div class="col-xs-4">
+            <label class="font text-left">订单编号:</label>
+          </div>
+          <div class="col-xs-8">
+            <input type="text" class ="search_input input-font" v-model="oderInfo.out_trade_no" />
+          </div>
+        </div>
+        <div class="row app-row">
+          <div class="col-xs-4">
+            <label class="font text-left">订单状态:</label>
+          </div>
+          <div class="col-xs-8">
+            <input type="text" class ="search_input input-font" v-model="oderInfo.msg" />
+          </div>
+        </div>
+        <!--<div @click="callBack('支付成功')">返回</div>-->
+      </div>
+      <div class="" align="center" >
+        <div class="QR-code">
+          <img src="../../../assets/qrcode_no.png" v-show="isTimeout" width="266" height="266" />
+          <div id="scan" style="margin-top: 25px"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import QRCode from 'qrcodejs2'
+  import {HttpResetClass} from "vue-client";
+  import Vue from 'vue'
+
+  export default {
+    title: '二维码扫码',
+    prop:['row'],
+
+    data () {
+      return {
+        // 订单状态定时器
+        timer1: {},
+        timer2: {},
+        // 订单信息
+        oderInfo: {
+          out_trade_no: "",
+          msg:''
+        },
+        // 下单信息
+        parameter: {
+          /*"attach": "梅河口POS支付",// 自定义字段 可不传
+          "bankName": "ccb", // 银行名字
+          // 商户配置 银行提供
+          "merchBase":{
+            "bankName": "ccb",
+            "socketUrl": "127.0.0.1",
+            "merchId":"105000049002821",
+            "posId":"051500429",
+            "branchId":"220000000",
+            "socketPort":"12345",
+            "operatorId":"105000049002821-003",
+            "operatorPassword":"mhrq2021",
+            "qrCodePayUrl": "https://ibsbjstar.ccb.com.cn/CCBIS/ccbMain?CCB_IBSVersion=V6&",
+            "pubKey": "30819c300d06092a864886f70d010101050003818a0030818602818055f36b8d4566e42635a6592d08bce92e1af3b9918dd3a7792531a7113622315fdd2541722cdeab6cd92349147589d3b86f496efd358fe967f8a35b0f2e53af55f3cba5ecde8d6f0fd3a7ead416d982432b2fe5872459e433faad329831188b218d4f85aa6b0a44fb7a10c157e8f8e1ec64b4559071a56661b7f5e399d068015f020111"
+          },
+          "money": 100, // 金额 分
+          "notifyUrl": "http://192.168.120.82:8445/bank/test" // 回调地址*/
+        },
+        isTimeout: true // 二维码图片
+
+      }
+    },
+    methods: {
+      callBack (para) {
+        //tag
+        this.$back(para)
+      },
+      // 生成二维码
+      async createOrder () {
+        if (!this.parameter) {
+          this.$showMessage('下单参数获取失败')
+          return
+        }
+        let http = new HttpResetClass()
+        //tag)
+        // let resp1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/PosJianHang/pay/`, this.parameter, {})
+        Vue.mmType = ''
+        Vue.mm = ""
+        let resp1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/PSBCGetCode`, {
+          "f_revenue": "productV3",
+          "money": this.row.money * 100 + "",
+          "attach": {},
+          "config": "jiaocheng",
+          "pay_way": "pos支付"
+        }, {})
+        Vue.mmType = 'AES'
+        Vue.mm = "3KMKqvgwR8ULbR8Z"
+        console.log('resp1=', JSON.stringify(resp1))
+        //tag)
+        if (resp1.data.code == 200) {
+          // 订单编号
+          this.oderInfo.out_trade_no = resp1.data.f_out_trade_no
+          // 支付连接
+          //tag
+          // 将链接转成二维码
+          new QRCode(document.getElementById('scan'), {'text': resp1.data.url, width: 266, height: 266})
+          this.isTimeout = false
+          // 查询订单状态
+          if (this.oderInfo.out_trade_no) {
+            this.timer1 = window.setInterval (this.queryOrderSatus,3000)
+          }
+        }else {
+          this.$showMessage('生成二维码失败！')
+        }
+      },
+      // 查询订单状态
+      async queryOrderSatus () {
+        //tag)
+        let http1 = new HttpResetClass()
+        let resp = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+          data: {
+            items: "id",
+            tablename: "t_weixinreturnxml",
+            condition: ` f_out_trade_no = '${this.oderInfo.out_trade_no}' and f_bill_state = 1 `,
+            orderitem: "id"
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        //tag)
+        if (resp.data.length > 0) {
+          //tag
+          this.oderInfo.msg = '支付成功'
+          // 清除定时器 返回上一层
+          await this.destroyed()
+          await this.callBack(this.oderInfo.out_trade_no)
+        }else {
+          this.oderInfo.msg = '订单未支付'
+        }
+      },
+      destroyed () {
+        // 停止计时器
+        //tag
+        window.clearInterval(this.timer1)
+        // window.clearInterval(this.timer2)
+      }
+    },
+    ready () {
+      //tag)
+      if(Vue.config.telephone != undefined){
+        if(Vue.config.telephone.ApproveConfig != undefined){
+          if(Vue.config.telephone.ApproveConfig.merchBase != undefined) {
+            // 下单信息
+            this.parameter = Vue.config.telephone.ApproveConfig.merchBase
+            if (this.row.money) {
+              // 下单金额
+              //tag)
+              this.parameter.money = this.row.money * 100
+              //tag)
+              this.createOrder()
+            }else {
+              this.$showMessage('金额获取失败！')
+            }
+
+          }else {
+            //tag
+            this.$showMessage('银行参数获取失败！')
+          }
+        }else {
+          //tag
+          this.$showMessage('银行参数获取失败！')
+        }
+      }else{
+        this.$showMessage('银行参数获取失败！')
+      }
+    },
+    destroyed () {
+      // 停止计时器
+      //tag
+      window.clearInterval(this.timer1)
+      // window.clearInterval(this.timer2)
+    }
+  }
+</script>
+<style>
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.7);
+  }
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+</style>