sale-client 3.6.356 → 3.6.357

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://139.155.48.184:8401/', 'http://139.155.48.184:8401/', 'http://192.168.50.67:31785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/', 'http://192.168.50.67:31785']
 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.6.356",
+  "version": "3.6.357",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/jingyang/charge/ChargeManage.vue

@@ -0,0 +1,319 @@
+<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" v-ref:oper></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 parentname="charge-manage" :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel" @cancel-re="cancelAndRefresh"></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 '../../../components/charge/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,
+        reSearchShowMsy: !!this.$appdata.getSingleValue('收费后验证'),
+        show: [true],
+        selectFiled: '其他信息',
+        worktype: '其他信息',
+        searchTime: 1000,
+        interval: null
+      }
+    },
+    destroyed () {
+      if (this.$appdata.getSingleValue('磁条卡读卡间隔')) {
+        clearInterval(this.interval)
+      }
+    },
+    ready () {
+      if (this.$appdata.getSingleValue('磁条卡读卡间隔')) {
+        this.searchTime = this.$appdata.getSingleValue('磁条卡读卡间隔')
+        this.readCiTiaoCard()
+      }
+      this.setsustainMoney()
+    },
+    methods: {
+      async readCiTiaoCard () {
+        console.log('读磁条卡，开始，不停的循环')
+        let data = {}
+        let getUser = {data: []}
+        let forgid = this.$login.convertToIn([this.$login.f.orgid])
+        try {
+          this.interval = setInterval(() => {
+            // 1秒一轮回
+            let http = new HttpResetClass()
+            http.load('POST', 'http://127.0.0.1:8003/ReadCard_HEC', data, {
+              resolveMsg: null,
+              rejectMsg: null
+            }).then(async res => {
+              if (res.data.CardID !== '') {
+                if (res.data.Err === null && res.data.Exception) {
+                  this.$showAlert(res.data.Exception, 'danger', 2000)
+                  // clearInterval(interval)
+                } else {
+                  if (res.data.Factory === 'CiTiao') {
+                    // 获取用户信息
+                    getUser = await this.$resetpost('rs/sql/sale_getUser', {
+                      data: {
+                        condition: `u.f_filialeid in ${forgid}  and gb.f_meter_type in ('机表','物联网表') and i.f_userinfo_code='${res.data.CardID}'`,
+                        orderitem: `f_userinfo_id`
+                      }
+                    }, {resolveMsg: null, rejectMsg: '读卡失败'})
+                    this.$refs.list.model.rows = getUser.data
+                    if (!this.row || (this.row && this.row.f_userinfo_code != getUser.data[0].f_userinfo_code)) {
+                      await this.toBusiness(getUser.data[0])
+                    }
+                  }
+                }
+              }
+            })
+          }, this.searchTime * 1000)
+        } catch (error) {
+          console.log('捕获到异常', error)
+        }
+      },
+      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 data = {
+              condition: `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}' `
+            }
+            let getUnWriteSell = await this.$resetpost('rs/sql/getUnWriteRecord', {data: data}, {resolveMsg:null,rejectMsg:null})
+            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) => {
+          console.log('key', key)
+          console.log('对应啥数据', this.$refs.list.$refs.paged.$refs.cri.model[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
+      },
+      cancelAndRefresh (obj) {
+        this.listpage = true
+        this.clean()
+        this.clearCondition()
+        this.$refs.list.searchNoData()
+        this.$refs.card.search()
+      },
+      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
+        }
+        if (name === '卡表收费' && this.reSearchShowMsy) {
+          this.$refs.list.$refs.paged.$refs.cri.$refs.readcard.readCard()
+          this.$refs.oper.noButton = false
+          return
+        }
+        if (name === '物联网收费' && this.reSearchShowMsy) {
+          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()
+      },
+      'resflushrowdata' () {
+        this.toBusiness(this.row)
+      },
+      'resflushdata' (data) {
+        this.toBusiness(data)
+      },
+      '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/jingyang/sale.js

@@ -23,4 +23,7 @@ export default function () {
   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
   // 物联网表收费
   Vue.component('iot-meter-center', (resolve) => { require(['./charge/IOTMeterCenter'], resolve) })
+  // 物联网表收费
+  Vue.component('charge-manage', (resolve) => { require(['./charge/ChargeManage.vue'], resolve) })
+
 }

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Jul 31 10:14:59 CST 2024
-gradle.version=5.2.1