sale-client 3.6.64 → 3.6.66

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
+const [localUrl, serverRul] = ['http://121.36.106.17:8400/', 'http://121.36.106.17: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.6.64",
+  "version": "3.6.66",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/ChargeManage.vue

@@ -65,7 +65,7 @@ export default {
         show: [true],
         selectFiled: '其他信息',
         worktype: '其他信息',
-        searchTime : 1000,
+        searchTime: 1000,
         interval: null
       }
     },

package/src/components/revenue/HandManager/PriceAdjustmentManage.vue

@@ -1,6 +1,9 @@
 <template>
   <!--  <div v-if="listpage">-->
   <tab-button v-ref:list>
+<!--    <tabs header="物联网表调价补差">-->
+<!--      <price-adjustment-webmeter @deal-msg="dealMsg"></price-adjustment-webmeter>-->
+<!--    </tabs>-->
     <tabs header="机表调价补差">
       <price-adjustment @deal-msg="dealMsg"></price-adjustment>
     </tabs>

package/src/components/revenue/HandManager/PriceAdjustmentWebmeter.vue

@@ -0,0 +1,404 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="f_userinfo_code = '{}'" >
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_user_name" placeholder='客户名称'
+                         condition="f_user_name = '{}'">
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期"
+                              style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期"
+                              style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="span" style="float:right;">&nbsp;&nbsp;
+                  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  <button class="button_search" @click="search()" v-el:cx>查询</button>
+                  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
+                  <div style="float: right"  class="button_spacing"
+                       :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">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                         condition="u3.f_address like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">电&emsp;&emsp;话</label>
+                  <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_phone" placeholder='电话'
+                         condition="f_user_phone like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                         condition="f_meternumber like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">状&emsp;&emsp;态</label>
+                  <v-select id="price_states"
+                            v-model="model.price_states"
+                            placeholder='未调价'
+                            style="width: 60%"
+                            :value.sync="model.price_states"
+                            :options='$parent.$parent.price_states'
+                            condition="nvl(f_new_price,0) {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select id="f_user_tye"
+                            v-model="model.f_user_type"
+                            placeholder='用户类型'
+                            style="width: 60%"
+                            @change="$parent.$parent.userTypeChange"
+                            :value.sync="model.f_user_type"
+                            :options='$parent.$parent.userTypes'
+                            condition="u2.f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">气&emsp;&emsp;价</label>
+                  <v-select id="f_price_name"
+                            v-model="model.price_name"
+                            placeholder='气价名称'
+                            style="width: 60%"
+                            :value.sync="model.price_name"
+                            :options='$parent.$parent.price_name'
+                            condition="sp.id = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+            <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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{$index+1}}</td>
+              <th style="text-align: center;">{{row.f_userinfo_code}}</th>
+              <th style="text-align: center;">{{row.f_meternumber}}</th>
+              <th style="text-align: center;">{{row.f_user_name}}</th>
+              <th style="text-align: center;">{{row.f_user_type}}</th>
+              <th style="text-align: center;">{{row.f_meter_type}}</th>
+              <th style="text-align: center;"><nobr>{{row.f_start_date}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></th>
+              <th style="text-align: center;">{{row.f_price_name}}</th>
+              <!--              <th style="text-align: center;">{{row.f_address}}</th>-->
+              <th style="text-align: center;">
+                <div class="form-group" style="margin-bottom:0px;"
+                     v-if="!row.f_new_price>0">
+                  <input type="text" class="form-control" v-model="row.oldprice"
+                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
+                </div>
+                <div v-else>{{row.f_old_price}}</div>
+              </th>
+              <th style="text-align: center;">
+                <div class="form-group" style="margin-bottom:0px;"
+                     v-if="!row.f_new_price>0">
+                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"
+                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
+                </div>
+                <div v-else>{{row.f_new_price}}</div>
+              </th>
+              <th style="text-align: center;">{{row.f_change_price}}</th>
+              <th style="text-align: center;">{{row.f_last_tablebase}}</th>
+              <th style="text-align: center;">{{row.f_tablebase}}</th>
+              <th style="text-align: center;">{{row.pregas}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee}}</th>
+              <th style="text-align: center;">{{row.f_source}}</th>
+              <th style="text-align: center;">
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_new_price"
+                        @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
+                </button>
+              </th>
+            </template>
+          </data-grid>
+        </criteria-paged>
+        <modal :show.sync="show" >
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">调 价 补 差</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <div class="form-group">
+              <p>旧单价：</p>
+              <input type="text" class="form-control" v-model="f_old_price" >
+            </div>
+            <div class="form-group">
+              <p>新单价：</p>
+              <input type="text" class="form-control" v-model="f_new_price" >
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" @click="priceadjustment">生成调价补差表</button>
+            <button type="button" class="btn btn-default" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <work-busy :is-busy="locking" v-show="locking"></work-busy>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      console.log(res.data)
+      let rs = []
+      for (let i = 0; i < res.data.length; i++) {
+        if (res.data[i].f_price_type === '固定气价') {
+          let temp = {
+            label: res.data[i].f_price_name,
+            flage: res.data[i].f_user_type,
+            value: res.data[i].id
+          }
+          rs.push(temp)
+        }
+      }
+      console.log(rs)
+      self.pricers = [{label: '全部', value: '', flage: ''}, ...rs]
+      self.$refs.paged.$refs.criteria.search()
+    })
+  }
+
+  export default {
+    title: '调价补差',
+    data () {
+      return {
+        pricechange: true,
+        criteriaShow: false,
+        pricers: [{label: '全部', value: '', flage: ''}],
+        price_name: [{label: '全部', value: ''}],
+        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' >0'}, {label: '未调价', value: ' <=0'}],
+        source: [{label: '卡表抄表', value: '卡表抄表'}, {label: '机表抄表', value: '机表抄表'}],
+        userTypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        condition: '',
+        locking: false,
+        model: new PagedList('rs/sql/get_WebUserCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
+        f_new_price: 0.0,
+        f_old_price:0.0,
+        show: false,
+        addSelectParam: ''
+        // joinTable:'',
+      }
+    },
+    ready () {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      // 用户类型发生改变
+      userTypeChange () {
+        this.price_name = []
+        if (this.$refs.paged.$refs.criteria.model.f_user_type) {
+          if (this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+            for (let i = 0; i < this.pricers.length; i++) {
+              if (this.pricers[i].flage === this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+                let rs = {
+                  label: this.pricers[i].label,
+                  value: this.pricers[i].value
+                }
+                this.price_name.push(rs)
+              }
+            }
+          }
+        }
+        // 选择全部时就放进去所有的气价
+        if (this.price_name.length === 0) {
+          for (let i = 0; i < this.pricers.length; i++) {
+            let rs = {
+              label: this.pricers[i].label,
+              value: this.pricers[i].value
+            }
+            this.price_name.push(rs)
+          }
+        }
+      },
+      // 冲正
+      delectHand (row) {
+        this.$showMessage('冲正后不可恢复，确定冲正吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            row.f_operator = this.$login.f.name
+            row.f_operatorid = this.$login.f.id
+            row.f_orgid = this.$login.f.orgid
+            row.f_orgname = this.$login.f.orgs
+            row.f_depid = this.$login.f.depids
+            row.f_depname = this.$login.f.deps
+            this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
+              // this.$dispatch('refresh', '正在处理', row)
+              this.selfSearch(this.model)
+            })
+          }
+        })
+      },
+      priceshow () {
+        this.show = true
+      },
+      close () {
+        this.show = false
+        this.f_new_price = 0.0
+      },
+      async priceadjustment () {
+        this.$showMessage('确认生成补差记录吗?', ['cancel', 'confirm']).then(
+          (response) => {
+            if (response === 'confirm') {
+              this.show = false
+              this.locking = true
+              this.getAdjustData()
+            }
+          })
+      },
+      async enter (row) {
+        if(row.oldprice && row.newprice){
+          this.$showMessage('是否确认对此记录进行调价补差操作？', ['confirm', 'cancel']).then((res) => {
+              if (res === 'confirm') {
+                let http2 = new HttpResetClass()
+                let param = {
+                  f_state: '有效',
+                  f_old_price:parseFloat(row.oldprice),
+                  f_new_price: parseFloat(row.newprice),
+                  f_operator: this.$login.f.name,
+                  f_operatorid: this.$login.f.id,
+                  f_orgid: this.$login.f.orgid,
+                  f_orgname: this.$login.f.orgs,
+                  f_depid: this.$login.f.depids,
+                  f_depname: this.$login.f.deps,
+                  f_start_date: this.model.model.startDate + ' 00:00:00',
+                  f_end_date: this.model.model.endDate + ' 23:59:59',
+                  row: row
+                }
+                this.$resetpost('rs/logic/priceAdjustmentWebmeter', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+                  this.selfSearch(this.model)
+                })
+
+              }
+          })
+
+        }else{
+          this.$showMessage('请输入系统气价及补差气价')
+        }
+
+      },
+      async getAdjustData () {
+        try {
+          let http = new HttpResetClass()
+          let detail = await http.load('POST', 'rs/sql/get_WebUserCharge',
+            {data: {condition: this.condition, startDate: this.model.model.startDate, endDate: this.model.model.endDate, addSelectParam: '', price_states: 'not'}}, {resolveMsg: null, rejectMsg: null})
+          console.log(detail.data)
+          let param = {
+            f_state: '有效',
+            f_old_price:parseFloat(this.oldprice),
+            f_new_price: parseFloat(this.f_new_price),
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            f_start_date: this.model.model.startDate + ' 00:00:00',
+            f_end_date: this.model.model.endDate + ' 23:59:59',
+            condition: this.condition
+          }
+          let http2 = new HttpResetClass()
+          for (var i = 0; i < detail.data.length; i++) {
+            param.row = detail.data[i]
+            await http2.load('POST', 'rs/logic/priceAdjustmentWebmeter', {data: param}, {resolveMsg: null, rejectMsg: null})
+          }
+          this.close()
+          this.$showMessage('已生成了' + detail.data.length + '条调价补差记录', ['confirm'])
+          this.$refs.paged.$refs.criteria.search()
+          this.locking = false
+        } catch (error) {
+          this.$showAlert('生成调价补差表失败!!!', 'error', 3)
+          this.locking = false
+        }
+      },
+      search () {
+        this.selfSearch()
+      },
+      selfSearch (args) {
+        args.model.addSelectParam = ''
+        // args.model.joinTable =''
+        if (args.model.price_states.toString() === '') {
+          this.pricechange = false
+          // args.model.addSelectParam = 'u5.f_surplus_fee,u5.id,u5.f_state,u5.f_new_price,u5.f_old_price,u5.f_change_price,u5.f_whether_pay,u5.f_sell_id,'
+          // args.model.joinTable = 'left join t_surplus_detail u5 on u5.f_handplan_id = u1.f_handplan_id'
+        } else {
+          this.pricechange = true
+        }
+        this.condition = `${args.condition} and u2.f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, args.model)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = ''
+        })
+      }
+    },
+    computed: {
+    },
+    watch: {
+    }
+  }
+</script>
+
+<style >
+</style>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -17,10 +17,10 @@
                       close-on-select clear-button>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
-                   placeholder="换表人">
+          <div class="col-sm-4 form-group" v-if="row.f_collection_type == '按金额'">
+            <label for="f_change_operator" class=" font_normal_body">旧表金额</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_using_fee_old"
+                   placeholder="旧表金额" @blur="feeOldChange()">
           </div>
 
           <div class="col-sm-4 form-group"
@@ -236,6 +236,11 @@
                       :options='opentype'
                       close-on-select clear-button></v-select>
           </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   placeholder="换表人">
+          </div>
         </div>
         <div class="row auto">
           <div class="col-sm-12"
@@ -394,7 +399,9 @@ export default {
         f_state: '有效',
         f_changemeter_date: this.$login.toStandardTimeString(),
         f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0,
-        f_difference_reason: ''
+        f_difference_reason: '',
+        // 金额表剩余金额
+        f_using_fee_old: 0
       },
       meterinfo: false,
 
@@ -498,6 +505,11 @@ export default {
     }
   },
   methods: {
+    feeOldChange () {
+      if (this.model.f_using_fee_old) {
+        this.model.f_remanent_money = this.model.f_using_fee_old
+      }
+    },
     addTaskModalClose () {
       this.addTaskModel.f_work_flow_name = ''
       this.addTaskModel.f_task_name = ''

package/src/filiale/qianneng/eticket/EticketRecordList.vue

@@ -282,7 +282,7 @@ export default {
       row.f_taxpayer_id = row.f_pay_id
       row.f_address_phone = row.f_buy_address_phone
       row.f_paper_accoun = row.f_buy_openbank
-      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, '物联网收费')
+      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type)
     },
     ch (row) {
       this.eticket_show = true

package/src/filiale/rizhao/ChargeList.vue

@@ -306,8 +306,15 @@
           <div class="col-sm-2">
             <p class="form-control-static">{{userAddress}}</p>
           </div>
+          <label class="col-sm-2 control-label" v-if="showOrgname">所属公司</label>
+          <div class="col-sm-2" v-if="showOrgname">
+            <p class="form-control-static" style="color: red">{{orgName}}</p>
+          </div>
+        </div>
+        <div class="form-group" style="margin-left:10%;" v-if="showOrgname">
+          <p class="text-left" style="font-size:20px;line-height:60px;font-height:800;">当前卡所属分公司与当前分公司不符</p>
         </div>
-        <div class="form-group" style="margin-left:10%;">
+        <div class="form-group" style="margin-left:10%;" v-if="!showOrgname">
           <p class="text-left" style="font-size:20px;line-height:60px;font-height:800;">当前卡充值次数与系统不符,请检查是否是正确的卡</p>
         </div>
       </form>
@@ -382,22 +389,40 @@
       let getUser = null
       if (self.cardInfo.Factory == 'JiBiao' || self.cardInfo.Factory == 'JiChengADSystem') {
         // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        let data = {
           data: {
             condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
-          }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+          }}
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+              and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }}
+        }
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
       } else {
-        // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        let data = {
           data: {
             condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
           }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+        }
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+         and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }
+          }
+        }
+        // 获取用户信息
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
       }
 
       if (getUser.data.length === 0) {
@@ -451,23 +476,41 @@
       // 还有一种方式： 在建立气表品牌的时候机表和物联网表别名直接给成JiBiao
       let getUser = null
       if (self.cardInfo.Factory == 'JiBiao' || self.cardInfo.Factory == 'JiChengADSystem') {
-        // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        let data = {
           data: {
             condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
-          }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
-      } else {
+          }}
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+              and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }}
+        }
         // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+      } else {
+        let data = {
           data: {
             condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
           }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+        }
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+         and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }
+          }
+        }
+        // 获取用户信息
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
       }
       self.model.rows = getUser.data
     }
@@ -479,23 +522,41 @@
       // 还有一种方式： 在建立气表品牌的时候机表和物联网表别名直接给成JiBiao
       let getUser = null
       if (self.cardInfo.Factory == 'JiBiao' || self.cardInfo.Factory == 'JiChengADSystem') {
-        // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        let data = {
           data: {
-            condition: `gb.f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+            condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
-          }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
-      } else {
+          }}
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+              and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }}
+        }
         // 获取用户信息
