telephone-clients 3.0.104-82 → 3.0.104-84

package/package.json

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

package/src/components/workorder/RepairDetails.vue

@@ -30,7 +30,7 @@
               ></datepicker>
               <input v-show="ischecked == '有'" type="text" class="form-control" v-model="row.f_content" v-if="!show && row.type == 'string' && row.f_project.indexOf('表号') == -1" :disabled="(!(ischecked == '有')) || issee" :readonly="issee">
               <input v-show="ischecked == '有'" type="text" class="form-control" v-model="row.f_content" v-if="!show && row.type == 'string' && row.f_project.indexOf('表号') != -1 " :disabled="(!(ischecked == '有')) || issee" :readonly="issee" >
-              <button v-show="ischecked == '有'" type="button" name="button" class="btn btn-primary" @click="scan(row.f_project)" v-if="!show && row.f_project.indexOf('表号') != -1 && row.f_project.indexOf('拍照') == -1">扫码</button>
+              <button v-show="ischecked == '有'" type="button" name="button" class="btn btn-primary" @click="scan(row.f_project)" v-if="!show && row.f_project.indexOf('表号') != -1 && row.type == 'string'">扫码</button>
               <v-select v-show="ischecked == '有'"
                         :value.sync="row.f_content"
                         :options='getOptions(row.f_project)'

package/src/filiale/lixian/onlineChangeMeter.vue

@@ -355,39 +355,47 @@ export default {
       return ''
     },
    async confirm() {
-      if(this.change){
-        this.$showMessage('已换表成功，请勿重复提交')
-      }
-      const error = this.confirmCheck()
-      if (error) {
-        this.$showMessage(error)
-        return
-      }
-      this.isBusy = true
-      let _this = this
-     this.model.metermessage={
-       f_meter_type: [this.model.f_meter_type],
-       gasbrand: [this.model.f_gasbrand_id],
-       gasmodel: [this.model.f_gasmold_id],
-       f_meternumber: this.model.f_meternumber,
-       f_meter_base: this.model.f_meter_base,
-       f_metertitles: this.model.f_metertitles,
-       f_oldmeter_use_reference: this.remanent.f_using_base_old// 旧表使用量参考值
-     }
-      let data = {
-        model: this.model,
-        f_meter_book: null,
-        old: this.row
-      }
-     let meterinfo = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/changeMeter`, data, {
-       resolveMsg: '换表成功',
-       rejectMsg: '换表失败！！！'
-     })
-     if(meterinfo.data.new_userfiles_id){
-       this.change = true
+     try {
+       if (this.change) {
+         this.$showMessage('已换表成功，请勿重复提交')
+       }
+       const error = this.confirmCheck()
+       if (error) {
+         this.$showMessage(error)
+         return
+       }
+       this.isBusy = true
+       let _this = this
+       this.model.metermessage = {
+         f_meter_type: [this.model.f_meter_type],
+         gasbrand: [this.model.f_gasbrand_id],
+         gasmodel: [this.model.f_gasmold_id],
+         f_meternumber: this.model.f_meternumber,
+         f_meter_base: this.model.f_meter_base,
+         f_metertitles: this.model.f_metertitles,
+         f_oldmeter_use_reference: this.remanent.f_using_base_old// 旧表使用量参考值
+       }
+       let data = {
+         model: this.model,
+         f_meter_book: null,
+         old: this.row
+       }
+       let meterinfo = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/changeMeter`, data, {
+         resolveMsg: '换表成功',
+         rejectMsg: '换表失败！！！'
+       })
+       if (meterinfo.data.new_userfiles_id) {
+         this.change = true
+         this.$showMessage('换表成功')
+       } else {
+         this.$showMessage('换表失败')
+       }
+       this.isBusy = false
+     } catch (e) {
+       this.$showMessage('换表失败')
      }
