telephone-clients 4.0.0-1-57 → 4.0.0-1-59

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

@@ -1,186 +1,186 @@
-<template>
-  <div style="height: auto;width: 100%">
-    <div partial>
-      <div align="center" class="">
-        <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 v-model="oderInfo.out_trade_no" class="search_input input-font" type="text"/>
-          </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 v-model="oderInfo.msg" class="search_input input-font" type="text"/>
-          </div>
-        </div>
-        <!--<div @click="callBack('支付成功')">返回</div>-->
-      </div>
-      <div align="center" class="">
-        <div class="QR-code">
-          <img v-show="isTimeout" height="266" src="../../../assets/qrcode_no.png" width="266"/>
-          <div id="scan" style="margin-top: 25px"></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import QRCode from 'qrcodejs2'
-import {HttpResetClass} from "vue-client";
-
-export default {
-  title: '二维码扫码',
-  prop: ['row'],
-
-  data() {
-    return {
-      // 订单状态定时器
-      timer1: {},
-      timer2: {},
-      // 订单信息
-      oderInfo: {
-        out_trade_no: "",
-        msg: ''
-      },
-      // 下单信息
-      parameter: {
-      },
-      isTimeout: true // 二维码图片
-
-    }
-  },
-  methods: {
-    callBack(para) {
-      //tag
-      this.$back(para)
-    },
-    // 生成二维码
-    async createOrder() {
-      console.log(this.row)
-      let data = {
-        config: this.row.model.f_orgid,
-        f_revenue: 'productV3',
-        pay_way: this.row.model.f_payment,
-        money: `${Number(Number(this.row.money)*100).toFixed(2)}`,
-        body: '购气订单',
-        attach: {
-          f_userfiles_id: this.row.model.f_userfiles_id,
-          f_pregas: this.row.model.f_pregas,
-          f_preamount: this.row.money,
-          f_payment: this.row.money,
-          f_terminal_num: HostApp.getSN().data,
-          f_collection: this.row.money,
-          f_totalcost: this.row.money,
-          isHand: this.row.model.isHand || '',
-          hand_ids: this.row.model.hand_ids || [],
-          f_meterid: this.row.model.f_meterid || '',
-          isGasValue: this.row.model.isGasValue || '',
-          f_card_id: this.row.model.f_card_id || '',
-          f_times: this.row.model.f_times || 0
-        }
-      }
-      let result = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/pos/rs/logic/CCBGetCode`, data, {})
-      if (result.data && result.data.code == 200){
-        this.oderInfo.out_trade_no = result.data.f_out_trade_no
-        new QRCode(document.getElementById('scan'), {'text': result.data.url, width: 266, height: 266})
-        this.isTimeout = false
-        if (this.oderInfo.out_trade_no) {
-          this.timer1 = window.setInterval(this.queryOrderSatus, 3000)
-        }
-      }
-    },
-    // 查询订单状态
-    async queryOrderSatus() {
-      let http1 = new HttpResetClass()
-      let resp = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/pos/rs/sql/getSellGasInfo`, {
-        "data": {
-          "condition": `f_serial_id = '${this.oderInfo.out_trade_no}'`
-        }
-      }, {resolveMsg: null, rejectMsg: null})
-      if (resp.data.code == 200) {
-        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)
-    }
-  },
-  async ready() {
-    let http1 = new HttpResetClass()
-    let resp = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
-      data: {
-        items: "*",
-        tablename: "t_userfiles",
-        condition: `f_userfiles_id = '${this.row.model.f_userfiles_id}' and f_table_state != '换表'`,
-        orderitem: "f_userfiles_id"
-      }
-    }, {resolveMsg: null, rejectMsg: null})
-    console.log(resp)
-    if (resp.data[0].f_meter_classify.includes('卡表')) {
-      this.row.model.isHand = '0'
-      this.row.model.f_meterid = resp.data[0].f_meterid
-      this.row.model.isGasValue = resp.data[0].f_meter_classify.includes('气量') ? '0' : '1'
-      this.row.model.f_card_id = resp.data[0].f_card_id
-      this.row.model.f_times = resp.data[0].f_times
-    }else if (resp.data[0].f_meter_classify.includes('机表')){
-      this.row.model.isHand = '1'
-      this.row.model.hand_ids = []
-      let resp2 = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
-        data: {
-          items: "id",
-          tablename: "t_handplan",
-          condition: `f_userfiles_id = '${this.row.model.f_userfiles_id}' and f_whether_pay = '否'`,
-          orderitem: "id desc"
-        }
-      }, {resolveMsg: null, rejectMsg: null})
-      if (resp2.data.length >0 ){
-        this.row.model.hand_ids = resp2.data.map(item=>{return item.id})
-      }
-    }else {
-      this.row.model.isHand = '-1'
-    }
-    await this.createOrder()
-  },
-  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>
+<template>
+  <div style="height: auto;width: 100%">
+    <div partial>
+      <div align="center" class="">
+        <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 v-model="oderInfo.out_trade_no" class="search_input input-font" type="text"/>
+          </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 v-model="oderInfo.msg" class="search_input input-font" type="text"/>
+          </div>
+        </div>
+        <!--<div @click="callBack('支付成功')">返回</div>-->
+      </div>
+      <div align="center" class="">
+        <div class="QR-code">
+          <img v-show="isTimeout" height="266" src="../../../assets/qrcode_no.png" width="266"/>
+          <div id="scan" style="margin-top: 25px"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import QRCode from 'qrcodejs2'
+import {HttpResetClass} from "vue-client";
+
+export default {
+  title: '二维码扫码',
+  prop: ['row'],
+
+  data() {
+    return {
+      // 订单状态定时器
+      timer1: {},
+      timer2: {},
+      // 订单信息
+      oderInfo: {
+        out_trade_no: "",
+        msg: ''
+      },
+      // 下单信息
+      parameter: {
+      },
+      isTimeout: true // 二维码图片
+
+    }
+  },
+  methods: {
+    callBack(para) {
+      //tag
+      this.$back(para)
+    },
+    // 生成二维码
+    async createOrder() {
+      console.log(this.row)
+      let data = {
+        config: this.row.model.f_orgid,
+        f_revenue: 'productV3',
+        pay_way: this.row.model.f_payment,
+        money: `${Number(Number(this.row.money)*100).toFixed(2)}`,
+        body: '购气订单',
+        attach: {
+          f_userfiles_id: this.row.model.f_userfiles_id,
+          f_pregas: this.row.model.f_pregas,
+          f_preamount: this.row.money,
+          f_payment: this.row.money,
+          f_terminal_num: HostApp.getSN().data,
+          f_collection: this.row.money,
+          f_totalcost: this.row.money,
+          isHand: this.row.model.isHand || '',
+          hand_ids: this.row.model.hand_ids || [],
+          f_meterid: this.row.model.f_meterid || '',
+          isGasValue: this.row.model.isGasValue || '',
+          f_card_id: this.row.model.f_card_id || '',
+          f_times: this.row.model.f_times || 0
+        }
+      }
+      let result = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/pos/rs/logic/CCBGetCode`, data, {})
+      if (result.data && result.data.code == 200){
+        this.oderInfo.out_trade_no = result.data.f_out_trade_no
+        new QRCode(document.getElementById('scan'), {'text': result.data.url, width: 266, height: 266})
+        this.isTimeout = false
+        if (this.oderInfo.out_trade_no) {
+          this.timer1 = window.setInterval(this.queryOrderSatus, 3000)
+        }
+      }
+    },
+    // 查询订单状态
+    async queryOrderSatus() {
+      let http1 = new HttpResetClass()
+      let resp = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/pos/rs/sql/getSellGasInfo`, {
+        "data": {
+          "condition": `f_serial_id = '${this.oderInfo.out_trade_no}'`
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      if (resp.data.length == 1){
+        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)
+    }
+  },
+  async ready() {
+    let http1 = new HttpResetClass()
+    let resp = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
+      data: {
+        items: "*",
+        tablename: "t_userfiles",
+        condition: `f_userfiles_id = '${this.row.model.f_userfiles_id}' and f_table_state != '换表'`,
+        orderitem: "f_userfiles_id"
+      }
+    }, {resolveMsg: null, rejectMsg: null})
+    console.log(resp)
+    if (resp.data[0].f_meter_classify.includes('卡表')) {
+      this.row.model.isHand = '0'
+      this.row.model.f_meterid = resp.data[0].f_meterid
+      this.row.model.isGasValue = resp.data[0].f_meter_classify.includes('气量') ? '0' : '1'
+      this.row.model.f_card_id = resp.data[0].f_card_id
+      this.row.model.f_times = resp.data[0].f_times
+    }else if (resp.data[0].f_meter_classify.includes('机表')){
+      this.row.model.isHand = '1'
+      this.row.model.hand_ids = []
+      let resp2 = await http1.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: "id",
+          tablename: "t_handplan",
+          condition: `f_userfiles_id = '${this.row.model.f_userfiles_id}' and f_whether_pay = '否'`,
+          orderitem: "id desc"
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      if (resp2.data.length >0 ){
+        this.row.model.hand_ids = resp2.data.map(item=>{return item.id})
+      }
+    }else {
+      this.row.model.isHand = '-1'
+    }
+    await this.createOrder()
+  },
+  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>

package/src/filiale/meihekou/telephoneAndroid.js

@@ -1,26 +1,26 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中
-let specialComp = {
-  //  其他收费
-  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) },
-  'completed-repair': (resolve) => { require(['./android/CompletedRepair'], resolve) },
-  'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
-  //  支付二维码
-  'create_qrcode': (resolve) => { require(['./android/createQRcode'], resolve) },
-  //  在线缴费
-  'online_buy_gas': (resolve) => { require(['./android/onlineBuyGas'], resolve) },
-  'add-my-task': (resolve) => { require(['./android/AddMyTask'], resolve) },
-  'phone-stand-work': (resolve) => { require(['./android/PhoneStandWork'], resolve) },
-  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
-  'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) },
-  'service-online-query': (resolve) => { require(['./android/ServiceOnlineQuery'], resolve) },
-  'app-work-history': (resolve) => { require(['./android/AppWorkHistory'], resolve) }
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中
+let specialComp = {
+  //  其他收费
+  'other_charge': (resolve) => { require(['./android/Othercharge'], resolve) },
+  'completed-repair': (resolve) => { require(['./android/CompletedRepair'], resolve) },
+  'repair-first': (resolve) => { require(['./android/RepairFirstV'], resolve) },
+  //  支付二维码
+  'create_qrcode': (resolve) => { require(['./android/createQRcode'], resolve) },
+  //  在线缴费
+  'online_buy_gas': (resolve) => { require(['./android/onlineBuyGas'], resolve) },
+  'add-my-task': (resolve) => { require(['./android/AddMyTask'], resolve) },
+  'phone-stand-work': (resolve) => { require(['./android/PhoneStandWork'], resolve) },
+  'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
+  'fault-all': (resolve) => { require(['./android/FaultAll'], resolve) },
+  'service-online-query': (resolve) => { require(['./android/ServiceOnlineQuery'], resolve) },
+  'app-work-history': (resolve) => { require(['./android/AppWorkHistory'], resolve) }
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/yuncheng/pc/TelLossList.vue

@@ -18,7 +18,7 @@
         <div style="height: 45%;" id="husunzhexian2"></div>
       </div>
       <div class="span" style="width: 60%;overflow: auto">
-        <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"></visit-info>
+        <visit-info v-if="showVisit" :phone="wavflie" :idwavfile="idwavfile" :outltime="outltime" @show-obj="watchShow"  v-on:visitback="visitback" ></visit-info>
         <criteria-paged :model="model" v-else v-ref:paged>
           <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
             <div novalidate class="form-inline" partial>
@@ -144,6 +144,12 @@ export default {
 
   },
   methods: {
+    visitback(val){
+      this.showVisit = false
+      if(val == 'commit'){
+        this.$refs.paged.$refs.criteria.search()
+      }
+    },
     searchEcharts(){
       console.log("9334",this.searchDate)
       this.renderEcharts(this.searchDate)