sale-client 3.5.134 → 3.5.135

package/package.json

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

package/src/filiale/kelai/ChargeManage.vue

@@ -0,0 +1,240 @@
+<template>
+  <div id="unit" class="flex-row three" v-show="listpage">
+    <div class="binary-left" style="overflow: scroll;width:15%" >
+      <mulitinfo :warninginfo="warningInfo" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></mulitinfo>
+    </div>
+    <div class="binary-right" style="width:68%;overflow-y: scroll" >
+      <div :style="{height:(row?'auto':'100%')}">
+        <!--<div class="auto" v-if="sustainMoney != null">-->
+          <!--<h2 style="margin-top: 10px">当前连续收款金额: {{sustainMoney}}</h2>-->
+        <!--</div>-->
+        <div>
+          <charge-list :row="row" @select-oper="showWork" @dblclick="toBusiness" @deal-msg="dealMsg"
+                       v-ref:list></charge-list>
+
+          <div class="auto" style="margin-top: 1%;" v-if="row">
+            <charge-oper :data.sync="row" :card-info="cardInfo"></charge-oper>
+          </div>
+      </div>
+      </div>
+    </div>
+    <div class="binary-right" style="width:22%" >
+      <ul class="nav nav-pills span" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;" class="nav nav-tabs" >
+        <li ><a :style="selectFiled == '其他信息'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '其他信息','tel_f_size':selectFiled != '其他信息'}" href="#" @click="setField('其他信息')">其他信息</a></li>
+        <li ><a :style="selectFiled == '历史操作'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '历史操作','tel_f_size':selectFiled != '历史操作'}" href="#" @click="setField('历史操作')">历史操作</a></li>
+        <li v-if="row ?row.f_meter_type=='机表' : false"><a :style="selectFiled == '历史抄表'?'color:#333333!important;':'color:#666666!important;'" :class="{'tel_voiceActive':selectFiled == '历史抄表','tel_f_size':selectFiled != '历史抄表'}" href="#" @click="setField('历史抄表')">历史抄表</a></li>
+      </ul>
+      <div class="tab-content span" style="overflow-y: auto">
+        <otherinfo v-show="worktype === '其他信息'" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></otherinfo>
+        <card-list v-show="worktype === '历史操作'" :btns="operatebtn" :f_orgid="f_orgid" :userinfoid="row ? row.f_userinfo_code : ''" @list-select-oper="recordCancel"
+                   v-ref:card></card-list>
+        <hand-list  v-if="worktype === '历史抄表'" :f_userfiles_id="row ? row.f_userfiles_id : ''" v-ref:hand></hand-list>
+      </div>
+
+    </div>
+
+  </div>
+  <div v-if="!listpage">
+    <user-info-detail-manage-new :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
+  <div v-if="showModal">
+    <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>
+  </div>
+</template>
+<script>
+  import ChargeOper from './ChargeOper'
+  import {HttpResetClass} from 'vue-client'
+
+export default {
+    title: '收费(综合)',
+    components: { ChargeOper },
+    data () {
+      return {
+        sustainMoney: null,
+        // 页面开关
+        listpage: true,
+        f_orgid: '',
+        row: null,
+        cardInfo: null,
+        warningInfo: null,
+        modalrow: null,
+        showModal: false,
+        rowData: {},
+        dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+        show: [true],
+        selectFiled: '其他信息',
+        worktype: '其他信息'
+      }
+    },
+    ready () {
+      this.setsustainMoney()
+    },
+    methods: {
+      setsustainMoney () {
+        this.sustainMoney = window.localStorage.getItem('sustainMoney')
+      },
+      setField (type) {
+        this.selectFiled = type
+        this.worktype = type
+      },
+      async toBusiness (obj) {
+        console.log('双击列表的时候传进来的数据：', obj)
+        if (!(obj instanceof Event)) {
+        // 对此数据进行验证
+          if (await this.validateRow(obj)) {
+          // 获取未写卡或者写卡失败记录
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            console.log('获取未写卡记录', getUnWriteSell)
+            if (getUnWriteSell.data.length > 1) {
+              this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
+            } else {
+              this.row = obj
+              this.row.unWriteSell = getUnWriteSell.data
+              this.cardInfo = this.$refs.list.cardInfo
+              this.$refs.list.criteriaShow = false
+            // 将列表只显示该条数据
+              this.$refs.list.refreshRow(obj)
+            }
+          }
+        }
+      },
+      close () {
+        this.showModal = false
+        this.warningInfo = null
+        this.clean()
+        this.$refs.list.search()
+        // this.$refs.card.search()
+      },
+      async validateRow (obj) {
+        console.log('查看传进来的参数:', obj)
+        this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
+          {data: {
+            f_userfiles_id: obj.f_userfiles_id,
+            f_userinfo_code: obj.f_userinfo_code,
+            f_userinfo_id: obj.f_userinfo_id
+          }
+          }
+          , {resolveMsg: '', rejectMsg: '获取提示失败'})
+        if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
+          this.modalrow = obj
+          this.showModal = true
+          return false
+        } else {
+          return true
+        }
+      },
+      clean () {
+        this.row = null
+        this.cardInfo = null
+      },
+      clearCondition () {
+        Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.list.$refs.paged.$refs.cri.model[key] = ''
+        })
+        // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
+        // this.$set('$refs.list.$refs.paged.$refs.grid.model.rows', [])
+      },
+      dealMsg (obj) {
+        console.log('==================obj', obj)
+        this.listpage = false
+        this.rowData = obj
+      },
+      cancel (obj) {
+        this.listpage = true
+      },
+      modalsuccess (obj) {
+        this.showModal = false
+        this.$refs.list.criteriaShow = false
+        this.row = obj
+        this.cardInfo = this.$refs.list.cardInfo
+        // 将列表只显示该条数据
+        this.$refs.list.refreshRow(obj)
+      },
+      async serRow (obj) {
+        let newdata = await this.$resetpost('rs/sql/sale_getUser', {
+          data: {condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
+        }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
+        this.toBusiness(newdata.data[0])
+        // this.$refs.list.search()
+      }
+    },
+    events: {
+      'error' (name, row, res) {
+        this.clean()
+      },
+      'row' (val) {
+
+      },
+      'success' (name, row, res) {
+        this.setsustainMoney()
+        // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
+        if (name === '机表收费确认') {
+          this.serRow(row)
+          return
+        }
+        console.log('成功事件')
+        this.clean()
+        this.$refs.list.search()
+        // this.clearCondition()
+        // this.$refs.card.search()
+        // this.$refs.info.$refs.recordstoryinfo.getdata()
+      },
+      'clean' (row) {
+        // this.$refs.list.singleRefresh(row)
+        this.clean()
+      },
+      'refresh' () {
+        this.setsustainMoney()
+        this.clean()
+        this.clearCondition()
+        this.$refs.list.searchNoData()
+        this.$refs.card.search()
+      },
+      'resflushvalue' () {
+        this.$refs.info.$refs.valueaddinfo.reflush()
+      },
+      'refreshrow' (val) {
+        console.log(val)
+        this.row = val
+        this.$refs.list.refreshRow(val)
+        // this.$refs.card.search()
+      },
+      'cancelclean' (row) {
+        this.clean()
+        this.$refs.list.searchNoData()
+        // this.$refs.card.search()
+      }
+    },
+    watch: {
+      'row' () {
+        // this.$refs.tab.$el.click()
+      }
+    }
+  }
+</script>
+<style>
+  .basic-main {
+    width: 79%;
+  }
+  .tel_voiceActive{
+    font-family: PingFang-SC-Bold;
+    font-size: 16px;
+    font-weight: normal!important;
+    font-stretch: normal!important;
+    line-height: 18px;
+    letter-spacing: 0px;
+    color: #333333!important;
+    border-bottom: 3px solid #599fe5;
+    padding:10px 10px!important;
+  }
+  .tel_f_size{
+    font-family: PingFang-SC-Medium;
+    font-size: 16px;
+    font-weight: normal;
+    font-stretch: normal;
+    line-height: 18px;
+    letter-spacing: 0px;
+    color: #666666!important;
+    padding:10px 10px!important;
+  }
+</style>

