sale-client 3.6.246 → 3.6.247

package/package.json

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

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -61,17 +61,17 @@
               <!--                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"-->
               <!--                       condition="f_user_id='{}'" placeholder='表编号'>-->
               <!--              </div>-->
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">抄表状态</label>
-                <v-select :value.sync="model.f_audit_state"
-                          class="select_list select"
-                          v-model="model.f_audit_state"
-                          style="width: 60%"
-                          condition="f_meter_state = '{}'"
-                          :options='$parent.$parent.auditState' placeholder='请选择'
-                          close-on-select v-el:cc>
-                </v-select>
-              </div>
+<!--              <div class="col-sm-2 form-group">-->
+<!--                <label class="font_normal_body">抄表状态</label>-->
+<!--                <v-select :value.sync="model.f_audit_state"-->
+<!--                          class="select_list select"-->
+<!--                          v-model="model.f_audit_state"-->
+<!--                          style="width: 60%"-->
+<!--                          condition="f_meter_state = '{}'"-->
+<!--                          :options='$parent.$parent.auditState' placeholder='请选择'-->
+<!--                          close-on-select v-el:cc>-->
+<!--                </v-select>-->
+<!--              </div>-->
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">表&emsp;&emsp;号</label>
                 <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"

package/src/filiale/lixianV3/iotHand.vue

@@ -100,19 +100,18 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">抄表单状态</label>
                 <v-select :value.sync="model.f_meter_state" v-model='model.f_meter_state'
-                          style="width:60%"
+                          style="width:60%" :value-single="true"
                           :options='$parent.$parent.meterstates' placeholder='抄表单状态'
                           close-on-select
-                          condition="f_meter_state = '{}'"></v-select>
+                       ></v-select>
               </div>
-              <div class="col-sm-2 form-group">
+              <div class="col-sm-2 form-group" >
                 <label class="font_normal_body">抄表时间</label>
                 <datepicker placeholder="开始日期"
                             style="width:60%"
                             class="datepicker"
-                            v-model="model.startDate"
-                            condition="f_last_input_date >='{} 00:00:00'"
-                            :value.sync="model.startDate"
+                            v-model="model.startDate1"
+                            :value.sync="model.startDate1"
                             :format="'yyyy-MM-dd'"
                 ></datepicker>
               </div>
@@ -120,12 +119,13 @@
                 <label class="font_normal_body">抄表时间</label>
                 <datepicker placeholder="结束日期"
                             style="width:60%"
-                            v-model="model.endDate"
-                            :value.sync="model.endDate"
-                            condition="f_last_input_date <='{} 23:59:59'"
+                            v-model="model.endDate1"
+                            :value.sync="model.endDate1"
+
                             :format="'yyyy-MM-dd'"
                 ></datepicker>
               </div>
+
             </div>
           </div>
         </criteria>
@@ -148,6 +148,9 @@
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </nobr>
               </th>
+              <th>
+                <nobr>用户电话</nobr>
+              </th>
               <th>
                 <nobr>身份证号</nobr>
               </th>
@@ -179,6 +182,7 @@
             <td style="text-align: center;">{{ $index + 1 }}</td>
             <td>{{ row.f_userinfo_code }}</td>
             <td>{{ row.f_user_name }}&nbsp;&nbsp;{{ row.f_address }}</td>
+            <td>{{ row.f_user_phone }}</td>
             <td>{{ row.f_idnumber }}</td>
             <td>{{ row.f_card_id }}</td>
             <td>{{ row.f_meternumber }}</td>
@@ -349,8 +353,27 @@ export default {
         // 查询多个小区时条件
         args.condition += ` and f_residential_area in  ( ${str} )`
       }
-
-      this.model.search(args.condition, this.model)
+      this.condition2 = args.condition
+      if (this.$refs.paged.$refs.criteria.model.f_meter_state === '未抄表') {
+        if (this.$refs.paged.$refs.criteria.model.startDate1 && this.$refs.paged.$refs.criteria.model.endDate1) {
+          this.condition2 = this.condition2 + ` and (f_last_input_date<'${this.$refs.paged.$refs.criteria.model.startDate1}' or f_last_input_date>'${this.$refs.paged.$refs.criteria.model.endDate1}')`
+        } else {
+          if (this.$refs.paged.$refs.criteria.model.startDate1) {
+            this.condition2 = this.condition2 + ` and f_last_input_date<'${this.$refs.paged.$refs.criteria.model.startDate1}'`
+          }
+          if (this.$refs.paged.$refs.criteria.model.endDate1) {
+            this.condition2 = this.condition2 + ` and f_last_input_date>'${this.$refs.paged.$refs.criteria.model.endDate1}'`
+          }
+        }
+      } else {
+        if (this.$refs.paged.$refs.criteria.model.startDate1) {
+          this.condition2 = this.condition2 + ` and f_last_input_date>='${this.$refs.paged.$refs.criteria.model.startDate1}'`
+        }
+        if (this.$refs.paged.$refs.criteria.model.endDate1) {
+          this.condition2 = this.condition2 + ` and f_last_input_date<='${this.$refs.paged.$refs.criteria.model.endDate1}'`
+        }
+      }
+      this.model.search(this.condition2, this.model)
     },
     reflash() {
       this.$refs.paged.$refs.criteria.model.f_orgid = `${Vue.$login.f.orgid}`

package/src/filiale/meihekou/CardHand.vue

@@ -77,7 +77,7 @@
                         <div class="col-sm-2 form-group">
                           <label  class="font_normal_body">用户姓名</label>
                           <input style="width:60%"  type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
-                                  condition="f_user_name = '{}'">
+                                  condition="f_user_name like '%{}%'">
                         </div>
                         <div class="col-sm-2 form-group">
                             <label  class="font_normal_body">用户地址</label>

package/src/filiale/shangluo/Userinfo.vue

@@ -0,0 +1,275 @@
+<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 &&  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">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all">{{ data ? data.f_idnumber : dafault.f_idnumber }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_phone ? 'highlight' : '']">
+          <label class="col-sm-5">客户电话</label>
+          <span class="col-sm-7">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+            <span v-if="data && data.f_user_phone" @click.stop="changeuserphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
+          </span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">备用电话</label>
+          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</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:darkred">备注信息</label>
+          <span class="col-sm-7" style="color:darkred">{{ 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">客户地址</label>
+          <span class="col-sm-7">{{ data ? data.f_address : dafault.f_address }}</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="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>
+
+      </div>
+    </div>
+  </partial-view>
+</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,
+      newuserphone: '',
+      reason_show: false,
+      new_reason: ''
+    }
+  },
+  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()
+    },
+    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 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()
+    },
+    close () {
+      this.showselectncuserinfo = false
+      this.reason_show = false
+      this.newuserphone = ''
+      this.new_reason = ''
+    }
+  },
+  watch: {
+    'data' (val) {
+    }
+  }
+}
+</script>
+<style scoped>
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+.highlight {
+  color: brown;
+}
+
+</style>

package/src/filiale/shangluo/sale.js

@@ -12,4 +12,6 @@ export default function () {
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
   // 限购配置
   Vue.component('limit-gas', (resolve) => { require(['./LimitGas'], resolve) })
+  // 当前选择用户的用户基本信息
+  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
 }