-        getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+      } else {
+        let data = {
           data: {
             condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
           and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
             orderitem: `${self.orderitem} Desc`
           }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+        }
+        if(!self.config.checkFiliale){
+          data = {
+            data: {
+              condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+         and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+              orderitem: `${self.orderitem} Desc`
+            }
+          }
+        }
+        // 获取用户信息
+        getUser = await self.$resetpost('rs/sql/sale_getUser', data, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
       }
       // 判断是否是旧卡
       if (getUser.data.length > 0) {
@@ -504,11 +565,18 @@
           self.userCode = getUser.data[0].f_userinfo_code
           self.userName = getUser.data[0].f_user_name
           self.userAddress = getUser.data[0].f_address
+          self.orgName = getUser.data[0].f_orgname
           if (getUser.data[0].f_is_check != '否') {
             self.showCardError = true
             self.showCardError2 = true
             return
           }
+          if (getUser.data[0].f_filialeid != self.$login.f.orgid) {
+            self.showCardError = true
+            self.showCardError2 = true
+            self.showOrgname = true
+            return
+          }
           // self.$showMessage('当前卡充值次数与系统不符,请检查是否是正确的卡.')
         }
       }
@@ -519,11 +587,19 @@
           self.userCode = getUser.data[0].f_userinfo_code
           self.userName = getUser.data[0].f_user_name
           self.userAddress = getUser.data[0].f_address
