telephone-clients 3.0.111 → 3.0.113

package/package.json

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

package/src/filiale/tongchuan/pc/WorkorderCheckDistributePlan.vue

@@ -41,6 +41,18 @@
                     condition="f_user_type = '{}'"
                     close-on-select clear-button></v-select>
                 </div>
+                <div class="col-sm-4" style="width: 20%">
+                  <label class="font_normal_body">工单来源</label>
+                  <v-select
+                    placeholder='工单来源'
+                    class="select select_list"
+                    style="width: 60%"
+                    :value.sync="model.source"
+                    :value-single="true"
+                    :options='$parent.$parent.sources'
+                    v-model="model.source"
+                    close-on-select clear-button></v-select>
+                </div>
                 <div class="col-sm-4" style="width: 20%">
                   <label class="font_normal_body">创建时间</label>
                   <datepicker
@@ -195,6 +207,7 @@ export default {
       checked: true,
       showVisit: false,
       checkeds: false,
+      sources:[{label: '全部', value: ''}, {label: '微信公众号', value: '微信公众号'}, {label: '客服', value: '客服'}],
       thisUserinfos: [],
       checker: {},
       userid: this.$login.f.id,
@@ -349,7 +362,13 @@ export default {
       if (this.f_created_date) {
         args.condition += ` and f_created_date >= ${this.f_created_date}`
       }
-      args.condition += ` and ( tap.userid = '${this.$login.f.name}' or tswo.f_operator = '微信公众号') `
+      if (args.model.source && args.model.source == '微信公众号'){
+        args.condition += ` and ( tswo.f_operator = '微信公众号' ) `
+      }else if (args.model.source && args.model.source != '微信公众号'){
+        args.condition += ` and ( tap.userid = '${this.$login.f.name}') `
+      }else {
+        args.condition += ` and ( tap.userid = '${this.$login.f.name}' or tswo.f_operator = '微信公众号') `
+      }
       args.condition = ' and ' + args.condition
       return this.model.search(args.condition, args.model)
     }

package/src/main.js

@@ -1,22 +1,22 @@
-import Vue from 'vue'
-import App from './App'
-import all  from 'vue-client/src/all'
-import system from 'system-clients/src/system'
-import telephone from './telephone'
-import echarts from 'echarts'
-Vue.prototype.$echarts = echarts
-
-/** **************************通用组件******************************/
-all()
-system(false)
-telephone('tongchuan')
-require('./expandcss.less')
-require('system-clients/src/styles/less/bootstrap.less')
-require('./telephoneanaly.less')
-// 测试
-
-Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import all  from 'vue-client/src/all'
+import system from 'system-clients/src/system'
+import telephone from './telephone'
+import echarts from 'echarts'
+Vue.prototype.$echarts = echarts
+
+/** **************************通用组件******************************/
+all()
+system(false)
+telephone()
+require('./expandcss.less')
+require('system-clients/src/styles/less/bootstrap.less')
+require('./telephoneanaly.less')
+// 测试
+
+Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
+new Vue({
+  el: 'body',
+  components: { App }
+})