telephone-clients 3.0.104-51 → 3.0.104-52

package/package.json

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

package/src/components/pc/RecordListLeft.vue

@@ -36,6 +36,12 @@
               <div style="float: right;" class="button_spacing button_search"
                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                    @click="$parent.$parent.hidden()"></div>
+              <export-excel-tel :data="$parent.$parent.searchData"
+                                :field="$parent.$parent.excelHeaders"
+                                :choose-col="true"
+                                sqlurl="rs/logic/telephoneExport" sql-name="tel_recordlist"
+                                :template-name="$parent.$parent.excelTitle"></export-excel-tel>
+
             </div>
 
             <div class="col-sm-3 form-group form-input-group" style="width: 20%" v-if="$parent.$parent.criteriaShow">
@@ -162,7 +168,22 @@ export default {
       userid: this.$login.f.id,
       source: 'tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))', //获取公司参数
       flag: '',
-      f_filiale_id: ''
+      f_filiale_id: '',
+      excelTitle: '电话记录录导出',
+      excelHeaders: {
+        'teltype': '电话类型',
+        'telnum': '电话号码',
+        'outltime': '呼入/呼出',
+        'findtime':'寻找坐席',
+        'inltime': '响铃',
+        'starttime': '开始通话',
+        'endtime': '结束通话',
+        'savetime': '保存工单',
+        'telname': '话务员'
+      },
+      searchData: {
+        condition: '1=1'
+      },
     }
   },props: {
 
@@ -200,6 +221,8 @@ export default {
           args.condition = args.condition + ' and f_filiale_id in ' + this.f_filiale_id
         }
       }
+      this.searchData.condition = args.condition
+      this.searchData.orderitem= " outltime desc"
       this.model.search(args.condition, args.model)
     },
     clearmsg(){

package/src/components/temp/SecuritycheckInfo.vue

@@ -10,6 +10,7 @@
             <th><nobr>安检日期</nobr></th>
             <th><nobr>入户情况</nobr></th>
             <th><nobr>安检员</nobr></th>
+            <th> <nobr>隐患明细</nobr></th>>
           </tr>
         </template>
         <template partial='body'>
@@ -17,6 +18,7 @@
           <td style="text-align: center"><nobr>{{row.f_onsite_time.substring(0,11)}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_entry_status}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_checker_name}}</nobr></td>
+     <td style="text-align: center" ><nobr>{{row.f_defect_text?row.f_defect_text:$parent.$parent.$parent.getjsonData(row.f_defect_content)}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -28,6 +30,7 @@
    *用户档案相关信息组件
    */
   import { PagedList } from 'vue-client'
+  import {isEmpty} from "../Util";
   export default {
     title: '用户安检历史',
     data () {
@@ -43,6 +46,17 @@
       clearflg:0
     },
     methods: {
+      getjsonData(value){
+        //将value字符串转换成json对象
+        let jsonStr= JSON.parse(value);
+        let str = jsonStr.data;
+        if(jsonStr.result=='正常'){
+          return '正常'
+        }else{
+          return str
+        }
+
+      },
       selected (row) {
         if (this.row === row) {
           this.row = null

package/src/filiale/qianneng/android/AppInstallationMaterial.vue

@@ -773,9 +773,11 @@
       },
       // 打开二维码
       async openQrCode() {
-        debugger
-        console.log(Vue.user)
-        const merchantMsg = this.$appdata.getSingleValue(Vue.user.orgs + "商户号")
+        const merchantMsg = Vue.config.telephone.ApproveConfig.merchantMsg
+        if (!merchantMsg){
+          this.$showMessage('未配备商户号,请联系管理员！')
+          return
+        }
         const outTradeNo = this.generateRandomString(30)
         // 下订单
         let http = new HttpResetClass()
@@ -833,7 +835,7 @@
       },
       // 获取订单信息
       async getOrderInformation() {
-        const merchantMsg = this.$appdata.getSingleValue(Vue.user.orgs + "商户号")
+        const merchantMsg = Vue.config.telephone.ApproveConfig.merchantMsg
         // 查询订单信息
         console.log('查询订单信息！！！', this.order)
         try {