sale-client 3.6.58 → 3.6.60

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
+const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn: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.58",
+  "version": "3.6.60",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.29",
+    "address-client": "3.2.56",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",

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

@@ -9,7 +9,7 @@
           <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
               <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
-                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">收费类型</label>
+                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">{{brandType}}</label>
                 <v-select id="f_brand_spec"
                           placeholder='请选择'
                           v-model="row.f_brand_spec"
@@ -175,6 +175,7 @@
   </div>
 </template>
 <script>
+import {HttpResetClass} from 'vue-client'
 let otherChargeGen = async function (self, parameter) {
   try {
     // 加入扫码盒付款码支付流水号
@@ -275,6 +276,7 @@ let asyncOtherCharge = async function (self) {
   self.model.f_use_type = self.config.billType
   self.model.f_bill_type = self.model.f_print
   self.hasValidateBill = self.config.hasBillManage
+  self.initSecuritypersons()
   // self.setTypename(self.model.f_brand_spec[0])
 }
 export default {
@@ -327,6 +329,7 @@ export default {
       typeNameList: [],
       typenumberList: [],
       brandspec: this.$appdata.getParam('品名及规格'),
+      brandType: this.$appdata.getSingleValue('其他收费类型') ? this.$appdata.getSingleValue('其他收费类型') : '收费类型',
       printstyle: this.$appdata.getParam('打印格式'),
       paytype: this.$appdata.getParam('付款方式'),
       feetype: this.$appdata.getParam('其他费用'),
@@ -347,6 +350,27 @@ export default {
     }
   },
   methods: {
+    // 初始化安检人
+    initSecuritypersons () {
+      let origin = this.$appdata.getSingleValue('服务人员来源')
+      if (origin) {
+        try {
+          this.services = []
+          let http = new HttpResetClass()
+          http.load('post', '/rs/search', {
+            source: `this.getParentByType($organization$).getChildByName($${origin}$).getUsers()`,
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            console.log('获取安检人员', res.data)
+            for (let i = 0; i < res.data.length; i++) {
+              this.services.push({label: res.data[i].name, value: res.data[i].name})
+            }
+          })
+        } catch (e) {
+          console.log('获取安检人员失败')
+        }
+      }
+    },
     setTypeprice (val) {
       console.log("单价变化：",val)
       if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {

package/src/components/revenue/comprehen/Bill/CustQueryEticket.vue

@@ -72,12 +72,9 @@
           </div>
         </div>
       </criteria>
-      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid :optional="true">
         <template partial='head'>
           <tr>
-            <th>
-              <input type="checkbox"  @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)" :checked="$parent.$parent.$parent.selectAll">
-            </th>
             <th>序号</th>
             <th>客户编号</th>
             <th>用户姓名</th>
@@ -90,9 +87,6 @@
           </tr>
         </template>
         <template partial='body'  >
-          <td style="text-align:center">
-            <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row">
-          </td>
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.f_userinfo_code}}</td>
           <td style="text-align:center">{{row.f_user_name}}</td>
@@ -173,21 +167,20 @@
       return {
         criteriaShow: false,
         f_filialeids: Vue.$login.f.orgids,
-        model: new PagedList('rs/sql/openSellelent', 50, {},),
+        model: new PagedList('rs/sql/openSellelent', 50, {}),
         f_outlets: Vue.$login.f.f_parentname,
         f_filiale: Vue.$login.f.f_fengongsi,
         f_operator: Vue.$login.f.name,
         f_orgstr: Vue.$login.f.orgpathstr,
-        f_filialeids: Vue.$login.f.f_orgids,
         invoice_is_pax: '征税',
         is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         selecteds: [],
-        eticket_show:false,
+        eticket_show: false,
         eticket_msg: false,
         invoice_show_gas: '否',
         show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
         row: {},
-        disabled:false,
+        disabled: false,
         mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
       }
     },
@@ -196,20 +189,21 @@
       this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
     },
     methods: {
-      closeEticket(){
-        this.eticket_msg=false
-        this.disabled=false
+      closeEticket () {
+        this.eticket_msg = false
+        this.disabled = false
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
       },
-      cancel(){
-        this.show=false
-        this.info={}
+      cancel () {
+        this.show = false
+        this.info = {}
       },
       async open_eTicket () {
-        if(this.selecteds.length>1){
+        this.selecteds = this.$refs.paged.$refs.grid.getRowData()
+        if (this.selecteds.length > 1) {
           this.$showAlert('选中条数大于一条，请重新修改！！', 'warning', 2000)
           return
         }
@@ -217,7 +211,7 @@
         let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
           data: {
             orderitem: 'f_userinfo_code',
-            condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
+            condition: `f_userinfo_code = '${this.selecteds[0].f_userinfo_code}'`
           }
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         this.row = row.data[0]
@@ -231,20 +225,20 @@
         if (!this.row.f_address_phone) {
           this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
         }
-        if(this.selecteds.map(item => item.f_type).toString()=='其他收费'){
-          this.disabled=true
+        if (this.selecteds.map(item => item.f_type).toString() == '其他收费') {
+          this.disabled = true
         }
 
         this.eticket_msg = true
       },
       confirm () {
         this.eticket_msg = false
-        this.disabled=false
+        this.disabled = false
         this.eticket_show = true
-        if(this.selecteds.map(item => item.f_type).toString()=='其他收费'||this.selecteds.map(item => item.f_type).toString()=='卡表收费'||this.selecteds.map(item => item.f_type).toString()=='发卡售气'){
-          this.invoice_show_gas='是'
+        if (this.selecteds.map(item => item.f_type).toString() == '其他收费' || this.selecteds.map(item => item.f_type).toString() == '卡表收费' || this.selecteds.map(item => item.f_type).toString() == '发卡售气') {
+          this.invoice_show_gas = '是'
         }
-        this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas,this.invoice_is_pax, this.selecteds.map(item => item.f_type).toString())
+        this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row,  this.selecteds[0].f_type)
       },
       eticket_toggle () {
         this.eticket_show = false
@@ -254,37 +248,23 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition=` f_orgid='${this.f_filialeids}' and ${args.condition}`
+        args.condition = ` f_orgid='${this.f_filialeids}' and ${args.condition}`
 
         await this.model.search(args.condition, this.model)
-        this.addOrRemove(true)
       },
       search () {
         this.$refs.paged.$refs.cri.search()
         this.$dispatch('refresh')
-      },
-      addOrRemove (is) {
-        this.selecteds = []
-        if (!is) { // 添加本页所有数据到ids中
-          this.model.rows.forEach((row) => {
-            this.selecteds.push(row)
-          })
-          this.selectAll = true
-        } else { // 从ids中取消所有的数据
-          this.selecteds = []
-          this.selectAll = false
-        }
-        console.log("selectdde",this.selecteds)
       }
     },
     computed: {
-      chargetypes(){
-        return [{label: '全部', value: ''},...this.$appdata.getParam('收费类型')]
-      },
+      chargetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      }
     },
-    watch:{
-      selecteds(){
-        console.log("框框的长度",this.selecteds.length)
+    watch: {
+      selecteds () {
+        console.log('框框的长度', this.selecteds.length)
       }
     }
   }

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

@@ -347,10 +347,10 @@ export default {
           // TODO 查询失败后保存发票详情
           await this.save_msg({
             f_eticket_id: ticket_id,
-            f_sign_result: result.errmsg,
+            f_sign_result: result.msg,
             f_bill_state: '开票失败'
           })
-          this.return_msg = '电子票开票出错,错误【' + result.errmsg + '】,请前往发票管理重新尝试'
+          this.return_msg = '电子票开票出错,错误【' + result.msg + '】,请前往发票管理重新尝试'
         } else {
           await this.save_msg({
             f_eticket_id: ticket_id,

package/src/filiale/shanxian/sale.js

@@ -42,7 +42,7 @@ export default function () {
   // 卡表收费
   Vue.component('card-meter-center', (resolve) => { require(['./components/revenue/CardMeterCenter'], resolve) })
   // 收费(综合)-其他收费xin
-  Vue.component('other-charge-new', (resolve) => { require(['./OtherChargeNew'], resolve) })
+  // Vue.component('other-charge-new', (resolve) => { require(['./OtherChargeNew'], resolve) })
   // 收费(综合)-换表
   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
   // 清零

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

@@ -636,6 +636,19 @@ export default {
       )
     },
     async apply () {
+      let data = {
+        items: 'id',
+        condition: `f_blobid = '${this.row.f_userinfo_id}' and f_uploaddate > '${this.$login.toStandardDateString()} 00:00:00'`,
+        tablename: '"t_files"',
+        orderitem: '"id"'
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/saleSingleTable', {data: data},
+        {resolveMsg: null, rejectMsg: '获取文件失败！！'})
+      if (!res.data.length > 0) {
+        this.$showAlert('请上传文件后再进行换标审批！！！', 'warning', 3000)
+        return
+      }
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请换表`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
       this.addTaskModel.f_memorandum = this.model.f_difference_reason

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

@@ -590,6 +590,19 @@ export default {
       )
     },
     async apply () {
+      let data = {
+        items: 'id',
+        condition: `f_blobid = '${this.row.f_userinfo_id}' and f_uploaddate > '${this.$login.toStandardDateString()} 00:00:00'`,
+        tablename: '"t_files"',
+        orderitem: '"id"'
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/saleSingleTable', {data: data},
+        {resolveMsg: null, rejectMsg: '获取文件失败！！'})
+      if (!res.data.length > 0) {
+        this.$showAlert('请上传文件后再进行清零审批！！！', 'warning', 3000)
+        return
+      }
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请清零`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
       this.addTaskModel.f_memorandum = this.model.f_difference_reason

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -54,7 +54,7 @@ export default {
       }
       await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
     },
-    async openETicket (sellId, row, show_gas, is_pax, type) {
+    async openETicket (sellId, row,type, show_gas ='是', is_pax ='征税') {
       try {
         let model = {
           id: sellId,

package/src/filiale/wenxi/IOTRefund.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+            <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+             <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        style="width:60%"
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        v-ref:payment
+                        close-on-select clear-button></v-select>
+
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+
+              <v-select id="print"
+                        v-model="f_print"
+                        style="width:60%"
+                        placeholder='请选择'
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">剩余气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">核算单价</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_price" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按金额'">
+            <label class="font_normal_body">剩余金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_amount" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [0, ">=" ]}' placeholder="冲减气量" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [data.f_balance_gas, "<=" ]}' placeholder="冲减气量" >
+          </div>
+        </div>
+
+        <div class="row">
+
+          <div class="col-sm-8">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <input class="input_search" style="width:80%"  v-model="model.f_comments">
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%"
+                   type="number" v-model="model.f_refund_fee"
+                    placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance_amount, "<=" ]}' placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid||!check'>确认</button>
+        <button class="button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+  </div>
+
+  <upload :blodid="data.f_userinfo_id"  isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'IOTRefund')
+    // 默认打印格式
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.hasValidateBill = self.config.hasBillManage
+  }
+
+  export default {
+    title: '物联网表退费',
+    data () {
+      return {
+        config: {
+          showupload: false, // 默认不上传附件
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          overBalance: false,   //为true时退费金额可以大于余额
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          payment: '现金缴费',
+          billType: '燃气费'
+        },
+        model: {
+          f_refund_fee: '',
+          f_refund_gas: '',
+          f_comments: '',
+          f_payment: '',
+          f_print: '',
+          f_price: 0
+        },
+        check:true,
+        blodid: '',
+        hasValidateBill: false,
+        validateOk: false,
+
+        printModel: {},
+        print: false,
+        billUrl: '',
+        billData: {
+          url: 'rs/report/refund_sell',
+          bill: ''
+        },
+
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式')
+      }
+    },
+    props: ['data'],
+    ready () {
+      readyGen(this)
+      if (this.data.f_collection_type === '按气量') {
+        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+        this.model.f_price = this.data.f_price
+
+        // this.$dispatch('refresh')
+      }
+      console.log(123)
+      if(this.data.f_calculation!=='系统结算'){
+        this.check = false
+       this.$showAlert('表端计费表不支持扣费！！', 'warning', 3000)
+      }
+    },
+    methods: {
+        async confirm () {
+        let param = {
+          f_user_id: this.data.f_user_id,
+          f_userfiles_id: this.data.f_userfiles_id,
+          version: this.data.version,
+          f_price: this.model.f_price,
+          f_refund_gas: this.model.f_refund_gas,
+          f_refund_fee: this.model.f_refund_fee,
+          f_comments: this.model.f_comments,
+          f_collection_type: this.data.f_collection_type,
+          f_payment: this.model.f_payment[0],
+          f_print: this.model.f_print[0],
+          f_price_id: this.data.f_price_id,
+          f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
+          f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+          f_stairprice_id: this.data.f_stairprice_id,
+          operInfo: {
+            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
+          }
+        }
+        console.log('退费传参', param)
+        let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+        console.log('退费', res)
+        console.log('退费this.config', this.config)
+        console.log('退费this.model', this.model)
+        if (this.config.hasPrint) {
+          if (this.model.f_print.indexOf('电子发票') == -1) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+            // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+            // TODO
+            this.$dispatch('success')
+          }
+        }else{
+          this.$dispatch('success')
+        }
+      },
+      refundChange () {
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      clean () {
+        this.$dispatch('refresh')
+      },
+      printok () {
+        this.$dispatch('success')
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+        this.billData.bill = val.bill
+      }
+    },
+    watch:{
+      'model.f_price'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      'model.f_refund_gas'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      }
+    }
+  }
+</script>

package/src/filiale/wenxi/UserDeviceInfoTest.vue

@@ -269,7 +269,7 @@ export default {
       builders: this.$appdata.getParam('施工单位'),
       is_zibifa: this.$appdata.getParam('有无自闭阀'),
       f_make_date: '',
-      f_expire_date: '',
+      f_expire_date: null,
       f_service_life: 0,
       devicesinfoShow: true
     }
@@ -307,8 +307,9 @@ export default {
       console.log('表具信息', this.devicesinfo)
     },
     expireDate (index) {
-      if (this.devicesinfo[index].f_make_date === '' || this.devicesinfo[index].f_make_date === undefined || this.devicesinfo[index].f_service_life === 0 || this.devicesinfo[index].f_service_life === undefined) {
-
+      console.log(this.devicesinfo[index].f_make_date)
+      if (!this.devicesinfo[index].f_make_date || this.devicesinfo[index].f_service_life === 0 || this.devicesinfo[index].f_service_life === undefined) {
+        this.devicesinfo[index].f_expire_date = null
       } else {
         var b = new Date(this.devicesinfo[index].f_make_date)
         var year = (b.getFullYear() - 0) + (this.devicesinfo[index].f_service_life - 0)

package/src/filiale/wenxi/UserPriceChangeManage.vue

@@ -0,0 +1,662 @@
+<template>
+  <div id="unit" class="flex-row">
+    <validator name='m'>
+    <div class="basic-main" style="margin-left: 1%;" >
+
+          <criteria-paged :model="model" v-ref:paged  @sort="sort" >
+            <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>
+                    <res-select
+                      restype='organization'
+                      @res-select="$parent.$parent.getorg"
+                      is-mul="false"
+                      :initresid='$parent.$parent.curorgid'
+                    >
+                    </res-select>
+                  </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_userinfo_code"
+                           @keyup.enter="search()"  condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                  </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"
+                           @keyup.enter="search()"  condition="f_user_name = '{}'" placeholder='客户姓名'>
+                  </div>
+
+                  <div style="float:right">
+                    <button class="button_search" @click="search(), $parent.$parent.clean()">查询</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-if="$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%" v-model="model.f_olduserinfo_code" placeholder='客户编号'
+                           condition="f_olduserinfo_code = '{}'">
+                  </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_meternumber" placeholder='表号'
+                           condition="f_meternumber = '{}'">
+                  </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_card_id" placeholder='卡号'
+                           condition="f_card_id = '{}'">
+                  </div>
+                  <div class="form-group col-sm-2">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                              :options='$parent.$parent.gasproperties2' placeholder='用气性质'
+                              close-on-select condition="f_gasproperties='{}'"></v-select>
+                  </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_phone" placeholder='客户电话'
+                           condition="f_user_phone = '{}'">
+                  </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_address"
+                           condition="f_address like '%{}%'" placeholder='客户地址'>
+                  </div>
+                </div>
+              </div>
+            </criteria>
+            <data-grid :model="model" class="list_area table_sy" v-ref:grid partial='list'>
+              <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'>
+                <td style="text-align: center;">{{$index + 1}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_userinfo_code}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_user_name}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_meternumber}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_card_id}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_address}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_price_name}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_meter_brand}}</td>
+                <td style="text-align: center;white-space: nowrap;">{{row.f_user_state}}</td>
+                <td style="text-align: center;white-space: nowrap;">
+                  <button  type="button" name="button" class="button_search button_spacing width-60"
+                          @click.stop="$parent.$parent.$parent.priceshow(row)">调价
+                  </button>
+                </td>
+                <td style="text-align: center;white-space: nowrap;">
+                  <button type="button" name="button" class="button_search button_spacing width-60"
+                          @click.stop="$parent.$parent.$parent.lookOver(row)">查看
+                  </button>
+                </td>
+              </template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+
+    <modal :show.sync="show" width="50%" backdrop="false" style="overflow: scroll;">
+
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title" style="text-align: center;">气价调整</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="panel panel-primary datapanel">
+          <form class="form-horizontal">
+            <div class="form-group">
+              <div class="row">
+                <div class="col-sm-4 flex-row ">
+                  <label class="control-label">客户编号</label>
+                  <p class="form-control-static">{{row.f_userinfo_code}}</p>
+                </div>
+                  <div class="col-sm-4 flex-row ">
+                <label class="control-label">客户名称</label>
+                <p class="form-control-static">{{row.f_user_name}}</p>
+                  </div>
+                  <div class="col-sm-4 flex-row ">
+                <label class="control-label">客户电话</label>
+                <p class="form-control-static">{{row.f_user_phone}}</p>
+                 </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 flex-row ">
+                  <label class="control-label">客户地址</label>
+                  <p class="form-control-static">{{row.f_address}}</p>
+                </div>
+              </div>
+            </div>
+          </form>
+
+        </div>
+
+        <div class="panel panel-primary datapanel">
+          <form class="form-horizontal select-overspread">
+            <div class="form-group">
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">旧气价信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">客户类型</label>
+                  <p class="form-control-static">{{row.f_user_type}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">用气性质</label>
+                  <p class="form-control-static">{{row.f_gasproperties}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">气价类型</label>
+                  <p class="form-control-static">{{row.f_price_type}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">气价名称</label>
+                  <p class="form-control-static">{{row.f_price_name}}</p>
+                </div>
+            </div>
+
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">新气价信息</label>
+                </div>
+              </div>
+
+              <div class="row" style="margin-top: 2%">
+                <label class="radio-inline col-sm-3">
+                  <input type="radio" value="系统气价" v-model="model.type" class="magic-radio" checked id="type_two">
+                  <label for="type_two">系统气价</label>
+                  <!-- <strong>IC卡丢失或损坏</strong> -->
+                </label>
+                <label class="radio-inline col-sm-4">
+                  <input type="radio" value="自定义气价" v-model="model.type" class="magic-radio" id="type_three">
+                  <label for="type_three">自定义气价</label>
+                  <!-- <strong>IC卡信息错乱</strong> -->
+                </label>
+              </div>
+              <div class="row" style="margin-top: 2%" v-if="model.type ==='自定义气价'">
+
+                <div :class="[$m.f_price_type.required ? 'has-error' : '']" class="col-sm-4 form-group">
+                  <input class="input_search" style="width:60%" type="text" v-model="newinfo.f_price_type" v-show="false"
+                         v-validate:f_price_type='{required: true }'>
+                  <label title="参数:气价类型" class="font_normal_body" for="f_price_type">气价类型</label>
+                  <v-select :disabled='isEdit'
+                            :options='pricetype'
+                            :value-single="true"
+                            :value.sync="newinfo.f_price_type"
+                            close-on-select
+                            id="f_price_type"
+                            placeholder='请选择'
+                            v-model="newinfo.f_price_type">
+                  </v-select>
+                </div>
+                  <div  class="col-sm-4" :class="[$m.f_price_name.required ? 'has-error' : 'has-success']">
+                      <label for="f_price_name" class="font_normal_body">气价名称</label>
+                      <input style="width:60%" class="input_search" type="text" v-model="newinfo.f_price_name"
+                             v-validate:f_price_name='{required: true }'  placeholder="气价名称">
+                  </div>
+                <div :class="[$m.f_stairmonths.required || $v.f_stairmonths.dctest ? 'has-error' : 'has-success']" class="col-sm-4 form-group"v-if="newinfo.f_price_type ==='阶梯气价'">
+                  <label class="font_normal_body" for="f_stairmonths">阶段月数</label>
+                  <input class="input_search" style="width:60%" type="number"
+                         v-model="newinfo.f_stairmonths" v-validate:f_stairmonths='{required: true, dctest: [ 12, "<=" ] }'>
+                </div>
+                <div  :class="[$m.f_stair_start_date.required ? 'has-error' : 'has-success']" class="col-sm-4 form-group" v-if="newinfo.f_price_type ==='阶梯气价'">
+                <input class="input_search" style="width:60%" type="text" v-model="newinfo.f_stair_start_date" v-show="false"
+                       v-validate:f_stair_start_date='{required: true }'>
+                <label class="font_normal_body"  for="f_stair_start_date">开始日期</label>
+                <datepicker :format="'yyyy-MM-dd'"
+                            :value.sync="newinfo.f_stair_start_date"
+                            class="datepicker"
+                            id="f_stair_start_date"
+                            placeholder="阶梯开始日期"
+                            style="width: 60%"
+                            v-model="newinfo.f_stair_start_date">
+                </datepicker>
+              </div>
+
+                <div  class="col-sm-4" :class="[$m.f_price.required ? 'has-error' : 'has-success']" v-if="newinfo.f_price_type ==='固定气价'">
+                  <label for="f_price" class="font_normal_body">&nbsp;&nbsp;&nbsp;单价&nbsp;&nbsp;&nbsp;</label>
+                  <input style="width:60%" class="input_search" type="number" v-model="detailprice[0].f_price"
+                         v-validate:f_price='{required: true }'  placeholder="单价">
+                </div>
+                <div class='auto' style="margin-top: 10px;">
+                <stair-price :isheat.sync="model.f_isheat" :stairmodel.sync='detailprice'
+                             v-if="newinfo.f_price_type ==='阶梯气价'"></stair-price>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%" v-if="model.type ==='系统气价'">
+                <div class="col-sm-4 flex-row" >
+                  <label class="control-label">用户类型</label>
+                  <v-select :value.sync="newinfo.f_user_type"
+                            :options='usertypes' placeholder='用户类型'
+                            @change="userTypeChange()"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-4 flex-row"
+                     :class="[$m.gas.required ? 'has-error' : '']">
+                  <label class="control-label">用气性质</label>
+                  <input type="text" v-show="false" v-model="$refs.gas.selectedItems" v-validate:gas='{required: true }'>
+                  <v-select :value.sync="newinfo.f_gasproperties" v-model="newinfo.f_gasproperties"
+                            :options='gasproperties' placeholder='用气性质'
+                            close-on-select v-ref:gas></v-select>
+                </div>
+                <div class="col-sm-4 flex-row" :class="[$m.type.required ? 'has-error' : '']">
+                  <label class="control-label">气价类型</label>
+                  <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
+                            placeholder='气价类型' :options="pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                  <input type="text" v-show="false" v-model="$refs.type.selectedItems" v-validate:type='{required: true }'>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%" v-if="model.type ==='系统气价'">
+
+                <div class="col-sm-4 flex-row" :class="[$m.name.required ? 'has-error' : '']">
+                  <label class="control-label">气价名称</label>
+                  <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
+                            placeholder='气价名称' :options="getPricenames()" @change="priceChange"
+                            close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
+                  <input type="text" v-show="false" v-model="$refs.name.selectedItems" v-validate:name='{required: true }'>
+                  <span class="col-sm-3" v-if="newinfo.pricetype.length === 1 && gasproperties.length === 0"
+                        style="color:red;text-align:right">请确定用气性质已选择！！</span>
+                </div>
+
+                <div class="col-sm-4 flex-row">
+                  <label class="control-label">气价备注</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="newinfo.f_price_comments" placeholder='气价备注' disabled>
+                </div>
+
+                <div  class="col-sm-4 flex-row"  >
+                  <label class="control-label" >生效日期</label>
+                  <input class="input_search" style="width:60%" type="text" v-model="preformdate"
+                         :disabled="true">
+                </div>
+
+              </div>
+            </div>
+          </form>
+        </div>
+
+        <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="单户调价"></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" :disabled='!$m.valid ' @click="modifyUser">确定</button>
+        <button type="button" class="button_clear" @click='close'>取消</button>
+      </footer>
+
+    </modal>
+
+
+      <modal :backdrop="false" :show.sync="showPopUps" v-if="showPopUps" width="1000px">
+        <header class="modal-header" slot="modal-header">
+          <button @click="showPopUps=!showPopUps" class="close" type="button"><span>&times;</span></button>
+          <h4 class="modal-title">历史记录</h4>
+        </header>
+        <article class="modal-body"  slot="modal-body"  style="height:100%;width:100%"  title="历史记录">
+          <user-price-change-history :row="row"  :show.sync="showPopUps" v-on:toggle="close"></user-price-change-history>
+        </article>
+        <footer class="modal-footer" slot="modal-footer">
+
+        </footer>
+      </modal>
+    </validator>
+
+  </div>
+
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import Vue from 'vue'
+
+  let loadParamGem = async function (self) {
+    if (!self.f_filialeid) {
+      self.f_filialeid = self.$login.f.orgid
+    }
+    await self.$LoadParams.loadParam(self.f_filialeid)
+  }
+
+  export default {
+    title: '单户调价',
+    data () {
+      return {
+        model: new PagedList('rs/sql/sale_getUserPrice', 30, {orderitem: '"f_userinfo_id DESC"'}),
+        row: null, // 选择一条客户信息，对其进行修改
+        rows: [], // 客户档案选择一条时，将只显示一条信息，rows用来存放整页的数据
+        orderDefault: 'f_createfile_date desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
+        config: {
+          showupload: true
+        },
+        detailprice: [],
+        newinfo: {
+          f_user_type: '',
+          f_gasproperties: '',
+          pricetype: '',
+          pricename: '',
+          f_perform_date: this.$login.toStandardDateString() + ' 00:00:00' // 操作时间
+        },
+        preformdate: this.$login.toStandardDateString() + ' 00:00:00',
+        showPerformDate: false,
+        show: false,
+        showPopUps: false,
+        curorgid: [this.$login.f.orgid],
+        f_filialeid: this.$login.f.orgid,
+        criteriaShow: false,
+        valid: false,
+        pricetype: [{label: '固定气价', value: '固定气价'}, {label: '阶梯气价', value: '阶梯气价'}],
+        gasproperties: [],
+        gasproperties2: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
+        usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : []
+        // userstates: [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
+      }
+    },
+    methods: {
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.newinfo.f_user_type.length === 1) {
+          this.gasproperties = this.$appdata.getParam(this.newinfo.f_user_type[0])
+        }
+      },
+
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      priceshow (row) {
+        this.show = true
+        this.showPerformDate = (row.f_calculation == '表端结算')
+        this.row = row
+      },
+      lookOver (row) {
+        this.showPopUps = true
+        this.row = row
+      },
+      getPricenames () {
+        console.log('气价。，。。', this.newinfo.pricetype, this.newinfo.f_user_type, this.newinfo.f_gasproperties)
+        let rs = []
+        if (this.newinfo.f_user_type.length === 1 && this.newinfo.f_gasproperties.length === 1 && this.newinfo.pricetype.length === 1) {
+          let params = {
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0],
+            filter: this.f_filialeid
+          }
+          rs = this.$GetSaleParam.getPriceAll(params)
+        }
+        if (rs.length === 0) {
+          this.newinfo.f_price_name = ''
+        }
+        return rs
+      },
+      priceChange (val) {
+        if (val && val.length > 0) {
+          // 展示气价备注
+          this.$set('newinfo.f_price_comments', val[0].f_comments ? val[0].f_comments : '无')
+        }
+      },
+      close () {
+        this.showPerformDate = false
+        this.show = false
+        this.row = null
+        this.newinfo = {
+          f_user_type: '',
+          f_gasproperties: '',
+          pricetype: '',
+          pricename: ''
+        }
+      },
+      async modifyUser () {
+        if (this.model.type === '系统气价') {
+          let param = {
+            f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
+            f_user_id: this.row.f_user_id,
+            f_user_name: this.row.f_user_name,
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0],
+            f_price_id: this.newinfo.pricename[0].f_price_id,
+            f_filialeid: this.f_filialeid,
+            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_perform_date: this.row.f_perform_date,
+            f_change_reason: ''
+          }
+
+          await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+
+          this.criteriaShow = false
+          this.close()
+          this.search()
+        } else if (this.model.type === '自定义气价') {
+          let data = {
+            f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
+            f_user_id: this.row.f_user_id,
+            f_user_name: this.row.f_user_name,
+            f_price_type: this.newinfo.f_price_type,
+            f_price_name: this.newinfo.f_price_name,
+            f_user_type: this.row.f_user_type,
+            f_gasproperties: this.row.f_gasproperties,
+            f_perform_date: '2021-01-01 00:00:00',
+            f_perform_date_change: this.row.f_perform_date,
+            f_end_date: '2099-12-31 23:59:59',
+            f_islow_income: 0,
+            f_limit_cycle: 0,
+            f_limit_gas: 0,
+            f_stairmonths: null,
+            f_population_base: null,
+            f_stair_start_date: null,
+            f_isheat: 0,
+            f_deduction_way: 'cycle',
+            f_heat_start_date: null,
+            f_heat_cycle: null,
+            f_priority: 100,
+            f_comments: '',
+            f_state: '有效',
+            f_filialeid: this.f_filialeid,
+            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,
+            userid: this.$login.f.id,
+            audit: false,
+            type: '添加',
+            detailprice: this.detailprice,
+            f_custom: '自定义气价'
+          }
+          if (this.newinfo.f_price_type === '阶梯气价') {
+            data.f_stairmonths = this.newinfo.f_stairmonths
+            data.f_population_base = 0
+            data.f_stair_start_date = this.newinfo.f_stair_start_date
+          }
+          if (data.f_price_type === '固定气价') {
+            if (data.detailprice[0].id) {
+              delete data.detailprice[0].id
+            }
+            data.detailprice[0].f_price_name = 1
+          } else if (data.f_price_type === '阶梯气价') {
+            data.detailprice.forEach((item, index) => {
+              data.detailprice[index].f_price_name = index + 1
+              if (data.detailprice[index].id) {
+                if (delete data.detailprice[index].id) {
+                  delete data.detailprice[index].id
+                }
+              } else if (data.detailprice[index].f_ratio) {
+                data.detailprice[index].f_ratio = null
+              } else if (!data.detailprice[index].f_add_gas) {
+                data.detailprice[index].f_add_gas = 0
+              } else if (!data.detailprice[index].f_add_gas_heat) {
+                data.detailprice[index].f_add_gas_heat = 0
+              }
+            })
+          }
+
+          this.$resetpost('rs/logic/customprice', {data: data}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+
+          this.criteriaShow = false
+          this.close()
+          this.search()
+        }
+      },
+      clean () {
+        this.row = null
+        this.areainfo = null
+        this.$refs.paged.$refs.grid.select(null)
+        this.$refs.paged.$refs.grid.model.rows = this.rows
+      },
+
+      selfSearch (args) {
+        console.log('开始查询档案', this.f_filialeid)
+        if (this.f_filialeid && this.f_filialeid !== '') {
+          args.condition = `${args.condition} and f_filialeid = '${this.f_filialeid}'`
+        } else {
+          args.condition = `${args.condition} and f_filialeid = '${this.$login.f.orgid}'`
+        }
+        this.criteriaShow = false
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        this.model.search(args.condition, args.model)
+        this.clean()
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+
+      clear () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = []
+        })
+      },
+      getorg (val) {
+        this.f_filialeid = val[0]
+      }
+    },
+    ready () {
+      // this.search()
+    },
+    watch: {
+      // 每次查询将查询到的数据存储起来，供选择操作后的替换
+      'model.state' (val) {
+        if (val === '正确') {
+          this.rows = this.model.rows
+        }
+      },
+      'newinfo.f_price_type' (val) {
+        if (val === '固定气价') {
+          this.detailprice = []
+        } else if (val === '阶梯气价') {
+          this.detailprice = [{f_gas: '', f_price: '', f_add_gas: 0, f_add_gas_heat: 0}]
+        }
+      },
+      'show' (val) {
+        if (!val) {
+          this.newinfo = {
+            f_user_type: '',
+            f_gasproperties: '',
+            pricetype: '',
+            pricename: ''
+          }
+          this.row = null
+        } else {
+          this.newinfo = {
+            f_user_type: [this.row.f_user_type],
+            f_gasproperties: [this.row.f_gasproperties],
+            pricetype: [this.row.f_price_type],
+            pricename: ''
+          }
+        }
+      },
+      'f_filialeid' (val) {
+        loadParamGem(this)
+      },
+      async 'newinfo.pricename' () {
+        if (this.newinfo.pricename == null || !(this.newinfo.pricename instanceof Array) || this.newinfo.pricename.length == 0) return
+        let qij = await this.$resetpost('rs/sql/saleSingleTable', {
+          data: {
+            tablename: 't_stairprice',
+            condition: ` f_price_id = ${this.newinfo.pricename[0].f_price_id} and getDate()>= f_perform_date and  getDate()<f_end_date `
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        if (qij.data && qij.data.length > 0) {
+          this.preformdate = qij.data[0].f_perform_date
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+
+  .datapanel {
+     color: #333;
+     background-color: white;
+     box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+     padding: 10px 30px 10px 30px;
+     height: auto;
+     border-radius:15px;
+   }
+
+</style>

package/src/filiale/wenxi/sale.js

@@ -4,6 +4,8 @@ import Vue from 'vue'
 export default function () {
   // 卡表抄表
   Vue.component('cards-hand', (resolve) => { require(['./cardsHand'], resolve) })
+  // 单户调价
+  Vue.component('user-pricechange-manage', (resolve) => { require(['./UserPriceChangeManage'], resolve) })
   // 表具停用
   Vue.component('disable-manage', (resolve) => { require(['./DisableManage'], resolve) })
   Vue.component('iot-meter-center', (resolve) => { require(['./IOTMeterCenter'], resolve) })
@@ -41,4 +43,6 @@ export default function () {
   Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
   // 使用该气价的用户信息
   Vue.component('gasprice-user', (resolve) => { require(['./GasPriceUser'], resolve) })
+  // 使用该气价的用户信息
+  Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
 }

package/src/main.js

@@ -3,8 +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 wenxi from './filiale/yuansheng/sale'
-// import FilialeSale from './filiale/yuansheng/sale'
+import FilialeSale from './filiale/qianneng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -15,8 +14,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-wenxi()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')