sale-client 3.6.528 → 3.6.529

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.528",
+  "version": "3.6.529",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/Util.js

@@ -123,6 +123,12 @@ export function toStandardTimeStringForLastDay () {
   let date = dt.getDate()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + +(date < 10 ? '0' + date : date) + ' 23:59:59'
 }
+export function toStandardTimeStringForTodayEnd () {
+  let dt = new Date()
+  let month = dt.getMonth() + 1
+  let date = dt.getDate()
+  return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) + ' 23:59:59'
+}
 
 export function to3339TimeString () {
   let dt = new Date()

package/src/filiale/jingyang/EticketV4/CustQueryEticket.vue

@@ -52,11 +52,11 @@
               >
             </div>
             <div class="form-group col-sm-2">
-              <label for="startDate" class="font_normal_body">开始日期</label>
-              <datepicker id="startDate" placeholder="开始日期"
+              <label for="startDate" class="font_normal_body">开始时间</label>
+              <datepicker id="startDate" placeholder="开始时间"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd 00:00:00'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :disabled-days-of-Week="[]"
                           condition="f_operate_date >='{}'"
                           style="width:60%"
@@ -64,11 +64,11 @@
               </datepicker>
             </div>
             <div class="form-group col-sm-2">
-              <label for="endDate" class="font_normal_body">结束日期</label>
-              <datepicker id="endDate" placeholder="结束日期"
+              <label for="endDate" class="font_normal_body">结束时间</label>
+              <datepicker id="endDate" placeholder="结束时间"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :disabled-days-of-Week="[]"
                           condition="f_operate_date <='{}'"
                           style="width:60%"
@@ -203,6 +203,7 @@
    */
   import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
+  import * as Util from "../../../Util";
   export default {
     title: '结算开票',
     data () {
@@ -230,8 +231,8 @@
         mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
         initres: {
           org: [this.$login.f.orgid],
-          dep: [],
-          user: []
+          dep: [this.$login.f.depids],
+          user: [this.$login.f.id]
         },
         sumsmodel: {},
         other: [],
@@ -255,8 +256,8 @@
       }
     },
     ready () {
-      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.cri.model.startDate = Util.toStandardTimeStringForFirstDay()
+      this.$refs.paged.$refs.cri.model.endDate = Util.toStandardTimeStringForTodayEnd()
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
     },
     methods: {

package/src/filiale/jingyang/EticketV4/EticketOpenCard.vue

@@ -50,7 +50,7 @@
               </div>
               <div class="col-sm-4 col-sm-2">
                 <label class="font_normal_body">&nbsp;开始时间</label>
-                <datepicker :format="'yyyy-MM-dd 00:00:00'" :value.sync="model.f_start_date"
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
                             class="datepicker"
                             condition="s.f_operate_date >= '{}'"
                             placeholder="起始时间"
@@ -60,7 +60,7 @@
               </div>
               <div class="col-sm-4 col-sm-2">
                 <label class="font_normal_body">结束时间</label>
-                <datepicker :format="'yyyy-MM-dd 23:59:59'" :value.sync="model.f_end_date"
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
                             class="datepicker"
                             condition="s.f_operate_date <= '{}'"
                             placeholder="结束时间"
@@ -201,8 +201,8 @@
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../../Util'
 let asyncReadyGen = async function (self) {
-  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
-  self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
+  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardTimeStringForFirstDay()
+  self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardTimeStringForTodayEnd()
   await self.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
 }
@@ -225,8 +225,8 @@ export default {
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       initres: {
         org: [this.$login.f.orgid],
-        dep: [],
-        user: []
+        dep: [this.$login.f.depids],
+        user: [this.$login.f.id]
       },
       fields: {
         'f_userinfo_code': '客户编号',

package/src/filiale/jingyang/EticketV4/EticketOpenPage.vue

@@ -50,7 +50,7 @@
               </div>
               <div class="col-sm-4 col-sm-2">
                 <label class="font_normal_body">&nbsp;开始时间</label>
-                <datepicker :format="'yyyy-MM-dd 00:00:00'" :value.sync="model.f_start_date"
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
                             class="datepicker"
                             condition="s.f_operate_date >= '{}'"
                             placeholder="起始时间"
@@ -60,7 +60,7 @@
               </div>
               <div class="col-sm-4 col-sm-2">
                 <label class="font_normal_body">结束时间</label>
-                <datepicker :format="'yyyy-MM-dd 23:59:59'" :value.sync="model.f_end_date"
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
                             class="datepicker"
                             condition="s.f_operate_date <= '{}'"
                             placeholder="结束时间"
@@ -205,10 +205,11 @@
 <script>
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../../Util'
+import {toStandardTimeString, toStandardTimeStringForFirstDay, toStandardTimeStringForLastDay} from "../../../Util";
 
 let asyncReadyGen = async function (self) {
-  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
-  self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
+  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardTimeStringForFirstDay()
+  self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardTimeStringForTodayEnd()
   await self.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
 }

package/src/filiale/kelai/Userinfo.vue

@@ -0,0 +1,488 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading" style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">档案信息</h4>
+      </div>
+      <div class="auto info-content">
+        <div class="row" v-if="warninginfo.data.insMsg">
+          <p align="center"><font color="red" style="font-weight: bold">{{ warninginfo.data.insMsg }}</font></p>
+        </div>
+
+        <div class="row" :class="[config.f_userinfo_code ? 'highlight' : '']">
+          <label class="col-sm-5">客户编号</label>
+          <span class="col-sm-7"><a
+            @click="dealmsg(data)">{{ data ? data.f_userinfo_code : dafault.f_userinfo_code }}</a></span>
+        </div>
+        <div class="row" :class="[config.f_user_name ? 'highlight' : '']">
+          <label class="col-sm-5">客户名称</label>
+          <span class="col-sm-7">{{ data ? data.f_user_name : dafault.f_user_name }}</span>
+        </div>
+        <div class="row" v-if="data.f_name_pinyin">
+          <label class="col-sm-5">名称首拼</label>
+          <span class="col-sm-7">{{ data ? data.f_name_pinyin : dafault.f_name_pinyin }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_type ? 'highlight' : '']">
+          <label class="col-sm-5">客户类型</label>
+          <span class="col-sm-7">{{ data ? data.f_user_type : dafault.f_user_type }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">账户余额</label>
+          <span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" v-show="data.f_project_money && data.f_project_money > 0">
+          <label class="col-sm-5">未结金额</label>
+          <span class="col-sm-7">{{ data ?data.f_project_money: '' }} | {{ data ?data.f_gas_type: '' }}</span>
+        </div>
+        <div class="row" v-show="data &&  data.f_sys_balance !== 0">
+          <label class="col-sm-5">系统余额</label>
+          <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" :class="[config.f_idnumber ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all;color: brown">{{ data ? data.f_idnumber : dafault.f_idnumber }}
+            <span v-if="data"
+                  @click.stop="changeuseridnumber"
+                  class="glyphicon glyphicon-pencil clickchange"
+                  title="修正客户证件号码">
+            </span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_user_phone ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">客户电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+            <span v-if="data" @click.stop="changeuserphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
+          </span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5" style="color: brown">备用电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
+            <span v-if="data" @click.stop="changerentphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_user_state ? 'highlight' : '']">
+          <label class="col-sm-5">客户状态</label>
+          <span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
+        </div>
+        <div class="row" :class="[config.f_comments ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">备注信息</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_comments : dafault.f_comments }}
+            <span v-if="data" @click.stop="change_reason"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_address ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">客户地址</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_address : dafault.f_address }}
+            <span v-if="data" @click.stop="changeuseraddress"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修改客户地址"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_open_date ? 'highlight' : '']">
+          <label class="col-sm-5">开户时间</label>
+          <span class="col-sm-7">{{ data ? data.f_open_date.substr(0, 10) : dafault.f_open_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_input_date ? 'highlight' : '']">
+          <label class="col-sm-5">安装时间</label>
+          <span class="col-sm-7">{{ data ? data.f_install_date.substr(0, 10) : dafault.f_input_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_people_num ? 'highlight' : '']">
+          <label class="col-sm-5">&emsp;人&ensp;口&ensp;数</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_people_num : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">客户等级</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_user_level : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">旧客户编号</label>
+          <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">合同编号</label>
+          <span class="col-sm-7">{{ data ? data.f_contract_id : dafault.f_contract_id }}</span>
+        </div>
+        <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_user_phone" placeholder='旧客户电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuserphone"
+                         placeholder='新客户电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUser">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showselectncuserrent" :show.sync="showselectncuserrent" width="40%" title="修正客户备用电话"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户备用电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_rent_phone" placeholder='旧客户备用电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户备用电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newrentphone"
+                         placeholder='新客户备用电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserRent">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧备注信息</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_comments" placeholder='旧备注信息'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新备注信息</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="new_reason"
+                         placeholder='新备注信息'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserSpecialReson">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showselectncuseridnumber" :show.sync="showselectncuseridnumber" width="40%" title="修改证件号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧证件号码</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_idnumber" placeholder='旧证件号码'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新证件号码</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuseridnumber"
+                         placeholder='新证件号码'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!newuseridnumber' @click="modifyUserIdNumberReason">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+
+      </div>
+    </div>
+  </partial-view>
+
+  <!-- 添加修改地址弹窗 -->
+  <modal v-if="showAddressModal" :show.sync="showAddressModal" large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">修改客户地址</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <user-address
+        :f_filialeids="f_filialeids"
+        :row="addressData"
+        :usertype="addressData && addressData.f_special === '1'"
+        :disable-building="true"
+        :disable-floor="true"
+        @confirm="onAddressConfirm"
+        @cancel="onAddressCancel">
+      </user-address>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+  </modal>
+</template>
+
+<script>
+/**
+ *用户档案相关信息组件
+ */
+
+export default {
+  ready () {
+    console.log('看看userinfo里面接收的data数据：', this.data)
+    this.$getConfig(this, 'getUserInfo')
+  },
+  title: '客户基本信息',
+  data () {
+    return {
+      dafault: {
+        f_user_name: '***',
+        f_userinfo_code: '********',
+        f_people_num: '**',
+        f_idnumber: '****',
+        f_user_phone: '************',
+        f_address: '*****',
+        f_user_type: '***',
+        f_open_date: '****年**月**日',
+        f_input_date: '****年**月**日',
+        f_hand_date: '****年**月**日',
+        f_rent_phone: '************',
+        f_comments: '**',
+        f_user_state: '****',
+        f_contract_id: '*************'
+      },
+      config: {
+        f_user_name: false,
+        f_userinfo_code: false,
+        f_people_num: false,
+        f_idnumber: false,
+        f_user_phone: false,
+        f_address: false,
+        f_user_type: false,
+        f_open_date: false,
+        f_input_date: false,
+        f_comments: false,
+        f_user_state: false
+      },
+      model: null,
+      showselectncuserinfo: false,
+      showselectncuserrent: false,
+      showselectncuseridnumber: false,
+      newuserphone: '',
+      newrentphone: '',
+      newuseridnumber: '',
+      reason_show: false,
+      new_reason: '',
+      showAddressModal: false,
+      addressData: null,
+      f_filialeids: ''
+    }
+  },
+  props: ['data', 'warninginfo'],
+  methods: {
+    async modifyUserSpecialReson () {
+      let param = {
+        new_reason: this.new_reason,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_comments = this.new_reason
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyUserIdNumberReason () {
+      let param = {
+        new_idnumber: this.newuseridnumber,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_idnumber = this.newuseridnumber
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    change_reason () {
+      // 修正客户电话
+      this.reason_show = true
+      this.new_reason = ''
+    },
+    dealmsg (val) {
+      if (val.f_userinfo_code !== '********') {
+        this.$dispatch('deal-msg', val)
+      }
+    },
+    changeuserphone () {
+      // 修正客户电话
+      this.showselectncuserinfo = true
+      this.newuserphone = ''
+    },
+    async changeuseraddress () {
+      // 先查询用户地址信息
+      let req = await this.$resetpost('api/af-revenue/sql/address_getAddress', {
+        data: {
+          items: '*',
+          tablename: 't_user_address',
+          orderitem: 'id desc',
+          condition: ` 1=1 and a.f_filialeid = '${this.data.f_filialeid}' and a.f_userinfo_id = '${this.data.f_userinfo_id}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+
+      if(req.data && req.data.length > 0) {
+        let addressInfo = req.data[0]
+        // 修改客户地址
+        this.addressData = {
+          id: addressInfo.id,
+          f_pcd_id: addressInfo.f_pcd_id,
+          f_street_id: addressInfo.f_street_id,
+          f_residential_area_id: addressInfo.f_residential_area_id,
+          f_address: addressInfo.f_address,
+          f_building: addressInfo.f_building,
+          f_unit: addressInfo.f_unit,
+          f_room: addressInfo.f_room,
+          f_slice_area: addressInfo.f_slice_area,
+          f_address_state: addressInfo.f_address_state,
+          f_comments: addressInfo.f_comments,
+          f_comments1: addressInfo.f_comments1,
+          f_userinfo_id: this.data.f_userinfo_id,
+          f_user_id: this.data.f_user_id,
+          f_filialeid: this.data.f_filialeid,
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          f_special: addressInfo.f_special,
+          f_floor: '',
+          f_floor_suffix: ''
+        }
+        this.f_filialeids = this.data.f_filialeid
+        this.showAddressModal = true
+      } else {
+        this.$showAlert('未找到用户地址信息', 'warning', 2000)
+      }
+    },
+    changeuseridnumber () {
+      // 修正客户证件号码
+      this.showselectncuseridnumber = true
+      this.newuseridnumber = ''
+    },
+    changerentphone () {
+      // 修正客户电话
+      this.showselectncuserrent = true
+      this.newrentphone = ''
+    },
+    async modifyUser () {
+      let param = {
+        new_userphone: this.newuserphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_user_phone = this.newuserphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyUserRent () {
+      let param = {
+        new_rentphone: this.newrentphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_rent_phone = this.newrentphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    close () {
+      this.showselectncuserinfo = false
+      this.showselectncuserrent = false
+      this.reason_show = false
+      this.showselectncuseridnumber = false
+      this.newuserphone = ''
+      this.new_reason = ''
+      this.new_idnumber = ''
+    },
+    async onAddressConfirm() {
+      // 重新查询用户地址信息
+      let req = await this.$resetpost('api/af-revenue/sql/address_getAddress', {
+        data: {
+          items: '*',
+          tablename: 't_user_address',
+          orderitem: 'id desc',
+          condition: ` 1=1 and a.f_filialeid = '${this.data.f_filialeid}' and a.f_userinfo_id = '${this.data.f_userinfo_id}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+
+      if(req.data && req.data.length > 0) {
+        // 更新本地显示的地址
+        this.data.f_address = req.data[0].f_address
+      }
+
+      this.showAddressModal = false
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+    },
+    onAddressCancel() {
+      this.showAddressModal = false
+    }
+  },
+  watch: {
+    'data' (val) {
+    }
+  }
+}
+</script>
+<style scoped>
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+.highlight {
+  color: brown;
+}
+
+</style>

package/src/filiale/kelai/sale.js

@@ -48,5 +48,6 @@ export default function () {
   Vue.component('garbage-add', (resolve) => { require(['./GarbageAdd'], resolve) })
   // 补费扣费
   Vue.component('deduction-manage', (resolve) => { require(['./FeeDeduction/deductionManage'], resolve) })
-
+  // 当前选择用户的用户基本信息
+  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
 }