sale-client 3.6.254 → 3.6.255

package/package.json

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

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

@@ -36,7 +36,7 @@
             <div class="col-sm-4 form-group"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
-              <input class="input_search" style="width:60%" @keyup.enter="preamount()" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
+              <input class="input_search" style="width:60%" @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm)),preamount()" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
                      :disabled="config.calculatePreByCollection"
                      v-scale="[model.f_preamount, row.f_fee_decimal||4]" placeholder="预购金额" >

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

@@ -198,6 +198,10 @@
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large"
                   v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
+          <strong style="font-size: 16px"
+                  v-if="!config.notShowFormula && pricetext">合表气价:{{ pricetext }}</strong><br/>
+          <text style="font-size: 16px;font-style: italic;" class="text-info"
+                v-if="!config.notShowFormula && pricetext">合表气价公式:(居民单价×居民面积+非居民单价×非居民面积)÷(居民面积+非居民面积)</text><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -314,6 +318,7 @@ let preamountGen = async function (self) {
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
   self.calText(getGas.data.chargeprice)
+  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext:null
 }
 
 // 输入气量，换算金额
@@ -334,6 +339,7 @@ let pregasGen = async function (self) {
     if (self.config.floor) {
       self.model.f_collection = Math.ceil(self.model.f_collection)
     }
+    self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
     self.calText(getAmount.data.chargeprice)
   }
 }
