sale-client 3.6.282 → 3.6.283

package/package.json

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

package/src/components/common/userinfo_detail/contractSigning.vue

@@ -0,0 +1,109 @@
+<template>
+  <div id='contractSigning'>
+    <modal :show.sync="show" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">合同</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <iframe :src="url" v-if="url" width="100%" height="500px">
+        </iframe>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  type="button" class="btn btn-default" @click="handleReset">签名</button>
+        <button  type="button" class="btn btn-default" @click="handleGenerate">保存</button>
+        <button  type="button" class="btn btn-default" @click="clasehand">关闭</button>
+      </footer>
+    </modal>
+    <work-busy :is-busy="showbuy"></work-busy>
+  </div>
+</template>
+<script>
+  import * as jsign from '../../../plugins/jsign'
+  export default {
+    title: '合同签名页面',
+    data () {
+      return {
+        url: '',
+        imgstr: '',
+        scheduleData: '',
+        showclase: false,
+        showbuy: false
+      }
+    },
+    props: ['show'],
+    ready () {
+    },
+    compiled () {
+    },
+    methods: {
+      clasehand () {
+        this.url = ''
+        this.imgstr = ''
+        this.scheduleData = ''
+        this.show = false
+      },
+      getUserInfo () {
+        jsign.jsign_set_string('singurl', encodeURI(this.url))
+      },
+      getContractData (userinfoid) {
+        console.log(userinfoid)
+        this.showbuy = true
+        this.f_userinfo_id = userinfoid
+        this.$resetpost('wx/rs/logic/wordToosRept', {f_userinfo_id: this.f_userinfo_id}, {resolveMsg: null, rejectMsg: '获取合同失败！！'}).then(item => {
+          this.showbuy = false
+          if (item.data.length > 0) {
+            this.scheduleData = item.data[0]
+            this.url = item.data[0].f_visitpc_url
+          }
+        }).catch(err => {
+          console.log(err)
+          this.showbuy = false
+        })
+      },
+      handleReset () {
+        console.log('进入sign()')
+        console.log('jsign.dictGetArray', jsign.dictGetArray)
+        jsign.jsign_open(this)
+        setTimeout(() => {
+          jsign.jsign_get_device_status()
+        }, 1500)
+        setTimeout(() => {
+          if (jsign.dictGetArray['devicestatus'] === 'fail') {
+            console.log('没签字屏')
+            this.$showAlert('没有可用签字屏', 'danger', 0)
+            this.busy = 1
+            return
+          }
+          // jsign.jsign_set_string('name', 'jsigner')
+          // jsign.jsign_set_string('businessname', 'payment')
+          this.getUserInfo()
+          jsign.jsign_set_string('picture', '')
+
+          jsign.jsign_run_sign(jsign.htmlPath + `sign.html`)
+        }, 3000)
+      },
+      handleGenerate () {
+        // this.$dispatch('toggle')
+        if (this.imgstr === '') {
+          this.$showAlert('请先签字！', 'danger', 2000)
+          return
+        }
+        var data = {
+          content: this.imgstr,
+          f_userinfo_id: this.scheduleData.f_userinfo_id,
+          f_contract_signature_id: this.scheduleData.f_contract_signature_id
+        }
+        this.$resetpost('wx/rs/logic/pdfToosSignature', data).then((res) => {
+          if (res.data) {
+            this.showclase = true
+            this.url = res.data.f_visitpc_url
+          } else {
+            this.$vux.alert.show({title: '操作提示', content: '提交失败请稍后重试！'})
+          }
+        })
+      }
+    },
+    computed: {
+    }
+  }
+</script>

package/src/components/revenue/base/rightview/RecordCancel.vue

@@ -93,10 +93,8 @@
       }
       await self.$resetpost('invoice/rs/logic/getInvoice', {data: params}, {resolveMsg: null, rejectMsg: '发票冲红失败！！！'})
     }
-    if (name === 'otherFeeRollback') {
-      console.log('准备刷新了！。。', res, self.model)
-      self.$dispatch('cancel-success')
-    }
+    console.log('准备刷新了！。。', res, self.model)
+    self.$dispatch('cancel-success')
 
     // 判断需不需要冲正电子票
     // if (self.isNeedEticket(getRecord.data, self.data.type)) {