package/src/filiale/kelai/ChargeOper.vue

@@ -0,0 +1,250 @@
+<template>
+    <div class="form-inline" style="height: auto">
+      <div class="form-group" v-for="btn in operBtns">
+        <button :id="btn.name" type="button" :style="btn.name=='其他欠费' ?'color:red':'color:black'" :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)" :disabled="noButton" ><span :style="btn.name=='其他欠费' ?'color:red':'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) {
+    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){
+          await self.$showMessage(`用户${self.data.f_userfiles_id}有垃圾费需要缴费`, ['confirm', 'cancel'])
+        }
+        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{
+            self.temp.push(getBtns[i])
+          }
+          console.log(self.temp[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.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/kelai/meterinfodetail.vue

@@ -42,8 +42,8 @@
           <span class = "col-sm-7">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >气表表号</label>
-          <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
+          <label class = "col-sm-5 " style="color:brown;">气表表号</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
           <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>

package/src/filiale/kelai/sale.js

@@ -14,6 +14,8 @@ let specialComp = {
   // 物联网表收费
   'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
   // 当前选择用户的表具基本信息
-  'user-meterinfodetail': (resolve) => { require(['./meterinfodetail'], resolve) }
+  'user-meterinfodetail': (resolve) => { require(['./meterinfodetail'], resolve) },
+
+  'charge-manage': (resolve) => { require(['./ChargeManage'], resolve) }
 }
 exports.specialComp = specialComp