telephone-clients 3.0.103 → 3.0.104-11

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

@@ -375,6 +375,9 @@
             ename: Vue.user.ename
           }, user: null, callObj: null
         }
+        if(data.model.failure){
+          data.model.f_json =  this.trouble(data.model.failure)
+        }
         if(this.model.f_handlingtype=='转维修员'){
           data.toRepair = '一级派单'
           this.model.f_meetunit = Vue.user.deps
@@ -427,6 +430,28 @@
           failure.push({"f_failure_type": val[i], "failurecase": []})
         }
         this.model.failure=JSON.stringify(failure)
+      },
+      trouble (val) {
+        let failureall=''
+        let failure = JSON.parse(val)
+        for (let i = 0; i <failure.length; i++) {
+          if (failure[i].failurecase.length>0){
+            failureall+=failure[i].f_failure_type+":"
+            for (let j = 0; j < failure[i].failurecase.length; j++) {
+              failureall+=failure[i].failurecase[j]
+              if (j+1!=failure[i].failurecase.length){
+                failureall+=","
+              }
+            }
+
+          }else{
+            failureall+=failure[i].f_failure_type
+          }
+          if (i+1!=failure.length){
+            failureall+=';'
+          }
+        }
+        return failureall
       }
     },
     ready(){

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

@@ -1,161 +1,161 @@
-<template>
-  <div id="tel-charges-list">
-
-    <div class="list" v-show="changeModel">
-      <div style="display: flex;justify-content: center;">
-        <button type="button" name="button" class="btn btn-primary btn-sm fr btn-img-cl" @click="open()" style="margin: 5px ">
-          新增收费
-        </button>
-      </div>
-      <div>
-        <data-grid partial='list' v-ref:grid :model="model" class="list_area table_sy">
-          <template partial='body'>
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_payment }}</nobr>
-            </td>
-            <td  style="text-align: center;">
-              <nobr>￥{{ row.f_collection }}</nobr>
-            </td>
-            <td  style="text-align: center;">
-              <nobr><button @click="$parent.$parent.getAllMaterial(row)">查看</button></nobr>
-            </td>
-          </template>
-        </data-grid>
-      </div>
-      <div class="">
-        <data-grid partial='list' v-ref:grid :model="material" class="list_area table_sy">
-          <template partial='head'>
-            <tr>
-              <th>
-                <nobr>品名规格</nobr>
-              </th>
-              <th>
-                <nobr>型号</nobr>
-              </th>
-              <th>
-                <nobr>单价</nobr>
-              </th>
-              <th>
-                <nobr>数量</nobr>
-              </th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td  style="text-align: center;">
-              <nobr>{{row.f_material_name }}</nobr>
-            </td>
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_typenumber }}</nobr>
-            </td>
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_material_price }}</nobr>
-            </td>
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_material_number }}</nobr>
-            </td>
-          </template>
-        </data-grid>
-      </div>
-    </div>
-    <div class="material_service"  v-show="!changeModel">
-      <appinstallation-material v-if="!changeModel" :selectdata = "selectdata" @valueChange="change" @aftersave="aftersave()"></appinstallation-material>
-    </div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-import QRCode from 'qrcodejs2'
-import {isEmpty} from '../../../components/Util'
-import AppInstallationMaterial from './AppInstallationMaterial'
-import FailureEdit from 'telephone-clients/src/filiale/qianneng/pc/FailureEdit'
-export default {
-  title: '材料添加',
-  props: {
-    selectdata: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      model:{rows:[]},
-      material:{rows:[]},
-      showmaterial:false,
-      changeModel:true
-    }
-  },
-  ready() {
-    this.getAllOthercharge()
-    // this.getmaterial()
-    // this.getmaterialTYPE()
-
-  },
-  methods: {
-    open(){
-      this.changeModel=false
-    },
-    aftersave(){
-      this.getAllOthercharge()
-      this.changeModel=true
-    },
-    getAllOthercharge(){
-      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=10`, {data: {
-          items: '*',
-          tablename: 't_othercharge',
-          condition: ` f_voucher_number='${this.selectdata.f_process_id}' and f_state='有效'`,
-          orderitem: 'id desc'
-        }},{resolveMsg:null,rejectMsg:null}).then(res=>{
-        console.log(res)
-        this.model.rows=res.data
-      }).catch((e)=>{
-        console.log("933",e)
-      })
-    },
-    getAllMaterial(row){
-      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=100`, {data: {
-          items: '*',
-          tablename: 't_material_service',
-          condition: ` f_othercharge_id='${row.id}'`,
-          orderitem: 'id desc'
-        }},{resolveMsg:null,rejectMsg:null}).then(res=>{
-        console.log(res)
-        this.material.rows=res.data
-      }).catch((e)=>{
-        console.log("933",e)
-      })
-    },
-  },
-  events: {},
-  computed: {},
-  watch: {},
-  components: {
-    'appinstallation-material': AppInstallationMaterial
-  }
-}
-</script>
-<style lang="less" scoped>
-.head-but {
-  margin-left: 5px;
-  height: 34px;
-  /*background-color: #6aa6e2;*/
-  border-radius: 4px;
-  font-family: PingFang;
-  color: #ffffff;
-}
-
-/*清除model中的浮动*/
-.clearfix:after, .clearfix:before {
-  display: table;
-}
-
-.clearfix:after {
-  clear: both;
-}
-#tel-charges-list{
-  .list{
-    display: flex;
-    flex-direction: column;
-  }
-}
-</style>
+<template>
+  <div id="tel-charges-list">
+
+    <div class="list" v-show="changeModel">
+      <div style="display: flex;justify-content: center;">
+        <button type="button" name="button" class="btn btn-primary btn-sm fr btn-img-cl" @click="open()" style="margin: 5px ">
+          新增收费
+        </button>
+      </div>
+      <div>
+        <data-grid partial='list' v-ref:grid :model="model" class="list_area table_sy">
+          <template partial='body'>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_payment }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>￥{{ row.f_collection }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr><button @click="$parent.$parent.getAllMaterial(row)">查看</button></nobr>
+            </td>
+          </template>
+        </data-grid>
+      </div>
+      <div class="">
+        <data-grid partial='list' v-ref:grid :model="material" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>品名规格</nobr>
+              </th>
+              <th>
+                <nobr>型号</nobr>
+              </th>
+              <th>
+                <nobr>单价</nobr>
+              </th>
+              <th>
+                <nobr>数量</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td  style="text-align: center;">
+              <nobr>{{row.f_material_name }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_typenumber }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_material_price }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_material_number }}</nobr>
+            </td>
+          </template>
+        </data-grid>
+      </div>
+    </div>
+    <div class="material_service"  v-show="!changeModel">
+      <appinstallation-material v-if="!changeModel" :selectdata = "selectdata" @valueChange="change" @aftersave="aftersave()"></appinstallation-material>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import {isEmpty} from '../../../components/Util'
+import AppInstallationMaterial from './AppInstallationMaterial'
+import FailureEdit from 'telephone-clients/src/filiale/qianneng/pc/FailureEdit'
+export default {
+  title: '材料添加',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      model:{rows:[]},
+      material:{rows:[]},
+      showmaterial:false,
+      changeModel:true
+    }
+  },
+  ready() {
+    this.getAllOthercharge()
+    // this.getmaterial()
+    // this.getmaterialTYPE()
+
+  },
+  methods: {
+    open(){
+      this.changeModel=false
+    },
+    aftersave(){
+      this.getAllOthercharge()
+      this.changeModel=true
+    },
+    getAllOthercharge(){
+      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=10`, {data: {
+          items: '*',
+          tablename: 't_othercharge',
+          condition: ` f_voucher_number='${this.selectdata.f_process_id}' and f_state='有效'`,
+          orderitem: 'id desc'
+        }},{resolveMsg:null,rejectMsg:null}).then(res=>{
+        console.log(res)
+        this.model.rows=res.data
+      }).catch((e)=>{
+        console.log("933",e)
+      })
+    },
+    getAllMaterial(row){
+      new HttpResetClass().load('POST',this.$androidUtil.getProxyUrl() +`/rs/sql/tel_singleTable_OrderBy?pageNo=1&pageSize=100`, {data: {
+          items: '*',
+          tablename: 't_material_service',
+          condition: ` f_othercharge_id='${row.id}'`,
+          orderitem: 'id desc'
+        }},{resolveMsg:null,rejectMsg:null}).then(res=>{
+        console.log(res)
+        this.material.rows=res.data
+      }).catch((e)=>{
+        console.log("933",e)
+      })
+    },
+  },
+  events: {},
+  computed: {},
+  watch: {},
+  components: {
+    'appinstallation-material': AppInstallationMaterial
+  }
+}
+</script>
+<style lang="less" scoped>
+.head-but {
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+
+/*清除model中的浮动*/
+.clearfix:after, .clearfix:before {
+  display: table;
+}
+
+.clearfix:after {
+  clear: both;
+}
+#tel-charges-list{
+  .list{
+    display: flex;
+    flex-direction: column;
+  }
+}
+</style>

package/src/filiale/qianneng/pc/MaterialDetailed.vue

@@ -98,9 +98,10 @@
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">部&emsp;&emsp;门：</label>
-                <input type="text" style="width: 60%" class="input_search" placeholder='部门' v-model="model.f_department"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ms.f_department like '{}'">
+                <v-select :value.sync="model.f_department"
+                          v-model="model.f_department"
+                          :options='$parent.$parent.f_departments' placeholder='部门'
+                          close-on-select condition="ms.f_department like '%{}%'"></v-select>
               </div>
             </div>
           </div>
@@ -110,7 +111,9 @@
             <tr>
               <th>序号</th>
               <th>工单编号</th>
+              <th>客户编号</th>
               <th>客户名称</th>
+              <th>客户电话</th>
               <th>地址</th>
               <th>故障明细</th>
               <th>用户类型</th>
@@ -134,9 +137,15 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_service_id}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_userinfo_code}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_user_name}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_contact_phone}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_address}}</font></nobr>
               </td>
@@ -192,10 +201,13 @@ export default {
   data () {
     return {
       model: new PagedList('rs/sql/getmaterialservice', 30, null),
+      f_departments:[{label:"全部",value:""},...this.$appdata.getParam('部门')],
       criteriaShow: false,
       getfield: {
         'f_service_id': '工单编号',
+        'f_userinfo_code': '客户编号',
         'f_user_name': '客户名称',
+        'f_contact_phone': '客户电话',
         'f_address': '地址',
         'f_json': '故障明细',
         'f_user_type': '用户类型',

package/src/filiale/qianneng/pc/MaterialStatistics.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="flex-row">
+    <div style="height: 95%" class="basic-main" >
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" style="margin-bottom: 10px" partial>
+            <div class="row">
+              <div class="col-sm-6 form-group form-input-group" style="width: 40%">
+                <role-selector-tel
+                  role-name="维修员"
+                  role-lable="维&nbsp;修&nbsp;员"
+                  @re-res="$parent.$parent.getRes"
+                  :value.sync="model.f_checker_id"
+                  v-model="model.f_checker_id"
+                  condition="f_order_man = '{}'">
+                </role-selector-tel>
+              </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">操作时间</label>
+                <datepicker placeholder="起始操作时间"
+                            :value.sync="model.f_created_date"
+                            v-model="model.f_created_date"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            condition="f_date >= '{}'"
+                ></datepicker>
+              </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">操作时间</label>
+                <datepicker placeholder="终止操作时间"
+                            :value.sync="model.f_created_enddate"
+                            v-model="model.f_created_enddate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            condition="f_date <= '{}'"
+                ></datepicker>
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/telephoneExport"
+                              sql-name="getMaterialStatistics"
+                              template-name='材料汇总导出'
+                              :choose-col="true"></export-excel>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>维修员</th>
+              <th>材料名称</th>
+              <th>材料型号</th>
+              <th>数量</th>
+              <th>金额（元）</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_repair_man}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_type}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_count}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_money}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+export default {
+  title: '材料汇总',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getMaterialStatistics', 30, null),
+      criteriaShow: false,
+      getfield: {
+        'f_repair_man': '维修员',
+        'f_material_name': '材料名称',
+        'f_material_type': '材料型号',
+        'f_count': '数量',
+        'f_money': '金额（元）',
+      },
+      f_filialeids: ''
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      if (this.f_filialeids) {
+        args.condition += ` and t2.f_filiale_id in ${this.f_filialeids}`
+      } else {
+        args.condition += ` and t2.f_filiale_id = '${this.$login.f.orgid}'`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getRes (obj) {
+      this.f_filialeids = this.$login.convertToIn(obj.resids)
+    },
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>