sale-client 4.0.40-preview → 4.0.41-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/fugou/OtherChargeQueryUser.vue

@@ -0,0 +1,253 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_operate_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_operate_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">是否有效</label>
+                <v-select :value.sync="model.f_state" v-model='model.f_state'
+                          style="width:60%"
+                          :options='$parent.$parent.isstates' placeholder='是否有效'
+                          close-on-select
+                          condition="f_state = '{}'"></v-select>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
+                            @print-data="$parent.$parent.print()" print-name="其他收费流水"></print-data>
+              </div>
+            </div>
+
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' 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>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <th style="text-align:center">{{row.f_brand_spec}}</th>
+              <th style="text-align:center">{{row.f_typename}}</th>
+              <th style="text-align:center">{{row.f_typenumber}}</th>
+              <th style="text-align:center">{{row.f_number}}</th>
+              <th style="text-align:center">{{row.f_unitprice}}</th>
+              <th style="text-align:center">{{row.f_discount_amount}}</th>
+              <th style="text-align:center">{{row.f_unitprice*row.f_number-row.f_discount_amount}}</th>
+              <th style="text-align:center">{{row.f_operator}}</th>
+              <th style="text-align:center">{{row.f_operate_date}}</th>
+              <td style="text-align: center;">{{row.f_state}}</td>
+              <th style="text-align:center">{{row.f_comments}}</th>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+    </div>
+    <table class="table-hover">
+      <tr class="table-bordered" style="position: relative">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          金额合计:&emsp;{{model.sums.f_collection}}
+        </td>
+      </tr>
+    </table>
+  </div>
+  <other-charge-query-user-detail v-if="showdetail" :otherchargeid="otherchargeid" :showdetail.sync="showdetail"></other-charge-query-user-detail>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import OtherChargeQueryUserDetail from './OtherChargeQueryUserDetail'
+
+export default {
+    title: '其他收费查询',
+    components: {
+      OtherChargeQueryUserDetail
+    },
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('api/af-revenue/sql/sale_OtherChargeQuery', 20, {}, {
+          f_collection: 0
+        }),
+        isstates: this.$appdata.getParam('是否有效') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('是否有效')] : [],
+        // 控制单选
+        radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+        showdetail: false,
+        otherchargeid: '',
+        // 选中的页
+        all: [],
+        // row数据
+        rowsdata: [],
+        // fields:{'f_brand_spec': '品牌','f_number': '数量','f_unitprice': '单价','f_collection':'收款','f_operator':'操作员', 'f_operate_date':'操作日期'},
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_brand_spec': '品牌', 'f_collection': '收款', 'f_operator': '操作员', 'f_operate_date': '操作日期'},
+        defaultfield: [
+          // "f_brand_spec","f_number","f_unitprice",'f_collection','f_operator',"f_operate_date"
+          'f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_collection', 'f_operator', 'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/sale_OtherChargeQuery', {
+          data: {
+            condition: this.condition
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.printModel.rows = res.data
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      print () {
+        this.selectInit()
+      },
+      select () {
+        let index = this.model.pageIndex - 1
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+        let z = 0
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            this.printModel.rows[z++] = this.rowsdata[i][j]
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      },
+      showchargedetail (row) {
+        this.showdetail = true
+        this.otherchargeid = row.id
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/fugou/OtherChargeQueryUserDetail.vue

@@ -0,0 +1,81 @@
+
+<template >
+  <div class="auto">
+    <modal :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+          <data-grid :model="model" class="list_area table_sy" partial='list' 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>
+              </tr>
+            </template>
+            <template partial='body' partial='list' v-ref:grid>
+              <tr >
+                <td style="text-align:center;">{{$index+1}}</td>
+                <th style="text-align:center">{{row.f_brand_spec}}</th>
+                <th style="text-align:center">{{row.f_number}}</th>
+                <th style="text-align:center">{{row.f_unitprice}}</th>
+                <th style="text-align:center">{{(row.f_number-0)*(row.f_unitprice-0)}}</th>
+                <th style="text-align:center">{{row.f_typename}}</th>
+                <th style="text-align:center">{{row.f_typenumber}}</th>
+
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '抄表',
+    data () {
+      return {
+        model: {
+          rows: []
+        }
+
+      }
+    },
+    props: ['otherchargeid', 'showdetail'],
+    ready () {
+      this.search()
+    },
+    methods: {
+      async search () {
+        // 获取这个气价的所有记录
+        this.model.rows = []
+        let data = {
+          tablename: `t_othercharge_detail`,
+          items: '*',
+          condition: '1=1',
+          orderitem: 'id'
+        }
+        if (this.otherchargeid) {
+          data.condition = `f_othercharge_id = '${this.otherchargeid}'`
+        }
+
+        let res = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {data: data}, {rejectMsg: '获取气价记录出错', resolveMsg: null})
+        this.model.rows = res.data
+      }
+
+    },
+    watch: {
+      'showdetail' (val) {
+        if (val) {
+          this.search()
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/fugou/UserInfoDetailManageNew.vue

@@ -0,0 +1,238 @@
+<template>
+  <div class="binary flex" >
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto">
+        <user-base-info-new :row="row" :buttonshow="buttonshow"
+                            @refresh="search"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+        @search-main="search"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+        <saletab header="用户重点记录" >
+          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
+        </saletab>
+<!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
+<!--          <supervisory-control :row="row"  ></supervisory-control>-->
+<!--        </saletab>-->
+<!--        <saletab header="报装收费记录"   v-if="permission('报装收费记录查看')">-->
+<!--          <apply-charge-search :row="row"  ></apply-charge-search>-->
+<!--        </saletab>-->
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
+import OtherChargeQueryUser from './OtherChargeQueryUser'
+import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+
+// 导入物联网相关查询
+import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+import WatchCollection from '../../components/common/userinfo_detail/iot_detail/WatchCollection'
+import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery,
+      UserDeviceQuery,
+      contractSigningList,
+      // SupervisoryControl,
+      // ApplyChargeSearch
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        } else if (this.f_userinfo_code) {
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }else{
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
+        }
+
+        let getBaseInfo = await http.load('POST', 'api/af-revenue/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
+      },
+
+      cancel (val) {
+        // 判断当前是否在 iframe 环境中
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'goBack'}, '*')
+        } else {
+          this.$emit('cancel-main', val)
+        }
+      },
+
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/fugou/components/charge/business/OtherChargeNew.vue

@@ -62,9 +62,17 @@
                        :value.sync="row.f_number"
                        placeholder="数量" v-next-el='sk' v-el:sl>
               </div>
+              <div class="col-sm-4" :class="{'has-success':row.f_discount_amount,'has-error':!row.f_discount_amount}">
+                <label style="" for="f_discount_amount" class=" font_normal_body">&nbsp;优惠金额</label>
+                <input class="input_search" style="width:60%" type="number" min="1" @input.prevent="getcollection()"
+                       v-validate:f_discount_amount='{required: true, dctest: [0, ">" ] }'
+                       v-model="row.f_discount_amount"
+                       :value.sync="row.f_discount_amount"
+                       :disabled="false"
+                       placeholder="优惠金额" v-next-el='sl'>
+              </div>
               <div style="padding-top:10px">
-                <button type="button" class="glyphicon glyphicon-minus btn-danger"
-                        @click.stop="delthisdetail($index)"></button>&nbsp;&nbsp;&nbsp;
+                <button type="button" class="glyphicon glyphicon-minus btn-danger" @click.stop="delthisdetail($index)"></button>&nbsp;&nbsp;&nbsp;
                 <button type="button" class="glyphicon glyphicon-plus btn-success" @click.stop="addadetail()"></button>
               </div>
             </div>
@@ -300,6 +308,7 @@ export default {
         f_number: 0,
         f_unitprice: 0,
         f_collection: 0,
+        f_discount_amount: 0,
         f_comments: '',
         f_voucher_number: '',
         f_service_person: '',
@@ -307,7 +316,7 @@ export default {
         t_userfees: '',
         f_fee_type: ['其他费用'],
         f_fee_time: ['12'],
-        otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: ''}]
+        otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: '', f_discount_amount:''}]
       },
       eticket_msg: false,
       mjshow: false,
@@ -533,7 +542,9 @@ export default {
         if (!item.f_number || item.f_number == '0') flag = false
         if (!item.f_unitprice || item.f_unitprice == '0') flag = false
         if (item.f_unitprice && item.f_number) {
-          money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
+          // 新增优惠金额
+          const discount = item.f_discount_amount ? parseFloat(item.f_discount_amount) : 0
+          money += ((item.f_unitprice - 0) * (item.f_number - 0)) - discount
         } else {
           flag = false
           this.model.f_collection = 0
@@ -545,7 +556,7 @@ export default {
       if (!flag) this.model.f_collection = ''
     },
     addadetail () {
-      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: ''})
+      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: '',f_discount_amount:''})
       console.log(JSON.stringify(this.model.otherdetail))
     },
     delthisdetail (index) {

package/src/filiale/fugou/sale.js

@@ -88,4 +88,7 @@ export default function () {
   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
   // 获取气表信息
   Vue.component('meter-message', (resolve) => { require(['./components/revenue/Common/MeterMessage'], resolve) })
+    // 单用户查询界面
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
+
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/beifangshiye/sale'
+import FilialeSale from './filiale/fugou/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'