-     this.isBusy = false
-    }
+   }
+
   },
   ready() {
 

package/src/filiale/lixian/onlineoperation.vue

@@ -195,6 +195,7 @@
 
 <script>
 import Vue from 'vue'
+import * as Util from '../../components/Util'
 import {PagedList, HttpResetClass} from 'vue-client'
 
 export default {
@@ -236,11 +237,11 @@ export default {
       model_f: false,
       cardinfo: {},
       alldue_fee: 0,
-      // f_operator: Vue.user.name,
-      // f_orgid : Vue.user.orgid,
+      f_operator: Vue.user.name,
+      f_orgid : Vue.user.orgid,
       f_meter_base: null,
       f_operator: '管理员',
-      f_orgid: '37710'
+      // f_orgid: '37710'
 
     }
   },
@@ -316,7 +317,7 @@ export default {
 
     },
     async pregasChange() {
-
+      let _that= this
       if (parseInt(this.f_meter_base) < parseInt(this.row.f_meter_base)) {
         await this.$showMessage(`录入旧表底数小于系统就表底数请再次核对！`, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
@@ -354,12 +355,12 @@ export default {
           if (res === 'confirm') {
             let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
             let data = {
-              downDate: this.$login.toStandardTimeString(),
-              startDate: this.$login.toStandardDateString(),
-              endDate: this.$login.toStandardDateString(),
+              downDate: Util.toStandardTimeString(),
+              startDate: Util.toStandardDateString(),
+              endDate: Util.toStandardDateString(),
               condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
-              f_operator: this.$login.f.name,
-              f_operatorid: this.$login.f.id,
+              f_operator: Vue.user.name,
+              f_operatorid: Vue.user.id,
               f_meternumber: this.row.f_meternumber,
               f_userinfo_id: this.row.f_userinfo_id,
               f_userfiles_id: this.row.f_userfiles_id,
@@ -370,7 +371,15 @@ export default {
               f_price_id: this.row.f_price_id
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
-              this.getChangeData()
+              console.log(res.data)
+              console.log(JSON.stringify(res.data))
+              if(res.data.msg==='抄表成功'){
+                _that.$showMessage('生成欠费成功')
+                this.getChangeData()
+              }else{
+                _that.$showMessage('生成欠费失败')
+              }
+
             })
           }
         })
@@ -557,17 +566,18 @@ export default {
     //tag)
     //tag)
     // 获取配置项
-    if (Vue.config.telephone != undefined) {
-      if (Vue.config.telephone.ApproveConfig != undefined) {
-        this.parameters = Vue.config.telephone.ApproveConfig
-        this.ispos = Vue.config.telephone.ApproveConfig.ispos
-        //tag)
-      } else {
-        //tag
-      }
-    } else {
-      //tag
-    }
+    console.log(Vue.config.telephone.ApproveConfig)
+    // if (Vue.config.telephone != undefined) {
+    //   if (Vue.config.telephone.ApproveConfig != undefined) {
+    //     this.parameters = Vue.config.telephone.ApproveConfig
+    //     this.ispos = Vue.config.telephone.ApproveConfig.ispos
+    //     //tag)
+    //   } else {
+    //     //tag
+    //   }
+    // } else {
+    //   //tag
+    // }
   }
 }
 </script>

package/src/filiale/yuncheng/android/RepairInfo.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="repair-bg" id="work-history">
+    <div class="bq-parent" v-if="shutype == 'heng'">
+      <blockquote class="blockquote">
+        <p>工单基本信息</p>
+      </blockquote>
+    </div>
+    <div class="panel panel-default auto repair-info-content">
+      <div class="panel-body">
+        <p v-if="service.f_userinfo_id" >用户编号： <span style="text-decoration:underline">{{service.f_userinfo_code}}</span>
+          <button style="float: right" type="button" name="button" class="btn btn-primary" @click='openRecord()' :disabled="recordButtonDisable">开启录音</button></p>
+        <p>来电电话： {{service.f_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_phone)' alt=""></p>
+        <failure-show :value='service.failure'>
+        </failure-show>
+        <div style="clear:both;">
+          <phone-sell-info-lite v-if="showSellInfo" :user="{}" :f_userinfo_id="service.f_userinfo_id"></phone-sell-info-lite>
+        </div>
+        <div class="from-group">
+          <img-self style="float: left;margin: 2px" v-if="service.f_single_path" :src="imgfilename"   width="200" height="200"></img-self>
+          <img-self style="float: left;margin: 2px" v-if="service.f_singlea_path" :src="imgfilenamea"   width="200" height="200"></img-self>
+          <img-self style="float: left;margin: 2px" v-if="service.f_singleb_path" :src="imgfilenameb"   width="200" height="200"></img-self>
+        </div>
+        <route name="info-route" ></route>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import FailureShow from '../../../components/pc/FailureShow'
+  import {HttpResetClass} from "vue-client";
+  import Vue from "vue";
+
+  export default {
+    title: '工单历史记录',
+    data () {
+      return {
+        // service: null
+        imgfilename:'',
+        recordButtonDisable:false,
+        imgfilenamea:'',
+        imgfilenameb:'',
+        f_recording1_path:'',
+        f_userinfo_code : '测试文本',
+        showSellInfo: false
+      }
+    },
+    props: {
+
+      service: { // 传入一条报修单信息
+        type: Object
+      },
+      issee:'',
+      worktype:{
+        type: String,
+        default: '报修单'
+      },
+      // userinfo: {
+      //   type: Object
+      // },
+      // 维修对应的用户数据收集
+      model: {
+        type: Object
+      },
+      // 工单信息
+      repair:{
+        type: Object
+      },
+      savevalid:{
+
+      },
+      sum:{
+
+      },
+      user:{
+        type: Object
+      },
+      show: {
+        type: Boolean,
+        default: false
+      },
+      // 本次维修, 用于编辑
+      data: {
+        type: Object
+      },
+      shutype:'heng'
+    },
+    ready () {
+      this.imgfilename=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_single_path
+      this.imgfilenamea=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_singlea_path
+      this.imgfilenameb=`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+this.service.f_singleb_path
+      if (this.$parent.$parent.model.f_recording1_path){
+        this.recordButtonDisable = true
+      }
+      this.$goto('repair-user-info',{
+        model: this.model,
+        data: this.data,
+        savevalid: this.savevalid,
+        repair: this.repair,
+        show: this.show,
+        shutype:this.shutype,
+        worktype:this.worktype,
+        issee:this.issee},'info-route')
+    },
+    methods: {
+      openRecord(){
+        this.recordButtonDisable = true
+        if (this.$parent.$parent.model.f_recording1_path){
+          return
+        }
+        if (this.$parent.$parent.record()) {
+          this.$showMessage("已开启录音！")
+        } else {
+          this.recordButtonDisable = false
+        }
+      },
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
+      goOtherCharge(userinfoid){
+        //tag
+        new HttpResetClass().load("POST",`${this.$androidUtil.getProxyUrl()}/rs/sql/onlinequeryuser`,{data:{condition : ` uf.f_orgid = '${Vue.user.orgid}' and (ui.f_user_state = '正常' or ui.f_user_state = '预备') and ui.f_userinfo_id = '${userinfoid}'`}}).then((res)=>{
+          //tag)
+          if(res.data.length==1){
+            let _this = this
+            var pardate = {
+              _this:_this,
+              title:'其他收费',
+              safe:false
+            }
+            _this.$dispatch('gotoson',pardate)
+            //tag
+            _this.$parent.$goto('other_charge', {row: res.data[0]}, 'self')
+          }else if(res.data.length>1){
+            this.$showMessage('查询到了多条用户表信息,请让管理员核实用户信息是否正常！')
+          }else{
+            this.$showMessage('未查询到用户有正常状态的表具信息,请让管理员核实用户表档案信息是否正常！')
+          }
+        }).catch((msg)=>{
+          this.$showMessage('获取用户信息失败，请检查手机网络!')
+        })
+      },
+      selfSearch () {
+        if(!this.rowOne) {
+          return
+        }
+        // let gen = getGen(this)
+        // co(gen)
+      },
+      searchHistory() {
+        this.showSellInfo = !this.showSellInfo
+      }
+    },
+    watch: {
+      'rowOne' () {
+        this.selfSearch()
+      }
+    },
+    components: {
+      FailureShow,
+      'failure-show': FailureShow
+    }
+  }
+</script>

package/src/filiale/yuncheng/android/RepairOrderV.vue

@@ -35,7 +35,7 @@
 <script>
   // 户内维修
   import Vue from 'vue'
-  import RepairInfo from './../../../components/workorder/RepairInfo'
+  import RepairInfo from './RepairInfo'
   import RepairDetails from './../../../components/workorder/RepairDetails'
   import RepairUserInfo from './RepairUserInfo'
   import Outlay from './Outlay'

package/src/filiale/yuncheng/android/RepairUserInfo.vue

@@ -76,7 +76,7 @@
           </div>
           <div class="row">
             <div class="{{shuclass}}" v-if="worktype == '置换通气单'||worktype == '安装单'">
-              <label class="lb-left text-justify">住户类型</label>
+              <label class="lb-left text-justify">用户类型</label>
               <v-select :value="model.f_house_type" :value-single="true"
                         :options='housetype' placeholder='请选择'
                         close-on-select
@@ -100,6 +100,14 @@
               <label class="lb-left text-justify">经办人</label>
               <span style="font-weight:bold">{{ f_open_person }}</span>
             </div>
+            <div class="{{shuclass}}" v-if="worktype == '置换通气单'">
+              <label class="lb-left text-justify">通气人</label>
+              <span style="font-weight:bold">{{ f_order_man }}</span>
+            </div>
+            <div class="{{shuclass}}" v-if="worktype == '置换通气单'">
+              <label class="lb-left text-justify">通气日期</label>
+              <span style="font-weight:bold">{{ data.f_date_come }}</span>
+            </div>
             <div class="{{shuclass}}"
                  v-if="worktype == '报修单' && noExp && meterinfo && meterinfo.f_collection_type == '按气量'">
               <label class="lb-left text-justify">累购气量</label>
@@ -277,8 +285,8 @@
           }
         }, {warnMsg: null, resolveMsg: null, rejectMsg: null})
         if (res.data[0]) {
-          this.f_open_date = res.data[0].f_open_date
-          this.f_open_person = res.data[0].f_open_person
+          this.f_open_date = res.data[0].f_createfile_date
+          this.f_open_person = res.data[0].f_createfile_person
         }
       }
       this.ifCreatDate()

package/src/filiale/yuncheng/telephoneAndroid.js

@@ -10,6 +10,7 @@ let specialComp = {
   'repair-user-info': (resolve) => { require(['./android/RepairUserInfo'], resolve) },
   'repair-orderV': (resolve) => { require(['./android/RepairOrderV'], resolve) },
   'outlay': (resolve) => { require(['./android/Outlay'], resolve) },
+  'repair-info': (resolve) => { require(['./android/RepairInfo'], resolve) },
 }
 exports.specialComp = specialComp
 

package/.npmignore

@@ -1,14 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-config/
-gradle/
-.gradle/
-dist-android/
-npm-debug.log
-selenium-debug.log
-test/
-.idea/
-build/
-examples/
-