manage-client 3.2.43 → 3.2.47

package/src/components/sale/businessquery/BusinesQuery.vue

@@ -75,6 +75,11 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id = '{}'" placeholder='卡号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
               </div>
 
             </div>
@@ -89,6 +94,9 @@
                 <th>
                   <nobr>用户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>用户地址</nobr>
                 </th>
@@ -123,6 +131,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>

package/src/components/sale/businessquery/CancellationQuery.vue

@@ -33,9 +33,9 @@
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
 
                 <div class="span" style="float:right;">
@@ -58,6 +58,11 @@
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -83,6 +88,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>客户类型</nobr>
                 </th>
@@ -124,6 +132,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>

package/src/components/sale/businessquery/CardHandplanQuery.vue

@@ -31,7 +31,11 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
-
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -111,9 +115,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
-<!--                <th>-->
-<!--                  <nobr>客户地址</nobr>-->
-<!--                </th>-->
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>表号</nobr>
                 </th>
@@ -161,9 +165,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
-<!--              <td style="text-align: center;">-->
-<!--                <nobr>{{row.f_address}}</nobr>-->
-<!--              </td>-->
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -32,11 +32,12 @@
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
 
+
 <!--
         -->
 
@@ -60,6 +61,11 @@
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户电话</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
@@ -180,6 +186,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
@@ -250,6 +259,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -32,9 +32,9 @@
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
 
                 <div class="span" style="float:right;">
@@ -60,6 +60,11 @@
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.id"
@@ -321,6 +326,7 @@
                   <data-order field="f_userinfo_code" name="客户编号"
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
+                <th><nobr>档案编号</nobr></th>
                 <th><nobr>街道</nobr></th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -492,6 +498,12 @@
                   <th>
                       <nobr>三阶气费</nobr>
                   </th>
+                <th>
+                  <nobr>上期表底数</nobr>
+                </th>
+                <th>
+                  <nobr>本期表底数</nobr>
+                </th>
                 <th><nobr>附件</nobr></th>
               </tr>
             </template>
@@ -502,6 +514,9 @@
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_street}}</nobr>
               </td>
@@ -672,6 +687,12 @@
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
                 </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase }}</nobr>
+              </td>
               <td style="text-align: center;"><nobr>
                 <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
               </nobr></td>

package/src/components/sale/businessquery/CollectManage.vue

