sale-client 3.5.286 → 3.5.287

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [localUrl, serverRul] = ['http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/shanxian/components/FilesManage/UserEssentialInfoTest.vue

@@ -116,7 +116,7 @@
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
-                      :options='costtype' placeholder='付款类型'   style="width: 65%"       close-on-select></v-select>
+                      :options='costtype' placeholder='付款类型'   style="width: 65%" close-on-select></v-select>
           </div>
         </div>
         <div class="row">
@@ -160,6 +160,30 @@
                    placeholder="档案编号">
           </div>
         </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group" :class="[$v.agent_name.identityCardValid ? 'has-error' : '']"
+               v-if="baseinfo.base.f_user_nature !== '民用'">
+            <label for="f_agent_name" class="font_normal_body">*代理姓名</label>
+            <input type="text" v-model="baseinfo.base.f_agent_name" class="input_search" style="width:60%"
+                   v-validate:agent_name='{required: true }' placeholder="代理人姓名">
+          </div>
+          <div style="" class="col-sm-4 form-group" v-if="baseinfo.base.f_user_nature === '民用'">
+            <label for="f_agent_name" class="font_normal_body">代理姓名</label>
+            <input type="text" v-model="baseinfo.base.f_agent_name" class="input_search" style="width:60%"
+                   placeholder="代理人姓名">
+          </div>
+          <div style="" class="col-sm-4 form-group" :class="[$v.agent_phone.identityCardValid ? 'has-error' : '']"
+               v-if="baseinfo.base.f_user_nature !== '民用'">
+            <label for="f_agent_phone" class="font_normal_body">*代理电话</label>
+            <input type="text" v-model="baseinfo.base.f_agent_phone" class="input_search" style="width:60%"
+                   v-validate:agent_phone='{required: true }' placeholder="代理人电话">
+          </div>
+          <div style="" class="col-sm-4 form-group" v-if="baseinfo.base.f_user_nature === '民用'">
+            <label for="f_agent_phone" class="font_normal_body">代理电话</label>
+            <input type="text" v-model="baseinfo.base.f_agent_phone" class="input_search" style="width:60%"
+                   placeholder="代理人电话">
+          </div>
+        </div>
         <div class="row">
           <div style="" class="col-sm-12 form-group">
             <label for="f_paper_account" class="font_normal_body ">&ensp;备&emsp;&emsp;注</label>

package/src/filiale/shanxian/components/charge/ChargeOper.vue

@@ -0,0 +1,263 @@
+<template>
+  <div class="form-inline" style="height: auto">
+    <div class="form-group" v-for="btn in operBtns">
+      <button :id="btn.name" type="button"
+              :style="['其他欠费','调价补差'].includes(btn.name) ?'color:#CA2C16':'color:black'"
+              :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)"
+              :disabled="noButton"><span
+        :style="['其他欠费','调价补差'].includes(btn.name) ?'color:#CA2C16':'color:black'">{{ btn.name }}</span>
+      </button>
+
+    </div>
+  </div>
+  <div v-show="isBusiness" style="height: auto" class="select-overspread">
+    <route v-ref:route></route>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+let getNewmetermsg = async function (self, row) {
+  self.cardInfo = undefined
+  if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
+    // 获取用户信息
+    let getUser = await self.$resetpost('rs/sql/sale_getUser', {
+      data: {
+        condition: `u.f_userfiles_id='${row.f_userfiles_id}' `,
+        orderitem: `u.f_userfiles_id Desc`
+      }
+    }, {resolveMsg: '读卡新的用户成功', rejectMsg: '读卡新的用户失败'})
+    if (getUser.data.length > 0) {
+      await self.$showAlert('换表成功', 'success', 200)
+      self.data = getUser.data[0]
+    }
+  }
+}
+let getBtnsGen = async function (self) {
+  let http = new HttpResetClass()
+  let param = {
+    f_userfiles_id: self.data.f_userfiles_id
+  }
+  if (self.cardInfo) {
+    param.cardInfo = self.cardInfo
+  }
+  let res = await http.load('POST', 'rs/logic/getOperBtns', {
+    data: param
+  }, {
+    resolveMsg: null,
+    rejectMsg: '获取业务按钮失败!!'
+  })
+  let getBtns = res.data
+  console.log('获取的业务按钮', getBtns)
+  console.log('有没有用户信息', self.data)
+  if (self.$login.r.length === 0) {
+    self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
+  } else {
+    self.temp = []
+    for (let i = 0; i < getBtns.length; i++) {
+      // 不需要权限的按钮
+      let noInclude = getBtns[i].name === '垃圾费收费'
+      if (noInclude || self.$login.r.includes(getBtns[i].name)) {
+        // 进行权限验证
+        if (getBtns[i].name === '换表&清零') {
+          self.temp.push({
+            name: '换表',
+            value: getBtns[i].value
+          })
+          self.temp.push({
+            name: '清零',
+            value: {
+              'weight': getBtns[i].value.weight,
+              'routeName': 'reset-meter'
+            }
+          })
+        } else {
+          if(getBtns[i].name == '物联网表收费' || getBtns[i].name == '卡表收费'){
+            getBtns[i].name = '燃气充值'
+          }
+          self.temp.push(getBtns[i])
+        }
+        console.log(i)
+        console.log(getBtns[i])
+      }
+    }
+    // 如果有未写卡记录，添加线下写卡按钮
+    if (self.data.unWriteSell) {
+      if (self.data.unWriteSell.length > 0) {
+        self.temp.push({
+          name: '线下写卡',
+          value: {
+            'weight': 0,
+            'routeName': 'un-write-card-center'
+          }
+        })
+      }
+    }
+    if (self.data.f_user_nature === '单位') {
+      self.temp.push({
+        name: '维管收费',
+        value: {
+          'weight': 5,
+          'routeName': 'repair-charge'
+        }
+      })
+    }
+    if (self.data.f_meter_type === '物联网表') {
+      if (self.data.f_hascard === '是') {
+        if (self.data.f_whether_hairpin === '未发') {
+          if (self.data.f_share_times !== '' && self.data.f_share_times === '是' && self.data.f_times > 0) {
+            self.temp.push({
+              name: '补卡',
+              value: {
+                'weight': 2,
+                'routeName': 'replace-card-manage'
+              }
+            })
+          } else {
+          }
+        }
+      }
+    }
+    // 如果卡上有气，添加购气撤销按钮
+    if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
+      self.temp.push({
+        name: '购气撤销',
+        value: {
+          'weight': 0,
+          'routeName': 'card-meter-charge-cancel'
+        }
+      })
+    }
+    /*      // 如果是预备户,删除发卡售气按钮
+          if (self.data.f_user_state == '预备') {
+            self.temp.splice(self.temp.findIndex(item => item.name === '发卡售气'), 1)
+          } */
+
+    // 根据权重将业务按钮排序
+    self.operBtns = self.temp.sort((a, b) => {
+      return a.value.weight - b.value.weight
+    })
+
+    // 当有调价补差时,只展示调价补差按钮
+    let adjustSenders = self.operBtns.find((row) => {
+      return row.name == '调价补差'
+    })
+    if (adjustSenders) {
+      self.operBtns = []
+      self.operBtns.push(adjustSenders)
+    }
+
+    if (self.operBtns.length > 0) {
+      self.isBusiness = true
+      self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo})
+      self.styleChange(self.operBtns[0])
+    }
+  }
+}
+
+export default {
+  title: '业务操作',
+  data() {
+    return {
+      operBtns: [],
+      isBusiness: false,
+      noButton: false // 业务请求时禁止按钮点击
+    }
+  },
+  props: ['data', 'cardInfo'],
+  ready() {
+    getBtnsGen(this)
+    console.log('data,cardInfo', this.data, this.cardInfo)
+
+  },
+  methods: {
+    business(btn) {
+      // // 处理按钮样式
+      // this.styleChange(btn.name)
+      // this.isBusiness = true
+      // this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+      if (this.$refs.route.cards.length > 0) {
+        if (this.$refs.route.cards[0].title == '增值服务管理') {
+          this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?', ['confirm', 'cancel']).then(res => {
+            if (res == 'cancel') {
+              return;
+            } else {
+              // 处理按钮样式
+              this.styleChange(btn.name)
+              this.isBusiness = true
+              this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+            }
+          })
+        } else {
+          // 处理按钮样式
+          this.styleChange(btn.name)
+          this.isBusiness = true
+          this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+        }
+      }
+    },
+
+    styleChange(name) {
+      this.operBtns.forEach((res) => {
+        if (res.name === name) {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
+            document.getElementById(res.name).style.color = 'white'
+          }
+        } else {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = 'white'
+            document.getElementById(res.name).style.color = 'black'
+          }
+        }
+      })
+    }
+  },
+  watch: {
+    'data'() {
+      getBtnsGen(this)
+    }
+  },
+  events: {
+    'no-button'() {
+      this.noButton = true
+    },
+    'has-button'() {
+      this.noButton = false
+    },
+    'get-new-row'(row) {
+      console.log('xxxxxx', row)
+      // 发生换表成功
+      getNewmetermsg(this, row)
+    },
+    'button-specifies'(buttonObj, data) {
+      console.log('指定按钮。。', buttonObj)
+      // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}
+      if (buttonObj) {
+        this.styleChange(buttonObj.name)
+        this.$refs.route.init(buttonObj.value, {row: data})
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.btn-click {
+  background-color: #6aa6e2;
+  border-radius: 5px;
+  color: white;
+  /*border-color: black;*/
+  border: solid 1px #c7c7c7;
+}
+
+.btn-un-click {
+  background-color: white;
+  border-radius: 5px;
+  color: black;
+  /*border-color: black;*/
+  border: solid 1px #c7c7c7;
+}
+</style>

package/src/filiale/shanxian/components/revenue/InsuranceAdd.vue

@@ -123,23 +123,23 @@
               v-ref:f_state>
             </v-select>
           </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_money.required ? 'has-error' : '']">
-            <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保费金额</label>
-            <input type="number" v-model="model.f_money" class="input_search" style="width:60%"
-                   v-validate:f_money='{required: true, dctest: [0, ">=" ] }' placeholder="保费金额">
-          </div>
-          <div class="col-sm-6  form-group" :class="[$v.payment.required ? 'has-error select-error' : '']">
-            <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;收款方式</label>
-            <input type="text" v-show="false" v-model="$refs.payment.selectedItems" v-validate:payment='{required: true }'>
-            <v-select v-model="model.f_payment"
-                      style="width:60%"
-                      placeholder='请选择'
-                      :value.sync="model.f_payment"
-                      :options='paytype'
-                      v-ref:payment value-single
-                      close-on-select clear-button>
-            </v-select>
-          </div>
+          <!--<div class="col-sm-6  form-group" :class="[$v.f_money.required ? 'has-error' : '']">-->
+            <!--<label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保费金额</label>-->
+            <!--<input type="number" v-model="model.f_money" class="input_search" style="width:60%"-->
+                   <!--v-validate:f_money='{required: true, dctest: [0, ">=" ] }' placeholder="保费金额">-->
+          <!--</div>-->
+          <!--<div class="col-sm-6  form-group" :class="[$v.payment.required ? 'has-error select-error' : '']">-->
+            <!--<label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;收款方式</label>-->
+            <!--<input type="text" v-show="false" v-model="$refs.payment.selectedItems" v-validate:payment='{required: true }'>-->
+            <!--<v-select v-model="model.f_payment"-->
+                      <!--style="width:60%"-->
+                      <!--placeholder='请选择'-->
+                      <!--:value.sync="model.f_payment"-->
+                      <!--:options='paytype'-->
+                      <!--v-ref:payment value-single-->
+                      <!--close-on-select clear-button>-->
+            <!--</v-select>-->
+          <!--</div>-->
           <div class="col-sm-6  form-group">
             <label class="font_normal_body">&emsp;&emsp;&emsp;确认书编号</label>
             <input type="text" v-model="model.f_ok_number"  style="width: 60%"

package/src/filiale/shanxian/components/revenue/InsuranceChargesDetails.vue

@@ -0,0 +1,256 @@
+<<template>
+  <div :class="{'basic-main':!showItem,'binary-left':showItem}" style="height:98%;" >
+    <div style="flex: 1.5" class="flex">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div novalidate class="form-inline auto" novalidate partial>
+              <div class="row">
+                  <div class="col-sm-2  form-group">
+                    <label class="font_normal_body" for="f_userinfo_code">客户编号</label>
+                    <input id="f_userinfo_code" type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_code"
+                           condition="f_userinfo_code = '{}'" placeholder='请输入要查询的客户编号'>
+                  </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">客户姓名</label>
+                  <input id="f_user_name" type="text" class="input_search" style="width: 60%" 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" for="f_insurance_type">险&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种</label>
+                  <v-select id="f_insurance_type"
+                            v-model="model.f_insurance_type"
+                            placeholder='请选择'
+                            condition="f_insurance_type ='{}'"
+                            :value.sync="model.f_insurance_type"
+                            :options='$parent.$parent.insuranceType'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_days">到期天数内</label>
+                  <input id="f_days" type="text" class="input_search" style="width: 60%" v-model="model.f_days"
+                         condition="f_days < {}" placeholder='请输入天数到期天数之内'>
+                </div>
+                  <div style="float: right">
+                    <button class="button_search" @click="search()">查 询</button>
+                    <div class="button_spacing"  style="float:right;"
+                         :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                         @click="$parent.$parent.hidden()"></div>
+                  </div>
+              </div>
+              <div class="row"  v-show="$parent.$parent.criteriaShow" >
+                <res-select-group :initres="$parent.$parent.initres"  :show-component="['company','department']" @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" class="input_search" style="width: 60%" v-model="model.f_salecount"
+                         condition="f_salecount = '{}'" placeholder='购买年限'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" for="f_state">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态</label>
+                  <v-select id="f_state"
+                            v-model="model.f_state"
+                            placeholder='请选择'
+                            condition="f_state ='{}'"
+                            :value.sync="model.f_state"
+                            :options='$parent.$parent.state'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+              </div>
+            </div>
+
+          </criteria>
+          <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>序号</nobr>
+                </th>
+                <th>
+                  <nobr>客户编号</nobr>
+                </th>
+                <th>
+                  <nobr>客户姓名</nobr>
+                </th>
+                <th>
+                  <nobr>客户地址</nobr>
+                </th>
+                <th>
+                  <nobr>身份证号</nobr>
+                </th>
+                <th>
+                  <nobr>电话</nobr>
+                </th>
+                <th>
+                  <nobr>费用类型</nobr>
+                </th>
+                <th>
+                  <nobr>购买日期</nobr>
+                </th>
+                <th>
+                  <nobr>到期日期</nobr>
+                </th>
+                <th>
+                  <nobr>保费开始日期</nobr>
+                </th>
+                <th>
+                  <nobr>上期保费截至日期</nobr>
+                </th>
+                <th>
+                  <nobr>到期剩余天数</nobr>
+                </th>
+                <!--<th>-->
+                  <!--<nobr>金额</nobr>-->
+                <!--</th>-->
+                <!--<th>-->
+                  <!--<nobr>收款方式</nobr>-->
+                <!--</th>-->
+                <th>
+                  <nobr>状态</nobr>
+                </th>
+                <th>
+                  <nobr>缴费时间</nobr>
+                </th>
+                <th>
+                  <nobr>确认书编号</nobr>
+                </th>
+                <th>
+                  <nobr>险种</nobr>
+                </th>
+                <th>
+                  <nobr>购买年限</nobr>
+                </th>
+                <th>
+                  <nobr>备注信息</nobr>
+                </th>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{$index + 1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>
+                  {{row.f_userinfo_code}}
+                </nobr>
+              </td>
+              <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_idnumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_fee_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_buy_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_expiration_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_shengxiao_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_insexpiration_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_days > 0 ? row.f_days : '已到期'}}</nobr>
+              </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_money}}</nobr>-->
+              <!--</td>-->
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_payment}}</nobr>-->
+              <!--</td>-->
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_ok_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_insurance_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_salecount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    name: 'InsuranceChargesDetails',
+    title: '保险收费明细',
+    data () {
+      return {
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        f_state: '',
+        state: this.$appdata.getParam('保险状态') ? this.$appdata.getParam('保险状态') : [],
+        f_insurance_type: '',
+        insuranceType: this.$appdata.getParam('险种') ? this.$appdata.getParam('险种') : [],
+        orgCondtionStr: '',
+        base: {},
+        model: new PagedList('rs/sql/getInsuranceChargesList', 20),
+        // 控制查询条件显示
+        criteriaShow: false,
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_filialeid: this.$login.f.orgid,
+        percent: 0
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes (obj) {
+        this.orgCondtionStr = obj
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      getorg (val) {
+        this.f_filialeid = val[0]
+      },
+      selfSearch (args) {
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+        this.model.search(args.condition, args.model)
+      }
+    },
+    computed: {}
+  }
+</script>
+<style>
+</style>

package/src/filiale/shanxian/components/revenue/InsuranceList.vue

@@ -83,9 +83,9 @@
                 <th>
                   <nobr>截止日期</nobr>
                 </th>
-                <th>
-                  <nobr>累计保费充值金额</nobr>
-                </th>
+                <!--<th>-->
+                  <!--<nobr>累计保费充值金额</nobr>-->
+                <!--</th>-->
             </template>
             <template partial='body'>
               <td style="text-align: center;">
@@ -108,9 +108,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_ins_stop_date}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_total_ins_charge}}</nobr>
-              </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_total_ins_charge}}</nobr>-->
+              <!--</td>-->
             </template>
           </data-grid>
         </criteria-paged>