telephone-clients 3.0.101 → 3.0.103

package/src/components/pc/WorkListAllNew.vue

@@ -245,16 +245,9 @@
               <th>
                 <nobr>截止时间</nobr>
               </th>
-              <th>
-                <nobr>逾期时间</nobr>
-              </th>
-
-
               <th>
                 <nobr>工单结果</nobr>
               </th>
-
-
             </tr>
           </template>
           <template partial='body'>
@@ -325,11 +318,6 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_finish_date == '1900-01-01 00:00:00' ? '' : row.f_finish_date}}</nobr>
             </td>
-            <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.d2(row) }}</nobr>
-            </td>
-
-
             <td  style="text-align: center;">
               <nobr>{{ row.f_result_status }}</nobr>
             </td>
@@ -426,8 +414,11 @@ export default {
       thead: '',
       tfoot: '',
       zhihuans: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '异常', value: '异常'}],
-      headData: ['工单类型', '报修类型', '工单编号', '用户姓名', '用户地址', '用户电话', '报修电话', '报修时间', '报修原因', '维修人','故障类型'],
-      bodyData: ['f_workorder_type', 'f_repairtype', 'f_service_id', 'f_user_name', 'f_address', 'f_phone', 'f_contact_phone', 'f_created_date', 'f_remarks', 'f_order_man'],
+      headData: ['工单类型', '工单编号', '派单时间','客户信息', '联系电话', '故障明细', '工单来源', '工单状态', '派单人', '话务员','接单员',
+        '结单时间','到达时间', '离开时间','逾期状态','截止时间','工单结果'],
+      bodyData: ['f_workorder_type', 'f_service_id', 'f_created_date', 'f_customer_info_show','f_contact_phone', 'f_json', 'f_source',
+        'f_state_show',  'f_single_man','f_attendant','f_order_man','f_date','f_date_come','f_date_leave',
+        'f_overdue_show','f_finish_time_show','f_result_status'],
       searchData: {
         condition: '1=1'
       },
@@ -435,17 +426,20 @@ export default {
         'f_workorder_type': '工单类型',
         'f_service_id': '工单编号',
         'f_created_date': '派单时间',
-        'f_user_name': '用户姓名',
-        'f_address': '用户地址',
+        'f_customer_info_show': '客户信息',
         'f_contact_phone': '联系电话',
-        'f_source': '工单来源',
         'f_json': '故障明细',
+        'f_source': '工单来源',
+        'f_state_show': '工单状态',
         'f_single_man': '派单人',
-        'f_attendant': '受理人',
-        'f_order_man': '接单人',
-        'defname': '工单状态',
-        'f_date_leave': '完成时间',
-        'f_remarks': '备注'
+        'f_attendant': '话务员',
+        'f_order_man': '接单员',
+        'f_date': '结单时间',
+        'f_date_come': '到达时间',
+        'f_date_leave': '离开时间',
+        'f_overdue_show': '逾期状态',
+        'f_finish_time_show': '截止时间',
+        'f_result_status': '工单结果',
       },
       criteriaShow: false
     }
