sale-client 3.5.99 → 3.5.101

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -676,7 +676,7 @@ export default {
           f_user_type: row.f_user_type,
           f_gasproperties: row.f_gasproperties,
           f_position: row.f_position,
-          f_meter_book_num: row.f_meter_book,
+          f_meter_book_num: row.f_meter_book ? row.f_meter_book : '',
           f_usestate: '正常',
           f_adjustable: row.f_adjustable_id,
           f_install_date: row.f_install_date,

package/src/filiale/dongguan/components/BasicLiving.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="auto" >
+    <validator name='v'>
+      <div novalidate class=" select-overspread container-fluid auto" partial>
+        <ul class="nav nav-tabs">
+          <li class="active a-tabs"><a href="#">低保信息</a></li>
+        </ul>
+        <form class="form-horizontal form-group">
+          <div class="row">
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">所属公司</label>
+              <res-select :initresid='curorgid' @res-select="getorg" is-mul="false" restype='organization'></res-select>
+            </div>
+            <div class="col-sm-6 form-group" :class="[$v.f_userinfo_code.required ? 'has-error' : 'has-success']">
+              <label for="f_userinfo_code" class="font_normal_body">用户编号</label>
+              <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"
+                     v-model="model.f_userinfo_code"  @keyup.enter="getinfo()"
+                     v-validate:f_userinfo_code='{required: true }' :disabled='isEdit' placeholder="输入编号,回车查询">
+            </div>
+            <div class="col-sm-6 form-group">
+              <label for="f_user_name" class=" font_normal_body">用户姓名</label>
+              <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"
+                     v-model="model.f_user_name" readonly
+                     placeholder="用户姓名">
+
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-sm-12 form-group" >
+              <label for="f_address" class=" font_normal_body">地&emsp;&emsp;址</label>
+              <input class="input_search" type="text" class="input_search" style="width:80%" v-model="model.f_address"
+                     readonly
+                     placeholder="地址">
+            </div>
+
+          </div>
+
+          <div class="row" >
+            <div class="col-sm-6 form-group" id="f_start_date" :class="[$v.f_start_date.required ? 'has-error' : 'has-success']">
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="model.f_start_date"
+                     v-validate:f_start_date='{required: true }'>
+              <label for="f_start_date" class=" font_normal_body">开始日期</label>
+              <datepicker style="width: 60%"
+                          placeholder="开始日期"
+                          v-model="model.f_start_date"
+                          :value.sync="model.f_start_date"
+                          class="datepicker"
+                          :format="'yyyy-MM-dd'"
+                          :disabled='isEdit'>
+              </datepicker>
+            </div>
+            <div class="col-sm-6 form-group" id="f_end_date" :class="[$v.f_end_date.required ? 'has-error' : 'has-success']">
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_end_date"
+                     v-validate:f_end_date='{required: true }' v-show="false" >
+              <label for="f_end_date" class=" font_normal_body">结束日期</label>
+              <datepicker style="width: 60%"
+                          placeholder="结束日期"
+                          v-model="model.f_end_date"
+                          :value.sync="model.f_end_date"
+                          class="datepicker"
+                          :format="'yyyy-MM-dd'"
+                          :disabled='isEdit'>
+              </datepicker>
+
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-sm-6 form-group" :class="[$v.f_price_id.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">气&emsp;&emsp;价</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="model.f_price_id"
+                     v-validate:f_price_id='{required: true }'>
+              <v-select id="f_price_name"
+                        v-model="model.f_price_id"
+                        :value.sync="model.f_price_id"
+                        :options='pricename'
+                        :value-single="true"
+                        close-on-select></v-select>
+
+            </div>
+          </div>
+
+          <div style="text-align:right;height:auto;margin-top:6px;">
+            <button class="button_search" type="button" @click="confirm('确认')"  v-if="!isEdit" :disabled='!$v.valid'>
+              确认
+            </button>
+            <button class="button_search"  type="button"  style="width:100px;" @click="confirm('取消低保户')"
+                    v-show="isBasicLiving1 || model.isBasicLiving1 =='true'" :disabled='!$v.valid'>
+              取消低保户
+            </button>
+            <button class="button_search" type="button"  @click="close()">取消</button>
+          </div>
+          <!--<upload :blodid="model.f_userinfo_id" cols="col-sm-12" isremark="true" fusetype="低保户"></upload>-->
+        </form>
+
+      </div>
+
+
+    </validator>
+
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  let initGen = async function (self, val) {
+  // 获取低保气价
+    self.$resetpost('rs/sql/get_priceId',
+      {data: {f_orgid: self.f_filiale_id, condition: `f_islow_income = '1'`}},
+      {resolveMsg: null, rejectMsg: null}).then((res) => {
+        let rs = []
+        for (let i = 0; i < res.data.length; i++) {
+          let temp = {
+            label: res.data[i].f_price_name,
+            value: res.data[i].f_price_id
+          }
+          rs.push(temp)
+        }
+        self.pricename = [...rs]
+      })
+
+    if (val) {
+      self.model = Object.assign({}, self.model, val)
+    }
+    // let http = new HttpResetClass()
+    // let res = await http.load('POST', 'rs/sql/get_BasicLiving',
+    //   {data: {condition: `id = '${val.id}'`}}, {
+    //   resolveMsg: null,
+    //   rejectMsg: null
+    // })
+    // console.log(res.data)
+    // self.model = Object.assign({}, self.model, val)
+    // self.model.f_userinfo_code = res.data[0].f_userinfo_code
+    // self.model.f_userinfo_id = res.data[0].f_userinfo_id
+    // self.model.f_user_phone = res.data[0].f_user_phone
+    // self.model.f_address = res.data[0].f_address
+    // self.model.f_user_phone = res.data[0].f_user_phone
+    // self.model.f_start_date = res.data[0].f_start_date
+    // self.model.f_end_date = res.data[0].f_end_date
+    // self.model.f_period = res.data[0].f_period
+    // self.model.f_price_id = res.data[0].f_price_id
+    // self.model.f_price_name = res.data[0].f_price_name
+    // self.model.f_operator = self.$login.f.name
+    // self.model.f_operatorid = self.$login.f.id
+    // self.model.f_filialeid = self.model.f_filialeid ? self.model.f_filialeid : self.$login.f.orgid
+    // self.model.f_orgid = self.model.f_orgid ? self.model.f_orgid : self.$login.f.orgid
+    // self.model.f_orgname = self.model.f_orgname ? self.model.f_orgname : self.$login.f.orgs
+    // self.model.f_depid = self.model.f_depid ? self.model.f_depid : self.$login.f.depids
+    // self.model.f_depname = self.model.f_depname ? self.model.f_depname : self.$login.f.deps
+  }
+
+  export default {
+    title: '低保户',
+    props: {
+      f_islow_income: {
+        type: String,
+        default: '1'
+      },
+      data: {
+        type: Object
+      }
+    },
+    data () {
+      return {
+        // 公司树状图信息
+        curorgid: [this.$login.f.orgid],
+        pricename: [{value: '', label: ''}],
+        model: {
+          f_userinfo_code: '',
+          f_userinfo_id: '',
+          f_user_name: '',
+          f_address: '',
+          f_price_id: '',
+          f_price_name: '',
+          f_user_phone: '',
+          f_start_date: '',
+          f_end_date: '',
+          f_period: '',
+          f_state: '有效'
+
+        },
+        isBasicLiving1: false,
+        // 编辑控制
+        isEdit: false,
+        // 所属公司
+        f_filiale_id: this.$login.f.orgid,
+        // 所属公司名称
+        f_filiale_name: this.$login.f.orgs
+      }
+    },
+    ready () {
+      if (this.data) {
+        this.isBasicLiving1 = true
+        initGen(this, this.data)
+      } else {
+        this.initModel()
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val) {
+          initGen(this, val)
+        } else {
+          this.initModel()
+        }
+      },
+      'model.f_start_date' (val) {
+        if (this.model.f_end_date) {
+          this.compareDate(val, this.model.f_end_date)
+        }
+      },
+      'model.f_end_date' (val) {
+        if (this.model.f_start_date) {
+          this.compareDate(this.model.f_start_date, val)
+        }
+      },
+      'f_filiale_id' () {
+        initGen(this, this.data)
+      }
+    },
+    methods: {
+
+      async getinfo () {
+        let res = await this.$resetpost('rs/sql/sale_getUserAndPeriod',
+          {data: {condition: "f_userinfo_code = '" + this.model.f_userinfo_code + "' and f_orgid ='" + this.f_filiale_id + "'"}}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+        if (res.data.length == 0) {
+          this.$showAlert('查询无此用户!!请核对编号', 'warning', 3000)
+        } else {
+          this.model = res.data[0]
+          this.$parent.blodid = this.model.f_userinfo_id
+          this.model.f_start_date = this.$login.toStandardDateString()
+        }
+      },
+      async confirm (type) {
+        // if (type == '取消低保户' && !this.$login.r.find(value => value == '取消低保户')) {
+        //   this.$showMessage('你没有取消低保户的权限,请联系管理员!')
+        //   return
+        // }
+        if (type == '取消低保户'){
+          let data = {
+            f_userinfo_code: this.f_userinfo_code,
+            f_userinfo_id: this.model.f_userinfo_id,
+            f_user_name: this.model.f_user_name,
+            f_address: this.model.f_address,
+            f_price_id: this.model.f_price_id,
+            f_price_name: this.model.f_price_name
+          }
+          let res =await this.$resetpost('rs/logic/stopBasicLivingNew', {data: data},{resolveMsg: null, rejectMsg: null})
+          this.initModel()
+          this.$dispatch('success','isBasicLiving')
+        }else {
+          await this.$LogicService.basicLiving(this.model, this.data)
+          this.initModel()
+          this.$dispatch('success', 'isBasicLiving')
+        }
+      },
+      getorg (id, name) {
+        this.f_filialeid = id[0]
+        this.f_filialename = name[0]
+      },
+      initModel () {
+        this.model = {
+          f_userinfo_code: '',
+          f_userinfo_id: '',
+          f_user_name: '',
+          f_address: '',
+          f_price_id: 0,
+          f_price_name: '',
+          f_user_phone: '',
+          f_start_date: '',
+          f_end_date: '',
+          f_period: '',
+          f_state: '正常'
+        }
+      },
+      close () {
+        this.$dispatch('close')
+      },
+
+      compareDate (date1, date2) {
+        let s = new Date(date1)
+        let e = new Date(date2)
+        if (e < s) {
+          this.model.f_start_date = ''
+          this.model.f_end_date = ''
+          this.$showAlert('结束日期不能小于开始日期', 'warning', 2000)
+        }
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #gas-price-form {
+    .form-group {
+      margin-left: 0px;
+      margin-right: 0px;
+    }
+  }
+
+</style>

package/src/filiale/dongguan/sale.js

@@ -10,6 +10,7 @@ let specialComp = {
   // 气价管理（新增）
   'gas-price': (resolve) => { require(['./components/comprehen/StairPrice/GasPrice'], resolve) },
   // 档案信息（V3现用档案管理）
-  'file-user-files': (resolve) => { require(['./components/FilesManage/FileUserFiles'], resolve) }
+  'file-user-files': (resolve) => { require(['./components/FilesManage/FileUserFiles'], resolve) },
+  'basic-living': (resolve) => { require(['./components/BasicLiving'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/gehua/MisPosPay.vue

@@ -44,7 +44,6 @@
     created () {
     },
     ready () {
-      console.log('日你妈')
     },
     methods: {
       // 返回结果为true意味着可以通行

package/src/filiale/gehua/sale.js

@@ -14,5 +14,7 @@ let specialComp = {
   'change_fill_sendcard': (resolve) => { require(['./ChangeSendCard'], resolve) },
   // 发卡售气
   'show-card-sell-gas': (resolve) => { require(['./ShowCardSellGas'], resolve) },
+  // 卡表收费
+  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
 }
 exports.specialComp = specialComp

package/src/filiale/liaoyuan/comprehen/StairPrice/GasPrice.vue

@@ -0,0 +1,518 @@
+<template>
+  <div class="auto select-overspread" >
+    <validator name='v'>
+      <form class="form-horizontal" novalidate>
+        <ul class="nav nav-tabs" style="margin-bottom: 10px">
+          <li class="active"><a href="#">气价信息</a></li>
+        </ul>
+        <div class="row">
+          <div :class="[$v.f_user_type.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_user_type" v-show="false"
+                   v-validate:f_user_type='{required: true }'>
+            <label title="参数:用户类型" class="font_normal_body" for="f_user_type">客户类型</label>
+            <v-select :disabled='isEdit'
+                      :options='usertype'
+                      :value-single="true"
+                      :value.sync="model.f_user_type"
+                      @change="usertypeChange"
+                      close-on-select
+                      placeholder='请选择'
+                      v-model="model.f_user_type">
+            </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 }'>
+            <label class="font_normal_body" for="f_gasproperties">用气性质</label>
+            <v-select :disabled='isEdit'
+                      :options='gastype'
+                      :value-single="true"
+                      :value.sync="model.f_gasproperties"
+                      close-on-select
+                      placeholder='请选择'
+                      v-model="model.f_gasproperties">
+            </v-select>
+          </div>
+          <div :class="[$v.f_price_type.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.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="model.f_price_type"
+                      close-on-select
+                      id="f_price_type"
+                      placeholder='请选择'
+                      v-model="model.f_price_type">
+            </v-select>
+          </div>
+          <div :class="[$v.f_price_name.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <label class="font_normal_body" for="f_price_name">气价名称</label>
+            <input :disabled='isEdit' class="input_search" placeholder="气价名称" style="width:60%" @blur="CheckDuplicate"
+                   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_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>
+            <input :disabled='isEdit' class="input_search" style="width:60%" type="number"
+                   v-model="model.f_stairmonths" v-validate:f_stairmonths='{required: true, dctest: [ 12, "<=" ] }'>
+            <span class="help-block" v-if="$v.f_stairmonths.dctest">阶段月数不能大于12</span>
+          </div>
+          <div  :class="[$v.f_stair_start_date.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group" v-if="stairStartShow">
+            <input class="input_search" style="width:60%" type="text" v-model="model.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 :disabled='isEdit'
+                        :format="'yyyy-MM-dd'"
+                        :value.sync="model.f_stair_start_date"
+                        class="datepicker"
+                        id="f_stair_start_date"
+                        placeholder="阶梯开始日期"
+                        style="width: 60%"
+                        v-model="model.f_stair_start_date">
+            </datepicker>
+            <span class="help-block" id="helpBlock" style="font-size: 1.4rem">本年或<br/>本月1号</span>
+          </div>
+        </div>
+        <div class="row">
+          <div  :class="[$v.f_perform_date.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group" class="col-sm-6">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_perform_date" v-show="false"
+                   v-validate:f_perform_date='{required: true }'>
+            <label class="font_normal_body" for="f_perform_date">生效日期</label>
+            <datepicker :disabled='isEdit'
+                        :value.sync="model.f_perform_date"
+                        id="f_perform_date"
+                        placeholder="生效日期"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        style="width: 60%" v-model="model.f_perform_date">
+            </datepicker>
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">是否低保</label>
+            <v-select :options='isLowIncomes'
+                      :value-single="true"
+                      :value.sync="model.f_islow_income"
+                      close-on-select
+                      placeholder='请选择'
+                      style="width: 60%" v-model="model.f_islow_income">
+            </v-select>
+          </div>
+          <div :class="[$v.f_population_base.pattern ? 'has-error' : 'has-success']" class="col-sm-6 form-group" v-if="model.f_price_type === '阶梯气价'">
+            <label class="font_normal_body" for="f_population_base">人口基数</label>
+            <input :disabled='isEdit' :value.sync="model.f_population_base" class="input_search" placeholder="人口基数"
+                   style="width:60%"
+                   type="text" v-model="model.f_population_base" v-validate:f_population_base="{pattern: '/^[1-9]\\d*$/'}">
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">使用公司</label>
+            <res-select :initresid='curorgid'
+                        @res-select="getorg"
+                        is-mul="false"
+                        restype='organization'>
+            </res-select>
+          </div>
+          <unit-price :is-disable.sync='isEdit' :unitmodel.sync='model.detailprice' v-if="unitshow"></unit-price>
+        </div>
+
+        <div v-if="config.heatingSeason && model.f_price_type == '阶梯气价'">
+          <div class="row">
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">是否采暖</label>
+              <v-select :options='isLowIncomes'
+                        :value-single="true"
+                        :value.sync="model.f_isheat"
+                        close-on-select
+                        placeholder='请选择'
+                        style="width: 60%" v-model="model.f_isheat">
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group">
+              <input class="input_search" style="width:60%" type="text" v-model="model.f_deduction_way" v-show="false"
+                     v-validate:f_deduction_way='{required: true }'>
+              <label class="font_normal_body">扣费方式</label>
+              <v-select :options='deductionWays'
+                        :value-single="true"
+                        :value.sync="model.f_deduction_way"
+                        @change="deductionChange"
+                        close-on-select
+                        placeholder='请选择'
+                        style="width: 60%" v-model="model.f_deduction_way">
+              </v-select>
+            </div>
+
+          </div>
+          <div class="row" v-if="model.f_isheat == '1'">
+            <div :class="[$v.f_heat_start_date.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+              <input class="input_search" style="width:60%" type="text" v-model="model.f_heat_start_date" v-show="false"
+                     v-validate:f_heat_start_date='{required: true }'>
+              <label class="font_normal_body">采暖起始</label>
+              <datepicker :disabled='isEdit'
+                          :format="'MM-dd'"
+                          :value.sync="model.f_heat_start_date"
+                          class="datepicker"
+                          placeholder="阶梯开始日期"
+                          style="width: 60%" v-model="model.f_heat_start_date">
+              </datepicker>
+            </div>
+            <div :class="[$v.f_heat_cycle.dctest ? 'has-error' : 'has-success']" class="col-sm-6 form-group" >
+              <label class="font_normal_body">采暖周期</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_heat_cycle" v-validate:f_heat_cycle='{dctest: [ 12, "<=" ] }'>
+            </div>
+          </div>
+        </div>
+        <div class="row" >
+          <div class="col-sm-6 form-group">
+            <label  class="font_normal_body ">优&ensp;先&ensp;级</label>
+            <input :disabled='isEdit' class="input_search" placeholder="优先级" style="width:60%"
+                   type="text" v-model="model.f_priority" v-validate:f_priority='{required: true }'>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group" style="height: auto !important;">
+            <label  class="font_normal_body ">备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px;" v-model="model.f_comments"></textarea>
+          </div>
+        </div>
+
+      </form>
+
+      <!--<div style="width: 40%;overflow-y: scroll">-->
+      <div class='auto' style="margin-top: 10px;">
+
+        <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>
+      </div>
+
+      <div style="text-align:right;height:auto;margin-top:6px;">
+        <button :disabled='!$v.valid' @click="confirm()" class="button_search" v-if="!isEdit">确认</button>
+        <button @click="deletePrice()" class="button_delete" v-if="!isEdit && data.usercount === 0 && data.usercountnew === 0">删除</button>
+        <button @click="limitClick" class="button_search" type="button" v-if="config.isLimit">限购配置</button>
+        <button @click="close()" class="button_clear">取消</button>
+      </div>
+      <div v-if="data" style="text-align:right;height:auto;margin-top:6px;">
+        <a @click="showChangeView">查看变更记录</a>
+      </div>
+      <!--</div>-->
+    </validator>
+    <limit-gas :f_price_id="model.id" :show.sync="limitShow" @limit="getLimitGas"></limit-gas>
+   <upload  v-if="data" :blodid="blodid" cols="col-sm-12" isremark="true" fusetype="气价修改"></upload>
+  </div>
+</template>
+<script>
+  /**
+ *阶梯气价管理组件
+ */
+
+import {HttpResetClass} from 'vue-client'
+let initGen = async function (self, val) {
+  let http = new HttpResetClass()
+  self.blodid = self.data.id
+  // 启动流程的情况下 获取改气价有无正在审核的气价，若有则禁止编辑，若无则可编辑
+  let hasUnAudit = false
+  console.log('当前信息', val)
+  if (self.config.audit) {
+    let res = await http.load('POST', 'rs/sql/saleSingleTable', {
+      data: {
+        tablename: 't_stairprice',
+        condition: `f_price_id = '${val.f_price_id}' and f_filialeid = '${val.f_filialeids}' and f_state = '待审核'`
+      }
+    }, {resolveMsg: null, rejectMsg: '获取有无待审核气价时出错！！！'})
+    console.log('获取有无待审核气价', res)
+    // 这里默认待审核气价只有一条
+    if (res.data.length === 1) {
+      // 判断当前气价是否是待审核气价
+      hasUnAudit = res.data[0].id !== val.id
+    } else if (res.data.length > 1) {
+      self.$showAlert('意外获取到多条待审核记录！请联系管理人员！', 'danger', 0)
+    }
+  }
+  self.model = Object.assign({}, self.model, val)
+
+  self.model.f_filialeid = self.model.f_filialeid ? self.model.f_filialeid : self.f_filialeid
+  self.model.f_orgid = self.model.f_orgid ? self.model.f_orgid : self.$login.f.orgid
+  self.model.f_orgname = self.model.f_orgname ? self.model.f_orgname : self.$login.f.orgs
+  self.model.f_depid = self.model.f_depid ? self.model.f_depid : self.$login.f.depids
+  self.model.f_depname = self.model.f_depname ? self.model.f_depname : self.$login.f.deps
+
+  self.curorgid.push(self.model.f_filialeid)
+  self.model.f_islow_income = self.model.f_islow_income + ''
+  self.model.f_isheat = self.model.f_isheat + ''
+
+  self.stairStartShow = !self.model.f_deduction_way.includes('day')
+  self.isEdit = self.model.f_price_state === '已作废' || hasUnAudit
+  console.log('观察data里面的model', self.model, val)
+  if (self.model.id) {
+    let price = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
+      data: {
+        items: 'f_price_name, f_gas, f_price, isnull(f_add_gas, 0) f_add_gas, isnull(f_add_gas_heat, 0) f_add_gas_heat',
+        tablename: 't_detailprice',
+        condition: `f_stairprice_id = '${self.model.id}'`,
+        orderitem: 'f_price_name asc'
+      }
+    }, {resolveMsg: null, rejectMsg: '获取气价明细出错！！！'})
+
+    if (self.model.f_price_type[0] === '混合气价') {
+      price.data[0].f_mixprice = [price.data[0].f_mixprice]
+      price.data[1].f_mixprice = [price.data[1].f_mixprice]
+    }
+    self.model.detailprice = price.data
+  }
+}
+
+  export default {
+    data () {
+      return {
+        unitshow: false,
+        mixshow: false,
+        blodid: '',
+        stairshow: false,
+        model: {
+          f_price_type: [],
+          f_stairmonths: 1,
+          f_perform_date: '',
+          detailprice: [],
+          f_population_base: 4,
+          f_population_increment: 0,
+          f_stair_start_date: '',
+          f_heat_way: '按月',
+          f_deduction_way: this.config.deductionWay,
+          f_islow_income: '0',
+          f_isheat: '0',
+          f_comments: '',
+          f_priority: 100
+        },
+        // 编辑控制
+        isEdit: false,
+
+        // 扣费方式的改变 如果涉及日运算，则阶梯开始时间和生效时间不做显示
+        stairStartShow: true,
+
+        // 公司树状图信息
+        curorgid: [],
+
+        f_filialeid: '',  // 所属公司
+        f_filialename: '',  // 所属公司名称
+
+        // 限购配置
+        limitShow: false,
+        limit_gas: null,
+
+        // 下拉框数据
+        usertype: this.$appdata.getParam('用户类型'),
+        pricetype: this.$appdata.getParam('气价类型'),
+        hearways: [{label: '按月', value: '按月'}, {label: '按季', value: '按季'}],
+        isLowIncomes: [{label: '是', value: '1'}, {label: '否', value: '0'}],
+        deductionWays: [{label: '周期扣费', value: 'cycle'}, {label: '周期平均扣费', value: 'cycleMM'}, {label: '日运算扣费', value: 'day'}, {label: '采暖季独立扣费', value: 'singleHS'}, {label: '采暖季日扣费', value: 'dayHS'}],
+        gastype: []
+      }
+    },
+    props: ['data', 'config', 'f_filialeid'],
+    watch: {
+      'data' (val) {
+        if (val) {
+          initGen(this, val)
+        } else {
+          this.initModel()
+        }
+      },
+      'model.f_price_type' (val) {
+        this.unitshow = false
+        this.mixshow = false
+        this.stairshow = false
+        if (val === '固定气价') {
+          this.model.detailprice = []
+          this.unitshow = true
+        } else if (val === '混合气价') {
+          this.model.detailprice = []
+          this.mixshow = true
+        } else if (val === '阶梯气价') {
+          this.model.detailprice = [{f_gas: '', f_price: '', f_add_gas: 0, f_add_gas_heat: 0}]
+          if (this.model.f_deduction_way == undefined || this.model.f_deduction_way == '') {
+            this.model.f_deduction_way = 'cycle'
+          }
+          this.stairshow = true
+        }
+      }
+    },
+    ready () {
+      console.log('看看都传了什么', this.data, this.config)
+      initGen(this, this.data)
+    },
+    methods: {
+      async CheckDuplicate () {
+        if (!this.data) {
+          let http = new HttpResetClass()
+          let res = await http.load('post', 'rs/sql/getGasPriceInfo', {data: {condition: ` f_filialeid  in ('${this.$login.f.orgid}') and  1=1 `, orderitem: 'f_price_id'}}, {resolveMsg: null, rejectMsg: null})
+          for (let i = 0; i < res.data.length; i++) {
+            if (res.data[i].f_price_name == this.model.f_price_name) {
+              this.$showAlert('气价名称重复,请重新输入', 'warning', 3000)
+              this.model.f_price_name = ''
+              return
+            }
+          }
+        }
+      },
+      async confirm () {
+        // 验证公司组织是否已选择
+        try {
+          if (!this.f_filialeid) {
+            this.$showAlert('请选择气价使用公司', 'warning', 2000)
+            return
+          }
+          if (this.data) {
+            if (this.data.f_perform_date == this.model.f_perform_date) {
+              this.$showAlert('请更改生效日期', 'warning', 2000)
+              return
+            }
+            let datenow = new Date()
+            let a = datenow.setDate(datenow.getDate() - 1)
+            let month = datenow.getMonth() + 1
+            let date = datenow.getDate()
+            let hour = datenow.getHours()
+            let min = datenow.getMinutes()
+            let sec = datenow.getSeconds()
+            a = datenow.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+            a = a + ' 23:59:59'
+            if (this.model.f_perform_date <= this.data.f_perform_date) {
+              this.$showAlert('生效日期不能小于上次生效时间', 'warning', 2000)
+              return
+            }
+          }
+
+          // 验证此生效时间之后是否有待使用气价， 如果有提示是否作废待使用气价，
+          let validateResult = await this.$resetpost('rs/logic/sale_validatePrice', {data: this.model}, {
+            resolveMsg: null,
+            rejectMsg: '验证气价出错！！'
+          })
+          console.log('验证气价:', validateResult)
+          if (validateResult.data.toBeUsePrice.length > 0) {
+            // 有待使用气价， 将待使用气价信息展示
+            let awaitOper = await this.$showMessage(`此气价存在待使用记录, 将于${validateResult.data.toBeUsePrice[0].f_perform_date} 开始使用！是否将其作废?`, ['confirm', 'cancel'])
+            console.log('用户点击了:', {awaitOper})
+            if (awaitOper == 'confirm') {
+              // 传至后台用于新版本号的处理
+              this.model.toBeUsePriceId = validateResult.data.toBeUsePrice[0].id
+              this.model.toBeUsePriceVersion = validateResult.data.toBeUsePrice[0].f_version
+              this.savePrice()
+            }
+          } else {
+            this.savePrice()
+          }
+        } catch (e) {
+          this.$dispatch('error', '气价管理', this.data, res)
+        }
+      },
+
+      async savePrice () {
+        // 去除重复或者空的明细
+        if (this.model.f_price_type[0] === '阶梯气价') {
+          this.removeDuplication(this.model)
+        }
+        // 审核配置
+        this.model.audit = this.config.audit
+
+        console.log('进入保存气价方法')
+        this.model.f_filialeid = this.f_filialeid ? this.f_filialeid : this.$login.f.orgid
+
+        if (this.limit_gas) {
+          this.model.limit_gas = this.limit_gas
+          //this.model.limit_gas.f_start_date = this.model.f_perform_date
+        }
+        // 现调用气价修改的逻辑   返回：version 和之前的对比 增加的话， 进行提示操作 反之 结束
+        await this.$LogicService.gasPrice(this.model, this.data)
+        // 操作了气价 清空分公司initdata缓存
+        let http = new HttpResetClass()
+        await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
+
+        this.$dispatch('success', '气价管理', this.data)
+        this.initModel()
+      },
+
+      async deletePrice () {
+        let res = await this.$showMessage(`您确定要删除此气价吗？`, ['confirm', 'cancel'])
+        if (res === 'confirm') {
+          await this.$resetpost('rs/logic/delprice', {data: {id: this.model.id}}, {
+            resolveMsg: '删除气价成功',
+            rejectMsg: '删除气价失败'
+          })
+          let http = new HttpResetClass()
+          await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
+        }
+        this.$dispatch('success')
+      },
+
+      getLimitGas (val) {
+        console.log('获取到限购值。', val)
+        this.limit_gas = val
+      },
+
+      getorg (id, name) {
+        this.f_filialeid = id[0]
+        this.f_filialename = name[0]
+      },
+      initModel () {
+        this.model = {
+          f_user_type: '',
+          f_gasproperties: '',
+          f_price_type: '',
+          f_stairmonths: 1,
+          f_perform_date: '',
+          detailprice: [],
+          f_stair_start_date: '',
+          f_population_increment: 0,
+          f_population_base: 4,
+          f_comments: '',
+          f_deduction_way: this.config.deductionWay
+        }
+      },
+      close () {
+        this.$dispatch('close')
+      },
+      removeDuplication (val) {
+        if (val.detailprice.length > 0) {
+          let hash = []
+          let arr = []
+          for (var i = 0; i < val.detailprice.length; i++) {
+            // hash[val.detailprice[i].f_gas] != null
+            if (!val.detailprice[i].f_gas) {
+              continue
+            }
+            if (!hash[val.detailprice[i].f_gas]) {
+              arr.push(val.detailprice[i])
+              hash[val.detailprice[i].f_gas] = true
+            }
+          }
+          val.detailprice = arr
+        }
+      },
+      usertypeChange (val) {
+        if (val) {
+          this.gastype = this.$appdata.getParam(this.model.f_user_type)
+        }
+      },
+      deductionChange (val) {
+        // 扣费方式的改变 如果涉及日运算，则阶梯开始时间和生效时间不做显示
+        this.stairStartShow = !val.includes('day')
+      },
+      limitClick () {
+        this.limitShow = true
+      },
+      showChangeView () {
+        this.$parent.changeView = true
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #gas-price-form {
+    .form-group {
+      margin-left: 0px;
+      margin-right: 0px;
+    }
+  }
+
+</style>

package/src/filiale/liaoyuan/comprehen/StairPrice/GasPriceList.vue

@@ -0,0 +1,319 @@
+<template>
+  <div @keyup.enter="search" class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+          <div class="row">
+            <div  :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">组织机构</label>
+              <res-select :initresid='$parent.$parent.curorgid'
+                          @res-select="$parent.$parent.getorg"
+                          class="select select_list"
+                          restype='organization'
+                          style="width: 60%">
+              </res-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价名称</label>
+              <input class="input_search" condition="f_price_name like '%{}%'" placeholder='气价名称' style="width:60%" type="text"
+                     v-el:qjmc v-model="model.f_price_name" v-next-el="cx"
+              >
+            </div>
+            <!--<div class="col-sm-4">-->
+              <!--<label class="font_normal_body">生效时间大于</label>-->
+              <!--<datepicker :format="'yyyy-MM-dd'"-->
+                          <!--:value.sync="model.performDate"-->
+                          <!--placeholder="生效日期"-->
+                          <!--condition="performDate > '{}'"-->
+                          <!--v-model="model.performDate" style="width: 55%">-->
+              <!--</datepicker>-->
+            <!--</div>-->
+            <div class="form-group col-sm-6 button-range" style="margin-right: 10px" >
+              <button @click="$parent.$parent.batchAdjust()" class="button_new button_spacing">批量调价</button>
+              <button @click="$parent.$parent.search()" class="button_search button_spacing" v-el:cx>查询</button>
+              <button @click="$parent.$parent.add()" class="button_new button_spacing">新增</button>
+
+              <div :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价编号</label>
+              <input type="number" class="input_search"  style="width: 60%" v-model="model.f_user_name" placeholder='气价编号'
+                     condition="f_price_id = '{}'" >
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价来源</label>
+              <v-select :value.sync="model.f_custom" v-model="model.f_custom"
+                        placeholder='气价来源' :options="$parent.$parent.custom"
+                        condition="custom = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange()"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价类型</label>
+              <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                        placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                        condition="f_price_type = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价状态</label>
+              <v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
+                        placeholder='气价状态' :options="$parent.$parent.price_states"
+                        condition="f_price_state = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </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 v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>气价名称</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>客户类型</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>用气性质</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <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 v-if="$parent.$parent.$parent.config.audit">
+              <nobr>操作</nobr>
+            </th>
+            <th>
+              <nobr>历史记录</nobr>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center">{{$index + 1}}</td>
+            <td style="text-align:center">{{row.f_price_id}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_price_type}}</td>
+            <td style="text-align:center">{{row.new_version}}</td>
+            <td style="text-align:center"><nobr>{{row.f_value}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_filiale_name}}</nobr></td>
+            <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.f_price_id,row.f_price_name,row.f_filialeid)" class="btn btn-link"><b>{{row.usercount}}</b></button></td>
+            <td style="text-align:center"><b>{{row.usercountnew}}</b></td>
+            <td style="text-align:center">{{row.f_price_state}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.config.audit">
+              <button :disabled="$login.r.includes('气价审核')" @click.stop="$parent.$parent.$parent.passPrice(row)"
+                      class="btn btn-link" v-if="row.f_state === '待审核'">通过
+              </button>
+            </td>
+            <td style="text-align: center;">
+              <button type="button" name="button" class="button_search-2 button_spacing width-60"
+                      @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :backdrop="false" :show.sync="show" v-if="show" width="1000px">
+      <header class="modal-header" slot="modal-header">
+        <button @click="show=!show" 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="历史记录">
+        <price-change-history :row="row"  :show.sync="show"  @select-changed="historySeleted" v-on:toggle="close"></price-change-history>
+      </article>
+      <footer class="modal-footer" slot="modal-footer">
+
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  /**
+   *阶梯气价查询列表
+   */
+  import {PagedList} from 'vue-client'
+  import Vue from 'vue'
+
+  let passGen = async function (self, row) {
+    let param = {
+      id: row.id,
+      userid: self.$login.f.id
+    }
+    await self.$resetpost('rs/logic/priceNextFlow', param, {
+      warnMsg: `确定要通过气价名称为: ${row.f_price_name}的气价吗？`,
+      resolveMsg: '审核通过',
+      rejectMsg: '流程进行出错！！！'
+    })
+    self.$dispatch('success')
+  }
+
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/getGasPriceInfo', 20, {performDate: 'this.model.performDate', orderitem: `'${this.orderitem}'`}),
+        show: false,
+        criteriaShow: false,
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        row: {},
+        f_orgid: '',
+        gasproperties: [],
+        custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
+        price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
+        usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
+      }
+    },
+    props: {
+      orderitem: {
+        type: String,
+        default: 'f_price_id'
+      },
+      row: {},
+      config: {},
+      ispartial: false,
+      f_filialeid: {
+        type: String
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
+      this.search()
+    },
+    methods: {
+      batchAdjust () {
+        this.$parent.usershow = true
+        this.$parent.priceid = null
+        this.$parent.priceorgid = null
+      },
+      showhistory (row) {
+        this.show = true
+        this.row = row
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      operate (id, pricename, orgid) {
+        this.$parent.usershow = true
+        this.$parent.priceid = id
+        this.$parent.pricename = pricename
+        this.$parent.priceorgid = orgid
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('search')
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+        }
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        this.model.search(args.condition, args.model)
+      },
+      add () {
+        this.$dispatch('add')
+      },
+      passPrice (row) {
+        console.log('气价审核通过。。。', row, this.$refs.paged.$refs.grid.selected)
+        let selectedRow = this.$refs.paged.$refs.grid.selected
+        if (selectedRow) {
+          if (row.id !== selectedRow.id && selectedRow.f_state === '待审核') {
+            this.$showAlert('您通过的气价信息不是您选中的信息', 'warning', 3000)
+          } else {
+            passGen(this, row)
+          }
+        } else {
+          passGen(this, row)
+        }
+      },
+      historySeleted () {
+
+      }
+
+    },
+    watch: {
+      'model.rows.length' (val) {
+        if (val === 1) {
+          this.$refs.paged.$refs.grid.select(this.model.rows[0])
+          this.$parent.usershow = false
+        }
+      }
+    },
+    computed: {
+      pricetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      bookstates () {
+        return [ {label: '有效', value: "= '有效'"}, {label: '无效', value: "= '无效'"} ]
+      }
+    }
+  }
+</script>

package/src/filiale/liaoyuan/sale.js

@@ -36,6 +36,10 @@ let specialComp = {
   // 使用该抄表册的用户信息（使用户数）
   'meterbook-user':(resolve) => { require(['./MeterBookUser'], resolve) },
   // 补费扣费
-  'deduction-manage': (resolve) => { require(['./deductionManage'], resolve) }
+  'deduction-manage': (resolve) => { require(['./deductionManage'], resolve) },
+  // 气价管理（新增）
+  'gas-price': (resolve) => { require(['./comprehen/StairPrice/GasPrice'], resolve) },
+  // 所有气价信息列表
+  'gas-price-list': (resolve) => { require(['./comprehen/StairPrice/GasPriceList'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/zhongyi/FileUserFiles.vue

@@ -951,7 +951,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport',
+            await axios.post('rs/business/batchRunExcelDefault/filemanage_fileSave_zhongyi/newSettleFileImport',
               {data: param}, {timeout: 30000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successsum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)