package/src/filiale/bayan/ChargeManage.vue

@@ -0,0 +1,316 @@
+<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 './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 getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `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}'`)
+            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/bayan/ChargeOper.vue

@@ -0,0 +1,319 @@
+<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>
+  <modal :show.sync="modalContornShow" backdrop="false" width="50%" title="提示信息">
+    <article slot="modal-body">
+      <div style="width:98%;margin: auto">
+        <p>该用户未签合同请问是否进行签约</p>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="border: 0">
+      <button class="button_search"   @click="abolishcontr()">取消</button>
+      <button class="button_search"   @click="confcontor()">确认</button>
+    </footer>
+  </modal>
+  <contract-signing :show="contractShow" @toggle="eticket_toggle" v-ref:contractbill></contract-signing>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+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
+          })
+          if (self.data.f_totalsplit_type !== '总表') {
+            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 && (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.unWriteSell && self.data.unWriteSell.length > 0) {
+        // 过滤掉线下写卡
+        self.temp = self.temp.filter((item) => {
+          return item.name !== '线下写卡'
+        })
+        self.data.unWriteSell.forEach(
+          async (item) => {
+            let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+            await self.$resetpost('rs/logic/runSQL', { sql: sql })
+          }
+        )
+      }
+    }
+    /*      // 如果是预备户,删除发卡售气按钮
+          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])
+    }
+  }
+  // 判断是否签订合同
+  console.log('----------111-------------')
+  console.log(self.data)
+  console.log('-----------1111------------')
+  if (self.data.f_is_signature !== '是') {
+    self.modalContornShow = true
+  }
+}
+
+export default {
+  title: '业务操作',
+  data() {
+    return {
+      operBtns: [],
+      isBusiness: false,
+      modalContornShow: false,
+      contractShow: false,
+      userinfoid: '',
+      noButton: false // 业务请求时禁止按钮点击
+    }
+  },
+  props: ['data', 'cardInfo'],
+  ready() {
+    getBtnsGen(this)
+    console.log('data,cardInfo', this.data, this.cardInfo)
+
+  },
+  methods: {
+    eticket_toggle () {
+      this.contractShow = false
+    },
+    confcontor () {
+      this.contractShow = true
+      this.modalContornShow = false
+      this.$refs.contractbill.getContractData(this.data.f_userinfo_id)
+    },
+    abolishcontr () {
+      this.modalContornShow = false
+    },
+    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)
+    },
+    'toroute' (buttonObj, data) {
+      console.log('指定按钮。。', buttonObj)
+      this.$resetpost('rs/sql/sale_getUser', {
+        data: {condition: `i.f_userinfo_code='${data.f_userinfo_code}' and u.f_filialeid = '${data.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
+      }, {resolveMsg: null, rejectMsg: '获取用户信息失败'}).then((res)=>{
+        if (buttonObj) {
+          this.$dispatch('resflushdata', res.data[0])
+          this.styleChange(buttonObj.name)
+          this.$refs.route.init(buttonObj.value, {row: res.data[0]})
+        }
+      })
+    },
+    '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/bayan/sale.js