@@ -496,7 +490,7 @@ export default {
       this.$refs.paged.$refs.criteria.model={}
     },
     d1(row){
-      return row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?'已逾期':'未逾期'):(this.datejisuan(row.f_finish_date,'')<0?'已逾期':'未逾期')):''
+      return row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?'已逾期':'未逾期'):(this.datejisuan(row.f_finish_date,this.getNowFormatDate())<0?'已逾期':'未逾期')):''
     },
     d2(row){
       const result = row.f_workorder_type == '报修单'?(row.f_result_status == '已完成'?(this.datejisuan(row.f_finish_date,row.f_date)<0?this.formatDuring(new Date(row.f_date).getTime(),new Date(row.f_finish_date).getTime()):'未逾期'):(this.datejisuan(row.f_finish_date,'')<0?this.formatDuring(new Date().getTime(),new Date(row.f_finish_date).getTime()):'未逾期')):''

package/src/components/temp/ChangemeterInfo.vue

@@ -1,87 +1,87 @@
-<template >
-  <div id="pc-finduser-page">
-    <criteria-paged :model="model" v-ref:paged :simple="true">
-      <!-- <criteria partial='criteria'>
-      </criteria> -->
-      <data-grid :model="model" partial='list' v-ref:grid
-                 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>
-            <th><nobr>补气量</nobr></th>
-            <th><nobr>换表原因</nobr></th>
-            <th><nobr>操作人</nobr></th>
-            <th><nobr>操作日期</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <!--<td><nobr>{{row.f_userinfo_id}}</nobr></td>-->
-          <!--<td><nobr>{{row.f_user_name}}</nobr></td>-->
-          <td><nobr>{{row.f_newmeternumber}}</nobr></td>
-          <td><nobr>{{row.f_meternumber}}</nobr></td>
-          <td><nobr>{{row.f_newremanent_gas}}</nobr></td>
-          <td><nobr>{{row.f_changemeter_type}}</nobr></td>
-          <th><nobr>{{row.f_operator}}</nobr></th>
-          <td><nobr>{{row.f_operate_date}}</nobr></td>
-        </template>
-        <!--<template partial='foot'>
-          <td style="text-align:center">汇总</td>
-          <td></td>
-          <td></td>
-          <td >累计购气量:{{model.sums.f_pregas}}</td>
-          <td >累计金额：{{model.sums.f_totalcost}}</td>
-          <td >共{{model.count}}条</td>
-        </template>-->
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  export default {
-    title: '换表记录',
-    data () {
-      return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 5, {items: '"*"', tablename: '"t_changemeter"', orderitem: '"f_operate_date desc"'}),
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      clearflg:0
-    },
-    methods: {
-      selected (row) {
-        if (this.row === row) {
-          this.row = null
-        } else {
-          this.row = row
-        }
-      },
-      isSelected (row) {
-        return this.row === row
-      }
-    },
-    watch: {
-      'user' (val) {
-        this.model.rows = []
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
-      },
-      'clearflg'(){
-        this.model.rows = []
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
-      }
-    }
-  }
-</script>
+<template >
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 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>
+            <th><nobr>补气量</nobr></th>
+            <th><nobr>换表原因</nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <!--<td><nobr>{{row.f_userinfo_id}}</nobr></td>-->
+          <!--<td><nobr>{{row.f_user_name}}</nobr></td>-->
+          <td><nobr>{{row.f_newmeternumber}}</nobr></td>
+          <td><nobr>{{row.f_meternumber}}</nobr></td>
+          <td><nobr>{{row.f_newremanent_gas}}</nobr></td>
+          <td><nobr>{{row.f_changemeter_type}}</nobr></td>
+          <th><nobr>{{row.f_operator}}</nobr></th>
+          <td><nobr>{{row.f_operate_date}}</nobr></td>
+        </template>
+        <!--<template partial='foot'>
+          <td style="text-align:center">汇总</td>
+          <td></td>
+          <td></td>
+          <td >累计购气量:{{model.sums.f_pregas}}</td>
+          <td >累计金额：{{model.sums.f_totalcost}}</td>
+          <td >共{{model.count}}条</td>
+        </template>-->
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '换表记录',
+    data () {
+      return {
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 5, {items: '"*"', tablename: '"t_changemeter"', orderitem: '"f_operate_date desc"'}),
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg:0
+    },
+    methods: {
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        this.model.rows = []
+        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+      },
+      'clearflg'(){
+        this.model.rows = []
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
+      }
+    }
+  }
+</script>

package/src/components/temp/DeviceInfo.vue

@@ -1,82 +1,82 @@
-<template >
-  <div id="pc-finduser-page">
-    <criteria-paged :model="model" v-ref:paged :simple="true">
-      <!-- <criteria partial='criteria'>
-      </criteria> -->
-      <data-grid :model="model" partial='list' v-ref:grid
-                 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>
-            <th><nobr>设备状态</nobr></th>
-            <th><nobr>操作日期</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <!--<td><nobr>{{row.f_user_id}}</nobr></td>-->
-          <td><nobr>{{row.f_devices_type}}</nobr></td>
-          <td><nobr>{{row.f_brand}}</nobr></td>
-          <td><nobr>{{row.f_devices_num}}</nobr></td>
-          <td><nobr>{{row.f_devices_state}}</nobr></td>
-          <td><nobr>{{row.f_operate_date}}</nobr></td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  let getmodelGen = function * (self, val) {
-    yield self.model.search((`f_userinfo_id = '${self.user.f_userinfo_id}'`))
-      .then(() => {
-        // self.getdata()
-      })
-  }
-  export default {
-    title: '设备信息',
-    data () {
-      return {
-        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_devices"', orderitem: '"f_operate_date desc"'}),
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      clearflg:0
-    },
-    methods: {
-      getmodel () {
-        let gen = getmodelGen(this)
-        co(gen)
-      }
-    },
-    watch: {
-      'user' (val) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model.rows = []
-            this.getmodel()
-          }
-        }
-      },
-      'clearflg'(){
-        this.model.rows = []
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        this.getmodel()
-      }
-    }
-  }
-</script>
+<template >
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 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>
+            <th><nobr>设备状态</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <!--<td><nobr>{{row.f_user_id}}</nobr></td>-->
+          <td><nobr>{{row.f_devices_type}}</nobr></td>
+          <td><nobr>{{row.f_brand}}</nobr></td>
+          <td><nobr>{{row.f_devices_num}}</nobr></td>
+          <td><nobr>{{row.f_devices_state}}</nobr></td>
+          <td><nobr>{{row.f_operate_date}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  let getmodelGen = function * (self, val) {
+    yield self.model.search((`f_userinfo_id = '${self.user.f_userinfo_id}'`))
+      .then(() => {
+        // self.getdata()
+      })
+  }
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: '"t_devices"', orderitem: '"f_operate_date desc"'}),
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg:0
+    },
+    methods: {
+      getmodel () {
+        let gen = getmodelGen(this)
+        co(gen)
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model.rows = []
+            this.getmodel()
+          }
+        }
+      },
+      'clearflg'(){
+        this.model.rows = []
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+    }
+  }
+</script>