@@ -1,138 +1,138 @@
-<template>
-  <tab-button v-ref:list :active="-1">
-    <tabs header="欠费查询" v-if="permission('欠费查询')">
-      <arrears-query v-if="show.includes('欠费查询')"></arrears-query>
-    </tabs>
-    <tabs header="非收费业务查询" v-if="permission('非收费业务查询')">
-      <no-business-query v-if="show.includes('非收费业务查询')"  @deal-msg="dealMsg"></no-business-query>
-    </tabs>
-    <tabs header="小区综合查询" v-if="permission('小区综合查询')">
-      <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
-    </tabs>
-    <tabs header="小区收费查询" v-if="permission('小区收费查询')">
-      <area-charge-query v-if="show.includes('小区收费查询')"  @deal-msg="dealMsg"></area-charge-query>
-    </tabs>
-    <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
-      <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
-    </tabs>
-    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
-      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
-    </tabs>
-    <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
-      <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
-    </tabs>
-    <tabs header="分公司汇总表" v-if="permission('分公司汇总表')">
-      <sell-orgname-query v-if="show.includes('分公司汇总表')"  @deal-msg="dealMsg"></sell-orgname-query>
-    </tabs>
-    <tabs header="抄表员统计" v-if="permission('抄表员统计')">
-      <hand-people-query v-if="show.includes('抄表员统计')"  @deal-msg="dealMsg"></hand-people-query>
-    </tabs>
-    <!--<tabs header="开户查询" v-if="permission('开户查询')">-->
-      <!--<new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>-->
-    <!--</tabs>-->
-    <tabs header="用气查询" v-if="permission('用气查询')">
-      <fmygas-query v-if="show.includes('用气查询')"  @deal-msg="dealMsg"></fmygas-query>
-    </tabs>
-    <tabs header="气费回收率" v-if="permission('气费回收率')">
-      <hand-rate-query v-if="show.includes('气费回收率')"  @deal-msg="dealMsg"></hand-rate-query>
-    </tabs>
-    <tabs header="收费抄表" v-if="permission('收费抄表')">
-      <selling-hand v-if="show.includes('收费抄表')" @deal-msg="dealMsg"></selling-hand>
-    </tabs>
-    <tabs header="月用气状况" v-if="permission('月用气状况')">
-      <month-gas-query v-if="show.includes('月用气状况')"  @deal-msg="dealMsg"></month-gas-query>
-    </tabs>
-    <tabs header="用户余额分析" v-if="permission('用户余额分析')">
-      <user-sell-head-detail v-if="show.includes('用户余额分析')" @deal-msg="dealMsg"></user-sell-head-detail>
-    </tabs>
-    <!--<tabs header="年度月份用量分析" v-if="permission('年度月份用量分析')">-->
-      <!--<year-gas-query v-if="show == '年度月份用量分析'"  @deal-msg="dealMsg"></year-gas-query>-->
-    <!--</tabs>-->
-    <!--<tabs header="余额统计查询" v-if="permission('余额统计查询')">-->
-      <!--<balance-query v-if="show == '余额统计查询'"  @deal-msg="dealMsg"></balance-query>-->
-    <!--</tabs>-->
-    <tabs header="用户余额表" v-if="permission('用户余额表')">
-      <balance-table v-if="show.includes('用户余额表')"  @deal-msg="dealMsg"></balance-table>
-    </tabs>
-    <tabs header="抄表册统计" v-if="permission('抄表册统计')">
-      <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
-    </tabs>
-    <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
-      <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
-    </tabs>
-    <tabs header="每月应收汇总统计" v-if="permission('每月应收汇总统计')">
-      <hand-gas-query v-if="show.includes('每月应收汇总统计')"  @deal-msg="dealMsg"></hand-gas-query>
-    </tabs>
-    <tabs header="小区缴费汇总(机表)" v-if="permission('小区缴费汇总(机表)')">
-      <community-paymen v-if="show.includes('小区缴费汇总(机表)')"  @deal-msg="dealMsg"></community-paymen>
-    </tabs>
-    <tabs header="预存明细查询" v-if="permission('预存明细查询')">
-      <deposit-detail v-if="show.includes('预存明细查询')" @deal-msg="dealMsg"></deposit-detail>
-    </tabs>
-    <tabs header="小区用户分布统计" v-if="permission('小区用户分布统计')">
-      <plot-summary-query v-if="show.includes('小区用户分布统计')"  @deal-msg="dealMsg"></plot-summary-query>
-    </tabs>
-    <tabs header="用户用气收费情况" v-if="permission('用户用气收费情况')">
-      <usergas v-if="show.includes('用户用气收费情况')"  @deal-msg="dealMsg"></usergas>
-    </tabs>
-    <tabs header="卡表用户结余明细" v-if="permission('卡表用户结余明细')">
-      <yonghu-jieyu v-if="show.includes('卡表用户结余明细')"  @deal-msg="dealMsg"></yonghu-jieyu>
-    </tabs>
-    <tabs header="应收实收明细" v-if="permission('应收实收明细')">
-      <ying-shou-ming-xi v-if="show.includes('应收实收明细')"  @deal-msg="dealMsg"></ying-shou-ming-xi>
-    </tabs>
-    <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
-      <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
-    </tabs>
-  </tab-button>
-
-</template>
-
-<script>
-  import TabButton from '../common/TabButton'
-  import Tabs from '../common/Tabs'
-  import ArrearsQuery from './ArrearsQuery'
-
-
-  export default {
-    title: '汇总查询',
-    data () {
-      return {
-        f_start_date: '',
-        f_end_date: '',
-        listpage: true,
-        width: {
-          left: '100%',
-          right: '0%'
-        },
-        // searchNumber:'',
-        rowData: {},
-        show: []
-      }
-    },
-    components: {Tabs, TabButton, ArrearsQuery},
-    methods: {
-      permission (name) {
-        if (this.$login.r.find(value => value == '综合查询')) {
-          if (!this.$login.r.find(value => value == name)) {
-            return false
-          }
-        }
-        return true
-      },
-      cancel (obj) {
-        this.listpage = true
-      },
-      dealMsg(obj) {
-        this.rowData = obj
-        this.listpage = false
-        console.log(obj.model)
-        this.f_start_date = obj.model.startDate
-        this.f_end_date = obj.model.endDate
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
+<template>
+  <tab-button v-ref:list :active="-1">
+    <tabs header="欠费查询" v-if="permission('欠费查询')">
+      <arrears-query v-if="show.includes('欠费查询')"></arrears-query>
+    </tabs>
+    <tabs header="非收费业务查询" v-if="permission('非收费业务查询')">
+      <no-business-query v-if="show.includes('非收费业务查询')"  @deal-msg="dealMsg"></no-business-query>
+    </tabs>
+    <tabs header="小区综合查询" v-if="permission('小区综合查询')">
+      <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
+    </tabs>
+    <tabs header="小区收费查询" v-if="permission('小区收费查询')">
+      <area-charge-query v-if="show.includes('小区收费查询')"  @deal-msg="dealMsg"></area-charge-query>
+    </tabs>
+    <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
+      <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
+    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
+      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
+    <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
+      <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
+    </tabs>
+    <tabs header="分公司汇总表" v-if="permission('分公司汇总表')">
+      <sell-orgname-query v-if="show.includes('分公司汇总表')"  @deal-msg="dealMsg"></sell-orgname-query>
+    </tabs>
+    <tabs header="抄表员统计" v-if="permission('抄表员统计')">
+      <hand-people-query v-if="show.includes('抄表员统计')"  @deal-msg="dealMsg"></hand-people-query>
+    </tabs>
+    <!--<tabs header="开户查询" v-if="permission('开户查询')">-->
+      <!--<new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>-->
+    <!--</tabs>-->
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <fmygas-query v-if="show.includes('用气查询')"  @deal-msg="dealMsg"></fmygas-query>
+    </tabs>
+    <tabs header="气费回收率" v-if="permission('气费回收率')">
+      <hand-rate-query v-if="show.includes('气费回收率')"  @deal-msg="dealMsg"></hand-rate-query>
+    </tabs>
+    <tabs header="收费抄表" v-if="permission('收费抄表')">
+      <selling-hand v-if="show.includes('收费抄表')" @deal-msg="dealMsg"></selling-hand>
+    </tabs>
+    <tabs header="月用气状况" v-if="permission('月用气状况')">
+      <month-gas-query v-if="show.includes('月用气状况')"  @deal-msg="dealMsg"></month-gas-query>
+    </tabs>
+    <tabs header="用户余额分析" v-if="permission('用户余额分析')">
+      <user-sell-head-detail v-if="show.includes('用户余额分析')" @deal-msg="dealMsg"></user-sell-head-detail>
+    </tabs>
+    <!--<tabs header="年度月份用量分析" v-if="permission('年度月份用量分析')">-->
+      <!--<year-gas-query v-if="show == '年度月份用量分析'"  @deal-msg="dealMsg"></year-gas-query>-->
+    <!--</tabs>-->
+    <!--<tabs header="余额统计查询" v-if="permission('余额统计查询')">-->
+      <!--<balance-query v-if="show == '余额统计查询'"  @deal-msg="dealMsg"></balance-query>-->
+    <!--</tabs>-->
+    <tabs header="用户余额表" v-if="permission('用户余额表')">
+      <balance-table v-if="show.includes('用户余额表')"  @deal-msg="dealMsg"></balance-table>
+    </tabs>
+    <tabs header="抄表册统计" v-if="permission('抄表册统计')">
+      <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
+    </tabs>
+    <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
+      <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
+    </tabs>
+    <tabs header="每月应收汇总统计" v-if="permission('每月应收汇总统计')">
+      <hand-gas-query v-if="show.includes('每月应收汇总统计')"  @deal-msg="dealMsg"></hand-gas-query>
+    </tabs>
+    <tabs header="小区缴费汇总(机表)" v-if="permission('小区缴费汇总(机表)')">
+      <community-paymen v-if="show.includes('小区缴费汇总(机表)')"  @deal-msg="dealMsg"></community-paymen>
+    </tabs>
+    <tabs header="预存明细查询" v-if="permission('预存明细查询')">
+      <deposit-detail v-if="show.includes('预存明细查询')" @deal-msg="dealMsg"></deposit-detail>
+    </tabs>
+    <tabs header="小区用户分布统计" v-if="permission('小区用户分布统计')">
+      <plot-summary-query v-if="show.includes('小区用户分布统计')"  @deal-msg="dealMsg"></plot-summary-query>
+    </tabs>
+    <tabs header="用户用气收费情况" v-if="permission('用户用气收费情况')">
+      <usergas v-if="show.includes('用户用气收费情况')"  @deal-msg="dealMsg"></usergas>
+    </tabs>
+    <tabs header="卡表用户结余明细" v-if="permission('卡表用户结余明细')">
+      <yonghu-jieyu v-if="show.includes('卡表用户结余明细')"  @deal-msg="dealMsg"></yonghu-jieyu>
+    </tabs>
+    <tabs header="应收实收明细" v-if="permission('应收实收明细')">
+      <ying-shou-ming-xi v-if="show.includes('应收实收明细')"  @deal-msg="dealMsg"></ying-shou-ming-xi>
+    </tabs>
+    <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
+      <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../common/TabButton'
+  import Tabs from '../common/Tabs'
+  import ArrearsQuery from './ArrearsQuery'
+
+
+  export default {
+    title: '汇总查询',
+    data () {
+      return {
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: []
+      }
+    },
+    components: {Tabs, TabButton, ArrearsQuery},
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg(obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/components/sale/businessquery/DisableQuery.vue

@@ -33,9 +33,9 @@
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
 
                 <div class="span" style="float:right;">
@@ -57,6 +57,11 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户电话</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
@@ -135,6 +140,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>客户类型</nobr>
                 </th>
@@ -185,6 +193,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>

package/src/components/sale/businessquery/EnableQuery.vue

@@ -33,10 +33,9 @@
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition=" f_user_name like '%{}%'" placeholder='客户名称'
-                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
                 </div>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -58,6 +57,12 @@
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'
+                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -117,6 +122,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>客户类型</nobr>
                 </th>
@@ -158,6 +166,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>