@@ -14,6 +14,10 @@ export default function () {
   Vue.component('un-write-card-center', (resolve) => { require(['./UnWriteCardCenter'], resolve) })
   // 当前选择用户的用户基本信息
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
+  // 售气收费 --收费gas-move
+  Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
+  // 业务操作组件
+  Vue.component('charge-oper', (resolve) => { require(['./ChargeOper'], resolve) })
   // 卡表收费
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
   // 物联网表收费
@@ -22,4 +26,5 @@ export default function () {
   Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
   // 其他收费xin
   Vue.component('other-charge-new', (resolve) => { require(['./OtherChargeNew'], resolve) })
+
 }

package/src/filiale/qianneng/revenue/common/ic_detail/HandQueryUser.vue

@@ -9,7 +9,7 @@
                 <label class="font_normal_body" title="归属日期" >开始时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                             class="datepicker"
-                            condition="f_hand_date >= '{} 00:00:00' "
+                            condition="f_input_date >= '{} 00:00:00' "
                             placeholder="起始时间"
                             style="width:60%"
                             v-model="model.f_start_date"
@@ -19,7 +19,7 @@
                 <label class="font_normal_body" title="归属日期">结束时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
                             class="datepicker"
-                            condition="f_hand_date <= '{} 23:59:59' "
+                            condition="f_input_date <= '{} 23:59:59' "
                             placeholder="结束时间"
                             style="width:60%"
                             v-model="model.f_end_date"

package/src/plugins/jsign.js

@@ -0,0 +1,168 @@
+
+import co from 'co'
+
+let socket
+let _this
+export let dictGetArray = new Array()
+export let htmlPath = 'c:\\sign\\suite\\frame\\'
+  //打开签字 js 模块
+export function jsign_open(self) {
+  let gen = connectGen(self)
+  return co(gen)
+}
+
+let connectGen = function * (self){
+  var serverclosed = 1;
+  var host = "ws://localhost:81/test";
+  _this = self
+  try{
+    socket = new WebSocket(host);
+    socket.onopen = () =>{
+      console.log('onopen')
+      serverclosed = 0;
+      console.log('open的serverclosed',serverclosed)
+      socket.send('0'+'jsign');
+    }
+
+    socket.onmessage = (msg) =>{
+      console.log('接受消息',msg)
+      var str = "";
+      str = msg.data;
+      var id  = str.substr(0, 1);
+      var separator = str.indexOf("|");
+      var arg1 = "";
+      var arg2 = "";
+      if(separator != -1) {
+        arg1 = str.substr(1, separator-1);
+        arg2 = str.substr(separator+1);
+      }
+      else
+        arg1 = str.substr(1);
+
+      if(id == "0"){
+
+      }
+      if(id == "1"){
+        var buf = arg1.substr(0,4);
+        if(buf == 'sign') {
+          console.log('buuf')
+          jsign_sign_callback();
+        }
+        if(buf == 'get_') {
+          buf = arg1.substr(4);
+          var separator = buf.indexOf("_");
+          if(separator != -1) {
+            jsign_get_callback(buf.substr(0, separator), buf.substr(separator+1));
+          }
+        }
+      }
+    }
+
+    socket.onclose = function(){
+    }
+
+  } catch(exception){
+    console.log('异常信息',exception)
+    jsign_error_callback(2)
+  }
+  setTimeout(() => {
+    if( serverclosed == 1){
+      console.log('最后的serverclosed',serverclosed)
+      jsign_error_callback(1);
+    }
+  },2000);
+}
+
+
+
+
+//缓存有名字符串，按 key 存储
+export function jsign_set_string(key,value){
+  var cmd = '1' + 'set_' + key + '_' + value;
+  if (socket.readyState===1) {
+    socket.send(cmd);
+  }
+}
+
+//读取有名字符串，按 key 搜索
+export function jsign_get_string(key) {
+  console.log('搜索')
+  var cmd = '1' + 'get_' + key;
+  if (socket.readyState===1) {
+    socket.send(cmd);
+  }
+}
+
+
+export function jsign_get_device_status() {
+  var cmd = '1' + 'get_device_status';
+  console.log('socket状态----',socket.readyState)
+  if (socket.readyState == 1) {
+    console.log('开始发送消息')
+    socket.send(cmd);
+  }
+}
+
+
+//启动欢迎页或者广告页
+export function jsign_run_welcome(fullpath) {
+  var cmd = '1'+'welc'+fullpath;
+  if (socket.readyState===1) {
+    socket.send(cmd);
+  }
+}
+
+//启动签字页，传入签字完成处理函数
+export function jsign_run_sign(fullpath) {
+  var cmd = '1'+'sign'+fullpath;
+  if (socket.readyState===1) {
+    socket.send(cmd);
+  }
+}
+
+
+//启动评估页，传入评估完成处理函数
+export function jsign_run_eval(fullpath) {
+  var cmd = '1'+'eval'+fullpath;
+  if (socket.readyState===1) {
+    socket.send(cmd);
+  }
+}
+
+
+
+//错误反馈信息接收函数
+function jsign_error_callback(msgcode){
+  /*
+  1. 服务程序没有工作
+  2. 运行时错误
+      */
+  if(msgcode == 1){
+    _this.$showAlert('服务程序没有工作','danger',0)
+    return
+  }
+  if(msgcode == 2){
+    _this.$showAlert('运行时错误','danger',0)
+  }
+}
+
+//读取字符串处理函数
+function jsign_get_callback(key, value){
+  console.log('处理字符串')
+  dictGetArray[key] = value;
+}
+
+
+//签字完成处理函数
+function jsign_sign_callback(){
+  console.log('签字')
+  console.log(" dictGetArray", dictGetArray)
+  jsign_get_string('picture');
+  setTimeout(function(){
+    _this.imgstr = dictGetArray['picture']
+    _this.$showAlert('签字完成','success',2000);/*OutputLog(dictGetArray['picture']);*/
+  },500);
+  // setTimeout(function(){jsign_run_eval(demopath + 'eval.html');OutputLog('已推送评价页，请评价');},1000);
+}
+
+

package/src/sale.js

@@ -1206,4 +1206,6 @@ export default function () {
   Vue.component('host-meter-user-list', (resolve) => { require(['./components/FilesManage/HostMeterUserList'], resolve) })
   Vue.component('add-host-meter-user-list', (resolve) => { require(['./components/FilesManage/AddHostMeterUserList'], resolve) })
   Vue.component('add-sub-meter-user-list', (resolve) => { require(['./components/FilesManage/AddSubMeterUserList'], resolve) })
+  // // 单户各表具用气量折断图
+  Vue.component('contract-signing', (resolve) => { require(['./components/common/userinfo_detail/contractSigning'], resolve) })
 }

package/src/sign.html

@@ -0,0 +1,399 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>签字页</title>
+  <style>
+    *{
+      padding: 0;
+      margin: 0;
+    }
+    .s_conLeft {
+      width: 700px;
+      height: 750px;
+      padding: 20px;
+      position: relative;
+      background: #e8f8f8;
+    }
+    //.s_conLeft {
+    //  width: 700px;
+    //  height: 750px;
+    //  padding: 20px;
+    //  position: relative;
+    //  background: #e8f8f8;
+    //}
+    .s_conLeftsing {
+      width: 700px;
+      height: 730px;
+    }
+    .s_conRight {
+      position: absolute;
+      top: 0;
+      right: 0;
+      left: 700px;
+      bottom: 0;
+      overflow: auto;
+      margin-top: 0px;
+      background: #e8f8f8;
+      margin-left: 50px;
+    }
+    //.s_conRight {
+    //  position: absolute;
+    //  top: 0;
+    //  right: 0;
+    //  left: 700px;
+    //  bottom: 0;
+    //  //overflow: auto;
+    //  margin-top: -35px;
+    //  background: #e8f8f8;
+    //  margin-left: 50px;
+    //}
+
+    .sign_window
+    {
+      float:left;
+      width:500px;
+      height:300px;
+      position:absolute;
+      right:0px;
+      top:380px;
+    }
+
+    #open_close_sign
+    {
+      float:right;
+      width:60px;
+      height:60px;
+      background:#5E5EA2;
+      color:#ffffff;
+      margin-bottom:20px
+    }
+
+    #enter_sign
+    {
+      float:left;
+      width:100%;
+      height:100%;
+      background:#CCCC99;
+    }
+
+    .enter_sign_inner
+    {
+      float:left;
+      background:red;
+      width:100%;
+      height:30px;
+      line-height:30px;
+      opacity:0.4;
+    }
+
+    .enter_sign_inner p
+    {
+      margin-left:10px;
+      color:#ffffff;
+    }
+
+    .obj_id
+    {
+      float:left;
+      width:490px;
+      height:220px;
+      margin-top:5px;
+      margin-left:5px;
+      margin-right:5px;
+      background:#ffffff;
+      float:left;
+      overflow:hidden;
+    }
+
+    .sign_place
+    {
+      float:left;
+      position:absolute;
+      left:10px;
+      top:310px;
+    }
+
+    .sign_dashed
+    {
+      float:left;
+      border-bottom:1px dashed black;
+      width:435px;
+      height:30px;
+      position:absolute;
+      left:60px;
+      top:300px;
+    }
+
+    .sign_button
+    {
+      float:left;
+      background:#CCCC99;
+      width:100%;
+      height:45px;
+    }
+
+    .sign_button_inner
+    {
+      float:left;
+      margin-left:45px;
+    }
+
+    .sign_button_ok
+    {
+      float:left;
+      width:80px;
+      margin-left:20px;
+      margin-top:8px;
+      background:#0000ff;
+      padding:3px 5px;
+      color:#ffffff;
+      border:1px solid #0000ff;
+    }
+
+    .sign_button_resign
+    {
+      float:left;
+      width:80px;
+      margin-left:20px;
+      margin-top:8px;
+      background:#ff0000;
+      padding:3px 5px;
+      color:#ffffff;
+      border:1px solid #ff0000;
+    }
+  </style>
+</head>
+<body>
+<script>
+  var obj;
+  //<!-- 笔响应支持脚本开始 -->
+  function _getTop(e){
+    var offset=e.offsetTop;
+    if(e.offsetParent!=null) offset+=_getTop(e.offsetParent);
+    return offset;
+  }
+  function _getLeft(e){
+    var offset=e.offsetLeft;
+    if(e.offsetParent!=null) offset+=_getLeft(e.offsetParent);
+    return offset;
+  }
+  function _buttonInfo(func, e){
+    _top = _getTop(e);
+    _left = _getLeft(e);
+    s = _top;
+    s += ','+_left;
+    s += ','+(e.offsetHeight+_top);
+    s += ','+(e.offsetWidth+_left);
+    s += ','+func
+    return s+';';
+  }
+  function _objectInfo(e){
+    return _buttonInfo("object", e);
+  }
+  function TInput_getButtonsInfo() {
+    var obj_ok = document.getElementById("button_ok");
+    ok = _buttonInfo("TInput_click_ok", obj_ok);
+    var obj_resign = document.getElementById("button_resign");
+    resign = _buttonInfo("TInput_click_resign", obj_resign);
+    var close_open=document.getElementById("open_close_sign");
+    close_open_btn = _buttonInfo("TInput_close_open", close_open);
+    activex = _objectInfo(obj);
+    s = ok + resign + close_open_btn + activex;
+    return s;
+  }
+
+  // <!-- 笔响应支持脚本结束 -->
+  window.onload = function(){
+    obj = document.getElementById("TInputSign");
+    obj.TInputSetString("license","VFZNMGQweHFRWFZOVVNVelJDVXpSQSUzRCUzRA=");
+    document.getElementById("singurl").src = decodeURI(obj.TInputGetString("singurl"));
+
+    setTimeout(function(){
+      obj.TInputInitialize();
+      obj.TInputMovetoExt();
+      obj.TInputRegisterButtonInfo(TInput_getButtonsInfo());
+      }, 600);
+  }
+  window.onunload=function(){
+    obj.TInputFinalize();
+  }
+
+  var $_GET = (function(){
+    var url = decodeURI(window.document.location.href.toString());
+    var u = url.split("?");
+    if(typeof(u[1]) == "string"){
+      u = u[1].split("&");
+      var get = {};
+      for(var i in u){
+        var j = u[i].split("=");
+        get[j[0]] = j[1];
+      }
+      return get;
+    } else {
+      return {};
+    }
+  })();
+
+  function button_click_ok(){
+    var stream;
+    var picture;
+    stream = obj.TInputGetStrokes();
+    if( stream == "" )
+      return;
+    picture = obj.TInputGetImage();
+    obj.TInputSetString("trace",stream);
+    obj.TInputSetString("picture", picture);
+    obj.TInputCloseSignFrame();
+  }
+  function button_click_resign(){
+    obj.TInputInitialize();
+    obj.TInputClear();
+  }
+
+  var flag = true;
+  function close_open_button(){
+    if(flag)
+    {
+      document.getElementById("enter_sign").style.display="block";
+      document.getElementById("open_close_sign").value="关闭";
+
+    }
+    else
+    {
+      document.getElementById("enter_sign").style.display="none";
+      document.getElementById("open_close_sign").value="打开";
+    }
+    flag = !flag;
+  }
+
+  //控件调用绑定的函数
+  function TInput_click_ok(){
+    button_click_ok();
+  }
+  function TInput_click_resign(){
+    button_click_resign();
+  }
+  function TInput_close_open(){
+    close_open_button();
+  }
+  function Move_Up_Btn(){
+    // document.getElementById("div1").style.backgroundColor="#000000";
+    move_up();
+  }
+  function move_up(){
+    // alert('up')
+    GoTop()
+  }
+  function Move_Down_Btn(){
+    // document.getElementById("div1").style.backgroundColor="#000000";
+    move_down();
+  }
+  function move_down(){
+    // alert('down')
+    GoBottom();
+  }
+
+  var currentPosition;
+  function GoTop() {
+    var scr = document.getElementById("div_scroll");
+    currentPosition = scr.scrollTop;
+
+    currentPosition -= 300;
+    if (currentPosition > 0) {
+      scr.scrollTop = currentPosition;
+      // scr.scrollTo(0, currentPosition);
+      // timer = setInterval("GoTop()", 10);
+    } else {
+      currentPosition = 0;
+      scr.scrollTop = currentPosition;
+      // scr.scrollTo(0, 0);
+
+      // window.clearInterval(timer);
+    }
+
+  }
+  var currentPosition2;
+  function GoBottom() {
+    var scr = document.getElementById("div_scroll");
+    // console.log('down');
+    // var scr = document.body;
+    currentPosition2 = scr.scrollTop;
+
+    currentPosition2 += 300;
+    if (currentPosition2 <= 3000) {
+      scr.scrollTop = currentPosition2;
+      // scr.scrollTo(0,currentPosition2);
+      // timer2 = setInterval("GoBottom()", 100);
+    } else {
+      scr.scrollTop = 3000;
+      // currentPosition = 1000;
+      // scr.scrollTo(0,1000);
+      // window.clearInterval(timer2);
+    }
+  }
+
+  /*
+   *回调
+   */
+  function TInputSignWebButtonClickCallback()
+  {
+    var fname = obj.GetClickedFuncname();
+    if(fname == "TInput_click_ok")
+    {
+      button_click_ok();
+    }
+    if(fname == "TInput_click_resign")
+    {
+      button_click_resign();
+    }
+    if(fname == "TInput_close_open")
+    {
+      close_open_button();
+    }
+    if(fname == "Move_Up_Btn")
+    {
+      move_up();
+    }
+    if(fname == "Move_Down_Btn")
+    {
+      move_down();
+    }
+  }
+</script>
+<div class="s_content">
+  <!--  <iframe class="s_conLeftsing" id="singurl"></iframe>-->
+  <div id="div_scroll" class="s_conLeft">
+    <iframe class="s_conLeftsing" id="singurl"></iframe>
+  </div>
+</div>
+<div class="s_conRight">
+  <div class="sign_window">
+    <button id="open_close_sign" onclick="close_open_button()">关闭</button>
+    <div id="enter_sign">
+      <div class=enter_sign_inner>
+        <p>请填写个人手写签名</p>
+      </div>
+      <div class="obj_id">
+        <object id="TInputSign"
+                classid="clsid:E4313E1C-8BF1-4B0F-81FF-46FB40581B27"
+                width="100%"
+                height="90%">
+        </object>
+        <SCRIPT FOR="TInputSign" EVENT="WebbtnClick()">
+          TInputSignWebButtonClickCallback();
+        </SCRIPT>
+        <div class="sign_place">签名栏:</div>
+        <div class="sign_dashed"></div>
+      </div>
+      <div class="sign_button">
+        <div class="sign_button_inner">
+          <button id="button_resign" class="sign_button_resign" onclick="button_click_resign()">重签</button>
+          <button  id="button_ok" class="sign_button_ok" onclick="button_click_ok()">确认</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+</html>