telephone-clients 3.0.104-1 → 3.0.104-10

package/src/components/pc/VisitInfo.vue

@@ -79,6 +79,28 @@
         </div>
       </div>
     </div>
+    <modal :show.sync="showcalloutResult" width="50%"  backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <center><h4 class="modal-title ">{{showTitle}}结果</h4></center>
+      </header>
+      <article slot="modal-body" class="modal-body" style="height: 100px;padding-top: 15px!important;">
+        <div v-show="!calloutResult"><label>正在{{ showTitle }}，请稍后。。。。。。</label></div>
+        <div v-show="calloutResult">
+          <div class="row auto" v-show="calloutResult.area">
+            <label>真实归属地:</label><span>{{calloutResult.area}}</span>
+          </div>
+          <div class="row auto" v-show="calloutResult.calloutNo">
+            <label>真实呼出号码:</label><span>{{calloutResult.calloutNo}}</span>
+          </div>
+          <div class="row auto" v-show="calloutResult.err">
+            <label>其他信息:</label><span>{{calloutResult.err}}</span>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='calloutConfirm()'>确认</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -93,7 +115,11 @@
       row:Object,
       phone:'',
       idwavfile:'',
-      outltime:''
+      outltime:'',
+      showcalloutResult:false,
+      calloutResult:null,
+      showTitle:'呼出'
+
     },
     data () {
       return {
@@ -117,6 +143,10 @@
       }
     },
     methods: {
+      calloutConfirm(){
+        this.calloutResult=null
+        this.showcalloutResult=false
+      },
       //获取当前时间
       getNowFormatDate() {
         var date = new Date();
@@ -201,7 +231,6 @@
         if(telnum){
           let http = new HttpResetClass()
           try{
-            this.$showMessage("号码"+telnum+"    正在呼出...")
             http.load('POST', wxcon.voiceUrl, {
               aId: this.$login.f.id,
               aChannel: Util.attendant.aChannel,
@@ -213,15 +242,23 @@
               RoleId:this.$login.f.rolesnames,
               sendTime:Util.toStandardTimeString()
             }, {resolveMsg: null, rejectMsg: null}).then((req) => {
-              // 返回录音ID 存在回访数据里
-              this.model.f_record_sound = req.data.RecordsID
-              //tag
+              this.calloutResult = req.data.calloutResult
+              if (req.data.desc === '呼出失败') {
+                this.$showAlert(`呼出${telnum}失败`, 'danger', 0)
+              }else{
+                this.showcalloutResult=true
+                this.showTitle='呼出'
+                // 返回录音ID 存在回访数据里
+                this.model.f_record_sound = req.data.RecordsID
+              }
             })
           }catch(e){
-            //tag
+            this.$showAlert(`${e.data},呼出失败`, 'danger', 0)
+            this.callContent = '呼出失败'
           }
         }else{
-          //tag
+          this.$showAlert(`无电话号码`, 'danger', 0)
+          this.callContent = '呼出失败'
         }
       },
     },

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}'`)
       }
     }