manage-client 3.2.46 → 3.2.50

package/build/dev-server.js

@@ -13,11 +13,10 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
-// var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://192.168.17.52:8600'
-// var fuwu = 'http://172.168.1.11:9001'
+var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
+// var fuwu = 'http://192.168.17.52:8600'
 var system = 'http://192.168.50.4:8400'
+var fuwu = 'http://192.168.50.4:8402'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -69,7 +68,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
     target: fuwu
@@ -81,7 +80,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.46",
+  "version": "3.2.50",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -78,6 +78,11 @@
 
                   </v-select>
                 </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="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"-->

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

@@ -33,10 +33,11 @@
                          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;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -63,7 +64,21 @@
               <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_book_no"
+                         condition="f_book_no = '{}'" 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_meter_book_sort"
+                         condition="f_meter_book_sort = '{}'" placeholder="册内序号">
+                </div>
                 <div class="col-sm-2 form-group">
 
                   <label for="inputstartDate" class="font_normal_body">抄表日期</label>
@@ -270,6 +285,15 @@
                 <th>
                   <nobr>客户姓名</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
+                <th>
+                  <nobr>用户证号</nobr>
+                </th>
+                <th>
+                  <nobr>册内序号</nobr>
+                </th>
                 <th>
                   <nobr>小区名称</nobr>
                 </th>
@@ -361,6 +385,15 @@
               <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_book_no}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_book_sort}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_residential_area}}</nobr>
               </td>

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

@@ -61,6 +61,12 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                          condition="u.f_user_name like '%{}%'" 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="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -114,6 +120,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
                 <th>
                   <nobr>期初余额</nobr>
                 </th>
@@ -138,6 +147,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_balance}}</nobr>
               </td>

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/BusinessManage.vue