+          self.orgName = getUser.data[0].f_orgname
+          if (getUser.data[0].f_filialeid != self.$login.f.orgid) {
+            self.showCardError = true
+            self.showCardError2 = true
+            self.showOrgname = true
+            return
+          }
           if (getUser.data[0].f_is_check != '否') {
             self.showCardError2 = false
             self.showCardError = true
             return
           }
+
         }
       }
 
@@ -587,6 +663,7 @@
     await self.$LoadParams.loadParam()
     await self.initQueryParam()
     await self.clear()
+    await self.getCardConfig()
     if (!self.authArr.includes('读卡限定')) {
       self.search()
     }
@@ -596,7 +673,11 @@
     title: '收费',
     data () {
       return {
+        config:{
+          checkFiliale:false
+        },
         // 公司下拉
+        showOrgname:false,
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
         showCardError2: false,
@@ -649,11 +730,11 @@
         // 读卡是否需要额外参数
         readCardNeedParam: false,
         readCardParam: {},
-      systemTimes: '',
+        systemTimes: '',
         userCode: '',
         userName: '',
         userAddress: '',
-
+        orgName:'',
         // 当列表是一户的时候直接读卡，跳过判卡
         isSingleUser: null,
 
@@ -694,6 +775,13 @@
       }
     },
     methods: {
+      getCardConfig(){
+
+        this.$resetget(`rs/vue/checkcard.json`, {resolveMsg: null, rejectMsg: null}).then((result)=>{
+          Object.assign(self.config, result.data)
+         })
+
+      },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.$parent.f_orgid = this.f_orgid
@@ -806,6 +894,7 @@
     this.showCardInfo = false
     this.showCardError = false
     this.showCardError2 = false
+    this.showOrgname = false
   },
   async testCard () {
     try {

package/src/filiale/shexian/revenue/newchangemeter/ChangeMeter.vue

@@ -17,12 +17,11 @@
                       close-on-select clear-button>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
-                   placeholder="换表人" :readonly="!applyButtonShow">
+          <div class="col-sm-4 form-group" v-if="row.f_collection_type == '按金额'">
+            <label for="f_change_operator" class=" font_normal_body">旧表金额</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_using_fee_old"
+                   placeholder="旧表金额" @blur="feeOldChange()">
           </div>
-
           <div class="col-sm-4 form-group"
                :class="[$v.f_using_base_old.required || $v.f_using_base_old.dctest ? 'has-error' : 'has-success']">
             <label for="f_remanent_gas" class=" font_normal_body">旧表底数</label>
@@ -251,6 +250,11 @@
                       :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   placeholder="换表人">
+          </div>
         </div>
         <div class="row auto">
           <div class="col-sm-12"
@@ -435,7 +439,9 @@ export default {
         f_state: '有效',
         f_changemeter_date: this.$login.toStandardTimeString(),
         f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0,
-        f_difference_reason: ''
+        f_difference_reason: '',
+        // 金额表剩余金额
+        f_using_fee_old: 0
       },
       meterinfo: false,
 
@@ -540,6 +546,11 @@ export default {
     }
   },
   methods: {
+    feeOldChange () {
+      if (this.model.f_using_fee_old) {
+        this.model.f_remanent_money = this.model.f_using_fee_old
+      }
+    },
     addTaskModalClose () {
       this.addTaskModel.f_work_flow_name = ''
       this.addTaskModel.f_task_name = ''

package/src/filiale/tongchuan/StairPrice/GasPriceUser.vue

@@ -333,6 +333,7 @@
           f_price_type: this.newinfo.pricetype[0],
           f_price_name: this.newinfo.pricename[0].f_price_name,
           f_price_id: this.newinfo.pricename[0].f_price_id,
+          f_perform_date: this.newinfo.pricename[0].f_perform_date,
           f_stairprice_id: this.newinfo.pricename[0].id,
           // 修改原因
           f_comments: this.newinfo.f_comments,

package/src/sale.js

@@ -873,6 +873,7 @@ export default function () {
   Vue.component('price-adjustment', (resolve) => { require(['./components/revenue/HandManager/PriceAdjustment'], resolve) })
   Vue.component('price-adjustment-manage', (resolve) => { require(['./components/revenue/HandManager/PriceAdjustmentManage'], resolve) })
   Vue.component('price-adjustment-card', (resolve) => { require(['./components/revenue/HandManager/PriceAdjustmentCard'], resolve) })
+  Vue.component('price-adjustment-webmeter', (resolve) => { require(['./components/revenue/HandManager/PriceAdjustmentWebmeter'], resolve) })
   // 收费记录补差
   Vue.component('price-adjustment-selling', (resolve) => { require(['./components/revenue/HandManager/PriceAdjustmentSelling'], resolve) })