telephone-clients 3.0.103 → 3.0.104-1

package/src/filiale/qianneng/telephone.js

@@ -1,20 +1,22 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机分别注册到两个文件中
-let specialComp = {
-  // 工单详情子组件
-  'repairs-work':(resolve) => { require(['./pc/RepairsWork'], resolve) },
-  'work-listall-new':(resolve) => { require(['./pc/WorkListAllNew'], resolve) },
-  'seek-work':(resolve) => { require(['./pc/Seekwork'], resolve) },
-  'work-history':(resolve) => { require(['./pc/WorkHistory'], resolve) },
-  'complain-work':(resolve) => { require(['./pc/ComplainWork'], resolve) },
-  'failure-edit':(resolve) => { require(['./pc/FailureEdit'], resolve) },
-  'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve)},
-  'tel-material-detailed': (resolve) => { require(['./pc/MaterialDetailed'], resolve)},
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机分别注册到两个文件中
+let specialComp = {
+  // 工单详情子组件
+  'repairs-work':(resolve) => { require(['./pc/RepairsWork'], resolve) },
+  'work-listall-new':(resolve) => { require(['./pc/WorkListAllNew'], resolve) },
+  'seek-work':(resolve) => { require(['./pc/Seekwork'], resolve) },
+  'work-history':(resolve) => { require(['./pc/WorkHistory'], resolve) },
+  'complain-work':(resolve) => { require(['./pc/ComplainWork'], resolve) },
+  'failure-edit':(resolve) => { require(['./pc/FailureEdit'], resolve) },
+  'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve)},
+  'tel-material-detailed': (resolve) => { require(['./pc/MaterialDetailed'], resolve)},
+  'material-statistics': (resolve) => { require(['./pc/MaterialStatistics'], resolve)},
+  'change-table': (resolve) => { require(['./pc/changetable'], resolve)},
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/rizhao/pc/DispatchMan.vue

@@ -27,14 +27,14 @@
               <input type="text" class="form-control" v-model="model.f_single_man"
                      placeholder='操作员'>
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'f_filiale':'分公司','f_single_man':'派单员',
                             'baoxiudan':'报修单量','dianhuotongqi':'点火通气单量',
                             'baoxiuzongliang':'总单量'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getDispatch" template-name='派单员工作量导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getDispatch" template-name='派单员工作量导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/filiale/rizhao/pc/DispatchWork.vue

@@ -27,14 +27,14 @@
 <!--              <input type="text" class="form-control" v-model="model.f_single_man"-->
 <!--                   placeholder='操作员'>-->
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'gongsi':'分公司',
                             'zixun':'咨询单','baoxiu':'报修单',
                             'dianhuo':'点火通气单'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getDispatchWork" template-name='派单员工作量导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getDispatchWork" template-name='派单员工作量导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/filiale/rizhao/pc/Traffic.vue

@@ -25,14 +25,14 @@
 <!--              <input  type="text" class="form-control" v-model="model.f_single_man"-->
 <!--                      placeholder='操作员'>-->
               <button class="btn btn-default" @click="search()">查询</button>
-              <export-excel class="button_search button_spacing"
+              <export-excel-tel class="button_search button_spacing"
                             :data="{startDate: this.model.startDate,endDate: this.model.endDate}"
                             :field="{'cetime':'时段','hwzl':'话务总量','weijie':'未接数',
                             'yijie':'已接数','jtl':'接听率(%)',
                             'zthsc':'总通话时长(分)'}"
                             style="margin-top: 20px"
-                            sqlurl="rs/logic/exportfile" sql-name="getTraffic" template-name='话务量报表导出'
-                            :choose-col="true"></export-excel>
+                            sqlurl="rs/logic/telephoneExport" sql-name="getTraffic" template-name='话务量报表导出'
+                            :choose-col="true"></export-excel-tel>
             </div>
           </div>
         </criteria>

package/src/filiale/rizhao/pc/WorkListAllNew.vue

@@ -152,7 +152,6 @@
                 <v-select :value.sync="model.defname" v-model='model.defname'
                           :value-single="true"
                           :options='$parent.$parent.defnames' placeholder='工单状态'
-                          condition="defname = '{}'"
                           close-on-select></v-select>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -453,7 +452,7 @@ export default {
     // }else {
     //   this.backservice = '是'
     // }
-    this.selfSearch()
+    // this.selfSearch()
   },
   watch: {
     'all' (val) {
@@ -540,7 +539,13 @@ export default {
     },
 
     search (args) {
-
+      if(this.$refs.paged.$refs.criteria.model.defname){
+        if(this.$refs.paged.$refs.criteria.model.defname == '完成' || this.$refs.paged.$refs.criteria.model.defname == '撤销'){
+          args.condition += ` and f_state =  '${this.$refs.paged.$refs.criteria.model.defname}'`
+        }else{
+          args.condition += ` and defname =  '${this.$refs.paged.$refs.criteria.model.defname}'`
+        }
+      }
       if (this.f_filialeids) {
         args.condition += ` and f_filiale_id in ${this.f_filialeids}`
       } else {