@@ -1,171 +1,171 @@
-<template>
-  <!--  <div v-if="listpage">-->
-  <tab-button v-ref:list :active="-1">
-    <tabs header="收费查询" v-if="permission('收费查询')">
-      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
-    </tabs>
-    <tabs header="换表查询" v-if="permission('换表查询')">
-      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
-    </tabs>
-    <tabs header="机表抄表查询" v-if="permission('机表抄表查询')">
-      <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
-    </tabs>
-    <tabs header="过户查询" v-if="permission('过户查询')">
-      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
-    </tabs>
-    <tabs header="其他收费查询" v-if="permission('其他收费查询')">
-      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
-    </tabs>
-    <tabs header="冲正查询" v-if="permission('冲正查询')">
-      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
-    </tabs>
-    <tabs header="补卡查询" v-if="permission('补卡查询')">
-      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
-    </tabs>
-    <tabs header="补气查询" v-if="permission('补气查询')">
-      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
-    </tabs>
-    <tabs header="启用查询" v-if="permission('启用查询')">
-      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></enable-query>
-    </tabs>
-    <tabs header="停用查询" v-if="permission('停用查询')">
-      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></disable-query>
-    </tabs>
-    <tabs header="销户查询" v-if="permission('销户查询')">
-      <cancellation-query v-if="show.includes('销户查询')" @deal-msg="dealMsg" :data="data"></cancellation-query>
-    </tabs>
-    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">
-      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>
-    </tabs>
-    <tabs header="调价补差查询" v-if="permission('调价补差查询')">
-      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
-    </tabs>
-    <tabs header="迁表查询" v-if="permission('迁表查询')">
-      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
-    </tabs>
-    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">
-      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>
-    </tabs>
-    <tabs header="收据查询" v-if="permission('收据查询')">
-        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>
-    </tabs>
-    <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
-    <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
-    <!--      </tabs>-->
-    <tabs header="业务查询" v-if="permission('业务查询')">
-      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
-    </tabs>
-    <tabs header="预存查询" v-if="permission('预存查询')">
-      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
-    </tabs>
-    <tabs header="发折查询" v-if="permission('发折查询')">
-      <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
-    </tabs>
-    <tabs header="可疑用户查询" v-if="permission('可疑用户查询')">
-      <suspicious-user-query v-if="show.includes('可疑用户查询')" @deal-msg="dealMsg" :data="data"></suspicious-user-query>
-    </tabs>
-    <tabs header="气价变更查询" v-if="permission('气价变更查询')">
-      <price-change v-if="show.includes('气价变更查询')" @deal-msg="dealMsg" :data="data"></price-change>
-    </tabs>
-    <tabs header="扎帐查询" v-if="permission('扎帐查询')">
-      <prick-bill-query v-if="show.includes('扎帐查询')" @deal-msg="dealMsg" :data="data"></prick-bill-query>
-    </tabs>
-    <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
-    <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
-    <!--      </tabs>-->
-    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
-      <pricechange-record v-if="show.includes('调价记录查询')" @deal-msg="dealMsg" :data="data"></pricechange-record>
-    </tabs>
-    <tabs header="维护记录查询" v-if="permission('维护记录查询')">
-      <infooperate-record v-if="show.includes('维护记录查询')" @deal-msg="dealMsg" :data="data"></infooperate-record>
-    </tabs>
-    <tabs header="气损收费查询" v-if="permission('气损收费查询')">
-      <gasloss-query v-if="show.includes('气损收费查询')" @deal-msg="dealMsg" :data="data"></gasloss-query>
-    </tabs>
-    <tabs header="气价信息查询" v-if="permission('气价信息查询')">
-      <gas-price-query v-if="show.includes('气价信息查询')" @deal-msg="dealMsg" :data="data"></gas-price-query>
-    </tabs>
-
-  </tab-button>
-  <!--  </div>-->
-  <!--  <div v-if="!listpage">-->
-  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
-  <!--  </div>-->
-</template>
-
-<script>
-import TabButton from '../common/TabButton'
-import Tabs from '../common/Tabs'
-import ChargeQuery from './ChargeQuery'
-import { HttpResetClass } from 'vue-client'
-
-export default {
-  name: "BusinessQuery",
-  title: '业务查询',
-  data() {
-    return {// 页面开关
-      residentialArea: [],
-      f_start_date: '',
-      f_end_date: '',
-      listpage: true,
-      width: {
-        left: '100%',
-        right: '0%'
-      },
-      // searchNumber:'',
-      rowData: {},
-      show: [],
-      data: {
-        startDate: this.$login.toStandardDateString() + ' 00:00:00',
-        endDate: this.$login.toStandardDateString() + ' 23:59:59',
-        f_userinfo_code:''
-      }
-
-    }
-  },
-  components: {Tabs, TabButton, ChargeQuery},
-  ready() {
-    this.getaddress()
-    console.log(this.$refs.list)
-    console.log('业务查询')
-  },
-  methods: {
-    async  getaddress(){
-      let HttpReset = new HttpResetClass()
-      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
-        data: {
-          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
-        }
-      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-      console.log('小区',data)
-      let house = []
-      for (let row of data.data){
-        house.push({label: row.f_residential_area, value: row.f_residential_area})
-      }
-      house.unshift({label: '全部', value: ''})
-      this.residentialArea = house
-    },
-    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
-      this.f_start_date = obj.model.startDate
-      this.f_end_date = obj.model.endDate
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <!--  <div v-if="listpage">-->
+  <tab-button v-ref:list :active="-1">
+    <tabs header="收费查询" v-if="permission('收费查询')">
+      <charge-query v-if="show.includes('收费查询')" @deal-msg="dealMsg" :data="data"></charge-query>
+    </tabs>
+    <tabs header="换表查询" v-if="permission('换表查询')">
+      <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
+    </tabs>
+    <tabs header="机表抄表查询" v-if="permission('机表抄表查询')">
+      <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
+    </tabs>
+    <tabs header="过户查询" v-if="permission('过户查询')">
+      <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
+    </tabs>
+    <tabs header="其他收费查询" v-if="permission('其他收费查询')">
+      <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
+    </tabs>
+    <tabs header="冲正查询" v-if="permission('冲正查询')">
+      <reverse-query v-if="show.includes('冲正查询')" @deal-msg="dealMsg" :data="data"></reverse-query>
+    </tabs>
+    <tabs header="补卡查询" v-if="permission('补卡查询')">
+      <fill-card-query v-if="show.includes('补卡查询')" @deal-msg="dealMsg" :data="data"></fill-card-query>
+    </tabs>
+    <tabs header="补气查询" v-if="permission('补气查询')">
+      <fill-gas-query v-if="show.includes('补气查询')" @deal-msg="dealMsg" :data="data"></fill-gas-query>
+    </tabs>
+    <tabs header="启用查询" v-if="permission('启用查询')">
+      <enable-query v-if="show.includes('启用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></enable-query>
+    </tabs>
+    <tabs header="停用查询" v-if="permission('停用查询')">
+      <disable-query v-if="show.includes('停用查询')" @deal-msg="dealMsg" :data="data" :residentialarea="residentialArea"></disable-query>
+    </tabs>
+    <tabs header="销户查询" v-if="permission('销户查询')">
+      <cancellation-query v-if="show.includes('销户查询')" @deal-msg="dealMsg" :data="data"></cancellation-query>
+    </tabs>
+    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">
+      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>
+    </tabs>
+    <tabs header="调价补差查询" v-if="permission('调价补差查询')">
+      <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
+    </tabs>
+    <tabs header="迁表查询" v-if="permission('迁表查询')">
+      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
+    </tabs>
+    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">
+      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>
+    </tabs>
+    <tabs header="收据查询" v-if="permission('收据查询')">
+        <meter-receipt-query v-if="show.includes('收据查询')" @deal-msg="dealMsg" :data="data"></meter-receipt-query>
+    </tabs>
+    <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
+    <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
+    <!--      </tabs>-->
+    <tabs header="业务查询" v-if="permission('业务查询')">
+      <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
+    </tabs>
+    <tabs header="预存查询" v-if="permission('预存查询')">
+      <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
+    </tabs>
+    <tabs header="发折查询" v-if="permission('发折查询')">
+      <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
+    </tabs>
+    <tabs header="可疑用户查询" v-if="permission('可疑用户查询')">
+      <suspicious-user-query v-if="show.includes('可疑用户查询')" @deal-msg="dealMsg" :data="data"></suspicious-user-query>
+    </tabs>
+    <tabs header="气价变更查询" v-if="permission('气价变更查询')">
+      <price-change v-if="show.includes('气价变更查询')" @deal-msg="dealMsg" :data="data"></price-change>
+    </tabs>
+    <tabs header="扎帐查询" v-if="permission('扎帐查询')">
+      <prick-bill-query v-if="show.includes('扎帐查询')" @deal-msg="dealMsg" :data="data"></prick-bill-query>
+    </tabs>
+    <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
+    <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
+    <!--      </tabs>-->
+    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
+      <pricechange-record v-if="show.includes('调价记录查询')" @deal-msg="dealMsg" :data="data"></pricechange-record>
+    </tabs>
+    <tabs header="维护记录查询" v-if="permission('维护记录查询')">
+      <infooperate-record v-if="show.includes('维护记录查询')" @deal-msg="dealMsg" :data="data"></infooperate-record>
+    </tabs>
+    <tabs header="气损收费查询" v-if="permission('气损收费查询')">
+      <gasloss-query v-if="show.includes('气损收费查询')" @deal-msg="dealMsg" :data="data"></gasloss-query>
+    </tabs>
+    <tabs header="气价信息查询" v-if="permission('气价信息查询')">
+      <gas-price-query v-if="show.includes('气价信息查询')" @deal-msg="dealMsg" :data="data"></gas-price-query>
+    </tabs>
+
+  </tab-button>
+  <!--  </div>-->
+  <!--  <div v-if="!listpage">-->
+  <!--    <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+  <!--  </div>-->
+</template>
+
+<script>
+import TabButton from '../common/TabButton'
+import Tabs from '../common/Tabs'
+import ChargeQuery from './ChargeQuery'
+import { HttpResetClass } from 'vue-client'
+
+export default {
+  name: "BusinessQuery",
+  title: '业务查询',
+  data() {
+    return {// 页面开关
+      residentialArea: [],
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [],
+      data: {
+        startDate: this.$login.toStandardDateString() + ' 00:00:00',
+        endDate: this.$login.toStandardDateString() + ' 23:59:59',
+        f_userinfo_code:''
+      }
+
+    }
+  },
+  components: {Tabs, TabButton, ChargeQuery},
+  ready() {
+    this.getaddress()
+    console.log(this.$refs.list)
+    console.log('业务查询')
+  },
+  methods: {
+    async  getaddress(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      console.log('小区',data)
+      let house = []
+      for (let row of data.data){
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      house.unshift({label: '全部', value: ''})
+      this.residentialArea = house
+    },
+    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
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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>