@@ -469,6 +475,7 @@ export default {
   data () {
     return {
       serialShow: false,
+      pricetext: null,
       resid: [],
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示

package/src/components/revenue/comprehen/Maintenance/revenue/MeterOperatemain.vue

@@ -76,13 +76,13 @@
           </div>
         </div>
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="参数:操作时间, 权限:【收费记录时间修改】">
             <label class="font_normal_body">操作时间</label>
             <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
             <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
                         v-model="model.f_operate_date"
                         :value.sync="model.f_operate_date"
-                        :disabled="true"
+                        :disabled="editDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
@@ -228,6 +228,7 @@
           'f_serial_number' : '业务单号'
         },
         editstate:true,
+        editDate:true
       }
     },
     props: {
@@ -242,6 +243,9 @@
       if(this.$login.r.includes('收费记录状态修改')){
         this.editstate=false
       }
+      if(this.$login.r.includes('收费记录时间修改')){
+        this.editDate=false
+      }
       this.oldmodel = JSON.parse(JSON.stringify(this.model))
       this.model.f_bill_state = [this.oldmodel]
       console.log('看看收费id', this.oldmodel)

package/src/filiale/qianneng/ChangeMeter.vue

@@ -409,6 +409,7 @@ export default {
       books: {
         data: []
       },
+      audits: [],
       addbalance: false,
       newinfo: {
         f_user_type: '',
@@ -853,6 +854,22 @@ export default {
 
     async validateOwe () {
       let http = new HttpResetClass()
+      let audits = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'id',
+            tablename: 't_handplan',
+            condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state = '待审核' `,
+            orderitem: ' id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}
+      )
+      console.log('获取到的待审核记录', audits.data)
+      this.audits = audits.data
+      if (this.audits.length > 0) {
+        this.$showAlert('此用户还有待审核的抄表记录，请到抄表审核页面审核完成后再对用户进行换表操作', 'warning', 5000)
+        this.$dispatch('refresh')
+        return
+      }
       let books = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_whether_pay',

package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue

@@ -167,7 +167,7 @@
                       v-el:cc></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_aroundmeter.required ? 'select-error' : '']">
-            <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
+            <label for="gasmodel" class="font_normal_body"><span style="color: red;">&ensp;表&ensp;&ensp;&ensp;&ensp;向</span></label>
             <input type="text" v-show="false" v-model="$refs.f_aroundmeter.selectedItems" v-validate:f_aroundmeter='{required: true }'/>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
                       v-model='row.f_aroundmeter' v-ref:f_aroundmeter></v-select>

package/src/filiale/qianneng/FilesManageNew/MeterinfoTest.vue

@@ -124,7 +124,7 @@
         <!--</div>-->
 
           <div class="col-sm-4 form-group" :class="[$m.f_aroundmeter.required ? 'select-error' : '']">
-            <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
+            <label for="gasmodel" class="font_normal_body color-red">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
             <input type="text" v-show="false" v-model="$refs.f_aroundmeter.selectedItems" v-validate:f_aroundmeter='{required: true }'>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
                       v-model='row.f_aroundmeter' v-ref:f_aroundmeter></v-select>

package/src/filiale/qianneng/revenue/Userinfo.vue

@@ -0,0 +1,281 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading" style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">档案信息</h4>
+      </div>
+      <div class="auto info-content">
+        <div class="row" v-if="warninginfo.data.insMsg">
+          <p align="center"><font color="red" style="font-weight: bold">{{ warninginfo.data.insMsg }}</font></p>
+        </div>
+
+        <div class="row" :class="[config.f_userinfo_code ? 'highlight' : '']">
+          <label class="col-sm-5">客户编号</label>
+          <span class="col-sm-7"><a
+            @click="dealmsg(data)">{{ data ? data.f_userinfo_code : dafault.f_userinfo_code }}</a></span>
+        </div>
+        <div class="row" :class="[config.f_user_name ? 'highlight' : '']">
+          <label class="col-sm-5">客户名称</label>
+          <span class="col-sm-7">{{ data ? data.f_user_name : dafault.f_user_name }}</span>
+        </div>
+        <div class="row" v-if="data.f_name_pinyin">
+          <label class="col-sm-5">名称首拼</label>
+          <span class="col-sm-7">{{ data ? data.f_name_pinyin : dafault.f_name_pinyin }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_type ? 'highlight' : '']">
+          <label class="col-sm-5">客户类型</label>
+          <span class="col-sm-7">{{ data ? data.f_user_type : dafault.f_user_type }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">账户余额</label>
+          <span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" v-show="data &&  data.f_sys_balance !== 0">
+          <label class="col-sm-5">系统余额</label>
+          <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" :class="[config.f_idnumber ? 'highlight' : '']">
+          <label class="col-sm-5">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all">{{ data ? data.f_idnumber : dafault.f_idnumber }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_phone ? 'highlight' : '']">
+          <label class="col-sm-5">客户电话</label>
+          <span class="col-sm-7">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+            <span v-if="data && data.f_user_phone" @click.stop="changeuserphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
+          </span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">备用电话</label>
+          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_state ? 'highlight' : '']">
+          <label class="col-sm-5">客户状态</label>
+          <span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
+        </div>
+        <div class="row" :class="[config.f_comments ? 'highlight' : '']">
+          <label class="col-sm-5">备注信息</label>
+          <span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}
+            <span v-if="data" @click.stop="change_reason"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_enter_number ? 'highlight' : '']">
+          <label class="col-sm-5">入户证号</label>
+          <span class="col-sm-7">{{ data ? data.f_enter_number : dafault.f_enter_number }}</span>
+        </div>
+        <div class="row" :class="[config.f_address ? 'highlight' : '']">
+          <label class="col-sm-5">客户地址</label>
+          <span class="col-sm-7">{{ data ? data.f_address : dafault.f_address }}</span>
+        </div>
+        <div class="row" :class="[config.f_open_date ? 'highlight' : '']">
+          <label class="col-sm-5">开户时间</label>
+          <span class="col-sm-7">{{ data ? data.f_open_date.substr(0, 10) : dafault.f_open_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_input_date ? 'highlight' : '']">
+          <label class="col-sm-5">安装时间</label>
+          <span class="col-sm-7">{{ data ? data.f_install_date.substr(0, 10) : dafault.f_input_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_people_num ? 'highlight' : '']">
+          <label class="col-sm-5">&emsp;人&ensp;口&ensp;数</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_people_num : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">客户等级</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_user_level : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">旧客户编号</label>
+          <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">合同编号</label>
+          <span class="col-sm-7">{{ data ? data.f_contract_id : dafault.f_contract_id }}</span>
+        </div>
+        <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_user_phone" placeholder='旧客户电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuserphone"
+                         placeholder='新客户电话'>
+                </div>
+              </div>
+            </div>
+          </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 v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧备注信息</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_comments" placeholder='旧备注信息'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新备注信息</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="new_reason"
+                         placeholder='新备注信息'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserSpecialReson">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+<script>
+/**
+ *用户档案相关信息组件
+ */
+
+export default {
+  ready () {
+    console.log('看看userinfo里面接收的data数据：', this.data)
+    this.$getConfig(this, 'getUserInfo')
+  },
+  title: '客户基本信息',
+  data () {
+    return {
+      dafault: {
+        f_user_name: '***',
+        f_userinfo_code: '********',
+        f_people_num: '**',
+        f_idnumber: '****',
+        f_user_phone: '************',
+        f_address: '*****',
+        f_enter_number: '*****',
+        f_user_type: '***',
+        f_open_date: '****年**月**日',
+        f_input_date: '****年**月**日',
+        f_hand_date: '****年**月**日',
+        f_rent_phone: '************',
+        f_comments: '**',
+        f_user_state: '****',
+        f_contract_id: '*************'
+      },
+      config: {
+        f_user_name: false,
+        f_userinfo_code: false,
+        f_people_num: false,
+        f_idnumber: false,
+        f_user_phone: false,
+        f_address: false,
+        f_enter_number: false,
+        f_user_type: false,
+        f_open_date: false,
+        f_input_date: false,
+        f_comments: false,
+        f_user_state: false
+      },
+      model: null,
+      showselectncuserinfo: false,
+      newuserphone: '',
+      reason_show: false,
+      new_reason: ''
+    }
+  },
+  props: ['data', 'warninginfo'],
+  methods: {
+    async modifyUserSpecialReson () {
+      let param = {
+        new_reason: this.new_reason,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        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
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_comments = this.new_reason
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    change_reason () {
+      // 修正客户电话
+      this.reason_show = true
+      this.new_reason = ''
+    },
+    dealmsg (val) {
+      if (val.f_userinfo_code !== '********') {
+        this.$dispatch('deal-msg', val)
+      }
+    },
+    changeuserphone () {
+      // 修正客户电话
+      this.showselectncuserinfo = true
+      this.newuserphone = ''
+    },
+    async modifyUser () {
+      let param = {
+        new_userphone: this.newuserphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        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
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_user_phone = this.newuserphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    close () {
+      this.showselectncuserinfo = false
+      this.reason_show = false
+      this.newuserphone = ''
+      this.new_reason = ''
+    }
+  },
+  watch: {
+    'data' (val) {
+    }
+  }
+}
+</script>
+<style scoped>
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+.highlight {
+  color: brown;
+}
+
+</style>

package/src/filiale/qianneng/sale.js

@@ -93,4 +93,6 @@ export default function () {
   Vue.component('third-surplus', (resolve) => { require(['./components/thirdSurplus'], resolve) })
   // 用户表具信息test
   Vue.component('file-user-meter-info', (resolve) => { require(['./FilesManage/UserMeterInfoTest'], resolve) })
+// 当前选择用户的表具基本信息
+  Vue.component('sale-userinfo', (resolve) => { require(['./revenue/Userinfo'], resolve) })
 }

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -217,8 +217,13 @@
                     @printok="printok" v-ref:printbill></print-bill>
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
+
           <strong style="font-size: large"
                   v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
+          <strong style="font-size: 16px"
+                  v-if="!config.notShowFormula && pricetext">合表气价:{{ pricetext }}</strong><br/>
+          <text style="font-size: 16px;font-style: italic;" class="text-info"
+                v-if="!config.notShowFormula && pricetext">合表气价公式:(居民单价×居民面积+非居民单价×非居民面积)÷(居民面积+非居民面积)</text><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -288,6 +293,7 @@ let preamountGen = async function (self) {
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+  self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext:null
   self.calText(getGas.data.chargeprice)
 }
 
@@ -314,6 +320,7 @@ let pregasGen = async function (self) {
         self.model.f_collection = Math.ceil(self.model.f_collection)
       }
     }
+    self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
     self.calText(getAmount.data.chargeprice)
   }
 }
@@ -503,6 +510,7 @@ export default {
     return {
       mjshow: false,
       serialShow: false,
+      pricetext:null,
       resid: [],  // 存放新增的f_files表中id
       config: {
         notShowFormula: false, // 不显示计算公式,默认显示

package/src/filiale/tongchuan/EticketManage.vue

@@ -19,8 +19,8 @@
 </template>
 
 <script>
-import TabButton from '../../../comprehen/common/TabButton'
-import Tabs from '../../../comprehen/common/Tabs'
+import TabButton from '../../components/revenue/comprehen/common/TabButton'
+import Tabs from '../../components/revenue/comprehen/common/Tabs'
 export default {
   name: 'eticket',
   title: '发票管理',

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -181,7 +181,12 @@
         <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
-          <strong style="font-size: large" v-show="false">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large"
+                  v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
+          <strong style="font-size: 16px"
+                  v-if="!config.notShowFormula && pricetext">合表气价:{{ pricetext }}</strong><br/>
+          <text style="font-size: 16px;font-style: italic;" class="text-info"
+                v-if="!config.notShowFormula && pricetext">合表气价公式:(居民单价×居民面积+非居民单价×非居民面积)÷(居民面积+非居民面积)</text><br/>
           <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
@@ -321,6 +326,7 @@
       self.model.f_totalcost = self.model.f_preamount
       self.model.f_collection = 0
   }
+    self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext:null
     self.calText(getGas.data.chargeprice)
   }
   // 输入气量，换算金额
@@ -342,6 +348,7 @@
         self.model.f_totalcost = getAmount.data.chargenum
         self.model.f_collection = 0
       }
+      self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
       self.calText(getAmount.data.chargeprice)
     }
   }
@@ -483,6 +490,7 @@
     data () {
       return {
         resid: [],  // 存放新增的f_files表中id
+        pricetext:null,
         config: {
           priceCalculation: false, // 划气量控制
           showupload: true,  // 默认不显示附件上传组件

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -74,6 +74,17 @@
                       close-on-select :disabled="permissionPrice" v-ref:name></v-select>
             <input type="text" v-show="false" v-model="$refs.name.selectedItems" v-validate:name='{required: true }'>
           </div>
+          <div v-if="row.pricetype==='合表气价'" :class="[$m.f_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-4 form-group">
+            <label class="font_normal_body" for="f_resident_area">居民面积</label>
+            <input  class="input_search" placeholder="居民面积" style="width:60%"
+                    type="text" v-model="row.f_resident_area" v-validate:f_resident_area='{required: true }'>
+          </div>
+
+          <div v-if="row.pricetype==='合表气价'" :class="[$m.f_non_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-4 form-group">
+            <label class="font_normal_body" for="f_non_resident_area">非居民面积</label>
+            <input class="input_search" placeholder="非居民面积" style="width:60%"
+                   type="text" v-model="row.f_non_resident_area" v-validate:f_non_resident_area='{required: true }'>
+          </div>
           <div class="col-sm-4 form-group">
             <label for="f_username" class="font_normal_body">&ensp;客户类型</label>
             <v-select :value.sync="row.f_user_type"
@@ -127,6 +138,7 @@
                    v-el:pricecomments v-next-el="meterbase">
           </div>
 
+
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'
@@ -463,6 +475,8 @@ let meterBookGen = function * (self) {
       console.log('看看meter里面的数据', this.meter, this.row)
       console.log('--------------====================', this.meter.f_aroundmeter, this.row.f_aroundmeter)
       this.row = Object.assign(this.row, this.meter, {})
+      console.log(this.meter.pricetype)
+      this.row.pricetype = this.meter.pricetype[0]
       this.oldrow = this.row
       this.isdecimal = this.row.gasbrand.length > 0 ? this.row.gasbrand.f_isdecimal : '否'
       this.row.valid = false

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

@@ -0,0 +1,26 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="auto form-horizontal select-overspread">
+        <div  class="col-sm-6" :class="[$v.f_price.required ? 'has-error' : 'has-success']">
+          <label for="f_price" class="font_normal_body">居民单价</label>
+            <input style="width:60%" class="input_search" type="number" v-model="consolidateprice[0].f_price"
+                   v-validate:f_price='{required: true }'  placeholder="单价" :disabled="isDisable">
+        </div>
+        <div :class="[$v.f_non_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+          <label class="font_normal_body" for="f_non_resident_price">非居民气价</label>
+          <input  class="input_search" placeholder="非居民气价" style="width:60%"
+                 type="text" v-model="consolidateprice[1].f_price" v-validate:f_non_resident_price='{required: true }'>
+        </div>
+      </form>
+    </validator>
+  </div>
+</template>
+<script>
+/**
+*阶梯气价管理组件
+*/
+export default {
+  props: ['consolidateprice', 'isDisable']
+}
+</script>

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

@@ -20,41 +20,20 @@
                       v-model="model.f_user_type">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group">
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_consolidated_user" v-show="false"
-                 >
-            <label class="font_normal_body" for="f_consolidated_user">合表用户</label>
-            <v-select :disabled='isEdit'
-                      :options='isLowIncomes'
-                      :value-single="true"
-                      :value.sync="model.f_consolidated_user"
-                      close-on-select
-                      placeholder='请选择'
-                      v-model="model.f_consolidated_user">
-            </v-select>
-          </div>
-          <div class="row" v-if="model.f_consolidated_user==='1'">
-          <div :class="[$v.f_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <label class="font_normal_body" for="f_resident_area">居民面积</label>
-            <input :disabled='isEdit' class="input_search" placeholder="居民面积" style="width:60%" @blur="getPrice()"
-                   type="text" v-model="model.f_resident_area" v-validate:f_resident_area='{required: true }'>
-          </div>
-          <div :class="[$v.f_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <label class="font_normal_body" for="f_resident_price">居民气价</label>
-            <input :disabled='isEdit' class="input_search" placeholder="居民气价" style="width:60%" @blur="getPrice()"
-                   type="text" v-model="model.f_resident_price" v-validate:f_resident_price='{required: true }'>
-          </div>
-          <div :class="[$v.f_non_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <label class="font_normal_body" for="f_non_resident_area">非居民面积</label>
-            <input :disabled='isEdit' class="input_search" placeholder="非居民面积" style="width:60%" @blur="getPrice()"
-                   type="text" v-model="model.f_non_resident_area" v-validate:f_non_resident_area='{required: true }'>
-          </div>
-          <div :class="[$v.f_non_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <label class="font_normal_body" for="f_non_resident_price">非居民气价</label>
-            <input :disabled='isEdit' class="input_search" placeholder="非居民气价" style="width:60%" @blur="getPrice()"
-                   type="text" v-model="model.f_non_resident_price" v-validate:f_non_resident_price='{required: true }'>
-          </div>
-          </div>
+<!--          <div class="col-sm-6 form-group">-->
+<!--            <input class="input_search" style="width:60%" type="text" v-model="model.f_consolidated_user" v-show="false"-->
+<!--                 >-->
+<!--            <label class="font_normal_body" for="f_consolidated_user">合表用户</label>-->
+<!--            <v-select :disabled='isEdit'-->
+<!--                      :options='isLowIncomes'-->
+<!--                      :value-single="true"-->
+<!--                      :value.sync="model.f_consolidated_user"-->
+<!--                      close-on-select-->
+<!--                      placeholder='请选择'-->
+<!--                      v-model="model.f_consolidated_user">-->
+<!--            </v-select>-->
+<!--          </div>-->
+
           <div :class="[$v.f_gasproperties.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
             <input class="input_search" style="width:60%" type="text" v-model="model.f_gasproperties" v-show="false"
                    v-validate:f_gasproperties='{required: true }'>
@@ -88,6 +67,18 @@
                    type="text" v-model="model.f_price_name" v-validate:f_price_name='{required: true }'>
           </div>
         </div>
+<!--        <div class="row" v-if="model.f_price_type === '合表气价'">-->
+<!--          <div :class="[$v.f_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">-->
+<!--            <label class="font_normal_body" for="f_price">居民气价</label>-->
+<!--            <input :disabled='isEdit' class="input_search" placeholder="居民气价" style="width:60%"-->
+<!--                   type="text" v-model="model.f_price" v-validate:f_price='{required: true }'>-->
+<!--          </div>-->
+<!--          <div :class="[$v.f_non_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">-->
+<!--            <label class="font_normal_body" for="f_non_resident_price">非居民气价</label>-->
+<!--            <input :disabled='isEdit' class="input_search" placeholder="非居民气价" style="width:60%"-->
+<!--                   type="text" v-model="model.f_non_resident_price" v-validate:f_non_resident_price='{required: true }'>-->
+<!--          </div>-->
+<!--        </div>-->
         <div class="row" v-if="model.f_price_type === '阶梯气价'">
           <div :class="[$v.f_stairmonths.required || $v.f_stairmonths.dctest ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
             <label class="font_normal_body" for="f_stairmonths">阶段月数</label>
@@ -206,7 +197,7 @@
 
       <!--<div style="width: 40%;overflow-y: scroll">-->
       <div class='auto' style="margin-top: 10px;">
-
+        <consolidated-price :is-disable.sync='isEdit' :consolidateprice.sync='model.detailprice' v-if="consilidateshow"></consolidated-price>
         <mix-price :is-disable.sync='isEdit' :mixmodel.sync='model.detailprice' v-if="mixshow"></mix-price>
         <stair-price :is-disable.sync='isEdit' :isheat.sync="model.f_isheat" :stairmodel.sync='model.detailprice' style="height: 40%;"
                      v-if="stairshow"></stair-price>
@@ -236,6 +227,7 @@
  */
 
 import {HttpResetClass} from 'vue-client'
+  import ConsolidatedPrice from './ConsolidatedPrice'
 let initGen = async function (self, val) {
   let http = new HttpResetClass()
   self.blodid = self.data.id
@@ -292,6 +284,7 @@ let initGen = async function (self, val) {
 }
 
   export default {
+    components: {ConsolidatedPrice},
     data () {
       return {
         unitshow: false,
@@ -315,7 +308,7 @@ let initGen = async function (self, val) {
         },
         // 编辑控制
         isEdit: false,
-
+        consilidateshow: false,
         // 扣费方式的改变 如果涉及日运算，则阶梯开始时间和生效时间不做显示
         stairStartShow: true,
 
@@ -368,6 +361,9 @@ let initGen = async function (self, val) {
         } else if (val === '阶梯气价') {
           this.model.detailprice = [{f_gas: '', f_price: '', f_add_gas: 0, f_add_gas_heat: 0}]
           this.stairshow = true
+        } else if (val === '合表气价') {
+          this.model.detailprice = []
+          this.consilidateshow = true
         }
       }
     },
@@ -376,18 +372,18 @@ let initGen = async function (self, val) {
       initGen(this, this.data)
     },
     methods: {
-      getPrice () {
-        if (this.model.f_resident_area && this.model.f_resident_price && this.model.f_non_resident_area && this.model.f_non_resident_price) {
-          let money = ((this.model.f_resident_area - 0) * (this.model.f_resident_price - 0)) + ((this.model.f_non_resident_area - 0) * (this.model.f_non_resident_price - 0))
-          console.log('money....' + money)
-          let area = ((this.model.f_resident_area - 0) + (this.model.f_non_resident_area - 0))
-          console.log('area....' + area)
-          let price = (money / area).toFixed(2)
-          console.log(price)
-          this.model.detailprice = []
-          this.model.detailprice.push({f_price: price})
-        }
-      },
+      // getPrice () {
+      //   if (this.model.f_resident_area && this.model.f_resident_price && this.model.f_non_resident_area && this.model.f_non_resident_price) {
+      //     let money = ((this.model.f_resident_area - 0) * (this.model.f_resident_price - 0)) + ((this.model.f_non_resident_area - 0) * (this.model.f_non_resident_price - 0))
+      //     console.log('money....' + money)
+      //     let area = ((this.model.f_resident_area - 0) + (this.model.f_non_resident_area - 0))
+      //     console.log('area....' + area)
+      //     let price = (money / area).toFixed(2)
+      //     console.log(price)
+      //     this.model.detailprice = []
+      //     this.model.detailprice.push({f_price: price})
+      //   }
+      // },
       async CheckDuplicate () {
         if (!this.data) {
           let http = new HttpResetClass()

package/src/filiale/tongchuan/sale.js

@@ -68,6 +68,8 @@ export default function () {
 
 // 混合气价
   Vue.component('mix-price', (resolve) => { require(['./StairPrice/MixPrice'], resolve) })
+// 合表气价
+  Vue.component('consolidated-price', (resolve) => { require(['./StairPrice/ConsolidatedPrice'], resolve) })
 // 固定气价
   Vue.component('unit-price', (resolve) => { require(['./StairPrice/UnitPrice'], resolve) })
 // 阶梯气价