sale-client 3.6.114 → 3.6.115

package/package.json

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

package/src/components/charge/business/PriceChangeCompensation/IotCompensation.vue

@@ -157,8 +157,8 @@
     let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
       {data: {items: "f_user_id,f_userfiles_id,f_change_price,sum(f_real_amount)f_real_amount,f_userinfo_id,f_type,sum(f_surplus_fee) as 'f_surplus_fee'",
         tablename: 't_surplus_detail',
-        condition: `f_userfiles_id = '${self.row.f_userfiles_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userfiles_id,f_userinfo_id,f_type,f_change_price`,
-        orderitem: 'f_userfiles_id'}},
+        condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userfiles_id,f_userinfo_id,f_type,f_change_price`,
+        orderitem: 'f_userinfo_id'}},
       {resolveMsg: null, rejectMsg: null})
     if (getSurplus.data.length > 0) {
       self.row.f_surplus_id = getSurplus.data[0].id

package/src/components/charge/business/PriceChangeCompensation/JbCompensation.vue

@@ -176,8 +176,8 @@
     let getSurplus = await http.load('POST', 'rs/sql/singleTable_OrderBy',
       {data: {items: "min(id) minid,f_user_id,f_userfiles_id,sum(f_real_amount) f_real_amount,f_userinfo_id,f_type,sum(f_surplus_fee) f_surplus_fee",
         tablename: 't_surplus_detail',
-        condition: `f_userfiles_id = '${self.row.f_userfiles_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userfiles_id,f_userinfo_id,f_type`,
-        orderitem: 'f_userfiles_id'}},
+        condition: `f_userinfo_id = '${self.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否' GROUP BY f_user_id,f_userfiles_id,f_userinfo_id,f_type`,
+        orderitem: 'f_userinfo_id'}},
       {resolveMsg: null, rejectMsg: null})
     if (getSurplus.data.length > 0) {
       self.row.f_surplus_id = getSurplus.data[0].minid

package/src/components/charge/business/PriceChangeCompensation/SurplusRecordDetail.vue

@@ -57,8 +57,8 @@ export default {
       var suplusList = await http.load('POST', 'rs/sql/singleTable_OrderBy',
         {data: {items: "*",
             tablename: 't_surplus_detail',
-            condition: `f_userfiles_id = '${this.row.f_userfiles_id}' and f_state='有效' and f_whether_pay = '否'`,
-            orderitem: 'f_userfiles_id'}},
+            condition: `f_userinfo_id = '${this.row.f_userinfo_id}' and f_state='有效' and f_whether_pay = '否'`,
+            orderitem: 'f_userinfo_id'}},
         {resolveMsg: null, rejectMsg: null})
       this.model.rows = suplusList.data
     }

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue

@@ -94,10 +94,10 @@
               <datepicker placeholder="开始日期"
                           style="width:60%"
                           class="datepicker"
-                          v-model="model.f_offsite_time"
-                          :value.sync="model.f_offsite_time"
+                          v-model="model.f_last_check_date"
+                          :value.sync="model.f_last_check_date"
                           :format="'yyyy-MM-dd'"
-                          condition="f_offsite_time >= '{} 00:00:00'"
+                          condition="f_last_check_date >= '{} 00:00:00'"
               ></datepicker>
             </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
@@ -146,7 +146,7 @@
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_card_id}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_user_phone}}</td>
           <td style="text-align: center;">{{row.f_address}}</td>
-          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_offsite_time}}</td>
+          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_last_check_date}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_operator}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_comments}}</td>

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -538,7 +538,7 @@ import axios from 'axios'
         args.condition = `${args.condition} ` + this.orgcondition
         if (this.$refs.paged.$refs.criteria.model.f_meter_brand) {
           if (this.$refs.paged.$refs.criteria.model.f_meter_brand.length > 0) {
-            args.condition = `${args.condition} ` + `and f_gasbrand_id = ${this.$refs.paged.$refs.criteria.model.f_meter_brand[0].id}`
+            args.condition = `${args.condition} ` + `and f_meter_brand = '${this.$refs.paged.$refs.criteria.model.f_meter_brand[0]}'`
           }
         }
         args.condition = `${args.condition} ` + this.uploadCodeCondition

package/src/filiale/liaoyuan/NewPriceAdjustment.vue

@@ -29,15 +29,15 @@
                          condition="f_user_name = '{}'">
                 </div>
 
-<!--                <div class="form-group col-sm-2">-->
-<!--                  <label class="font_normal_body" style="color: #c52323">气价变更时间</label>-->
-<!--                  <datepicker placeholder="气价变更时间"-->
-<!--                              style="padding: 2px;width: 60%"-->
-<!--                              v-model="model.f_change_date"-->
-<!--                              :value.sync="model.f_change_date"-->
-<!--                              :format="'yyyy-MM-dd'"-->
-<!--                  ></datepicker>-->
-<!--                </div>-->
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body" style="color: #c52323">气价变更时间</label>
+                  <datepicker placeholder="气价变更时间"
+                              style="padding: 2px;width: 60%"
+                              v-model="model.f_change_date"
+                              :value.sync="model.f_change_date"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
                 <div class="span" style="float:right;">&nbsp;&nbsp;
                   <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                   <button class="button_search" @click="search()" v-el:cx>查询</button>
@@ -260,6 +260,27 @@
                 <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>
@@ -276,9 +297,9 @@
               <th style="text-align: center;">{{row.f_user_type}}</th>
               <th style="text-align: center;">{{row.f_meter_type}}</th>
               <th style="text-align: center;">{{row.f_price_name}}</th>
-              <th style="text-align: center;">{{row.f_stair_gas1}}</th>
-              <th style="text-align: center;">{{row.f_stair_gas2}}</th>
-              <th style="text-align: center;">{{row.f_stair_gas3}}</th>
+              <th style="text-align: center;">{{row.stair_gas1}}</th>
+              <th style="text-align: center;">{{row.stair_gas2}}</th>
+              <th style="text-align: center;">{{row.stair_gas3}}</th>
               <th style="text-align: center;">{{row.f_stair_price1}}</th>
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
@@ -308,6 +329,15 @@
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">{{row.f_input_date}}</th>
               <th style="text-align: center;">{{row.f_last_input_date}}</th>
+
+              <th style="text-align: center;">{{row.startday}}</th>
+              <th style="text-align: center;">{{row.startpregas}}</th>
+
+              <th style="text-align: center;">{{row.endday}}</th>
+              <th style="text-align: center;">{{row.f_pregas}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas1}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas2}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas3}}</th>
               <th style="text-align: center;">{{row.f_operate_date}}</th>
               <th style="text-align: center;">
                 <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
@@ -375,7 +405,7 @@
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.f_change_date = ''
     getPrice(self)
-    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.$showAlert('请输入[气价变更时间,气价类型]后进行查询！', 'warning', 2000)
     self.pricechange = false
 
   }
@@ -815,12 +845,18 @@
           this.pricechange = false
           return
         }
+        if ( this.$refs.paged.$refs.criteria.model.f_change_date == '') {
+          this.$showAlert('请输入[气价变更时间]后进行查询！', 'warning', 2000)
+          this.model.rows = []
+          this.pricechange = false
+          return
+        }
         if (args.model.price_states.toString() === '' || args.model.price_states.toString() === ' >0') {
           this.pricechange = false
           // args.model.addSelectParam = 'u5.f_surplus_fee,u5.id,u5.f_state,u5.f_new_price,u5.f_old_price,u5.f_change_price,u5.f_whether_pay,u5.f_sell_id,'
           // args.model.joinTable = 'left join t_surplus_detail u5 on u5.f_handplan_id = u1.f_handplan_id'
         } else {
-          if(args.model.price_name && args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
+          if(args.model.price_name[0] && args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
             this.pricechange = true
           }else {
             this.pricechange = false

package/src/filiale/liaoyuan/NewPriceAdjustmentSell.vue

@@ -0,0 +1,596 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">组织机构</label>
+                  <res-select
+                    :initresid='$parent.$parent.curorgid'
+                    @res-select="$parent.$parent.getorg"
+                    is-mul="false"
+                    restype='organization'
+                  >
+                  </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" placeholder='客户编号'
+                         condition="f_userinfo_code = '{}'" >
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_user_name" placeholder='客户名称'
+                         condition="f_user_name = '{}'">
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期"
+                              style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期"
+                              style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="span" style="float:right;">&nbsp;&nbsp;
+                  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  <button class="button_search" @click="search()" v-el:cx>查询</button>
+                  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
+                  <div style="float: right"  class="button_spacing"
+                       :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                       @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                         condition="u3.f_address like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">电&emsp;&emsp;话</label>
+                  <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_phone" placeholder='电话'
+                         condition="f_user_phone like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                         condition="f_meternumber like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">状&emsp;&emsp;态</label>
+                  <v-select id="price_states"
+                            v-model="model.price_states"
+                            placeholder='调价状态'
+                            style="width: 60%"
+                            :value.sync="model.price_states"
+                            :options='$parent.$parent.price_states'
+                            condition="f_change_price1 {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select id="f_user_tye"
+                            v-model="model.f_user_type"
+                            placeholder='用户类型'
+                            style="width: 60%"
+                            @change="$parent.$parent.userTypeChange"
+                            :value.sync="model.f_user_type"
+                            :options='$parent.$parent.userTypes'
+                            condition="u2.f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select id="f_price_type"
+                            v-model="model.price_type"
+                            placeholder='气价类型'
+                            :value-single="true"
+                            style="width: 60%"
+                            :value.sync="model.price_type"
+                            @change="$parent.$parent.priceTypeChange"
+                            :options='$parent.$parent.priceTypes'
+                            condition="sp.f_price_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">气&emsp;&emsp;价</label>
+                  <v-select id="f_price_name"
+                            v-model="model.price_name"
+                            placeholder='气价名称'
+                            style="width: 60%"
+                            :value.sync="model.price_name"
+                            :options='$parent.$parent.price_name'
+                            condition="sp.id = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+            <template partial='head'>
+              <tr>
+                <th><nobr>序号</nobr></th>
+                <th><nobr>客户编号</nobr></th>
+                <th><nobr>表号</nobr></th>
+                <th><nobr>姓名</nobr></th>
+                <th><nobr>用户类型</nobr></th>
+                <th><nobr>气表类型</nobr></th>
+                <th><nobr>购气时间</nobr></th>
+                <th><nobr>购气量</nobr></th>
+                <th><nobr>购气金额</nobr></th>
+                <th><nobr>气价名称</nobr></th>
+                <th>
+                  <nobr>一阶气量</nobr>
+                </th>
+                <th>
+                  <nobr>二阶气量</nobr>
+                </th>
+                <th>
+                  <nobr>三阶气量</nobr>
+                </th>
+                <th>
+                  <nobr>一阶单价</nobr>
+                </th>
+                <th>
+                  <nobr>二阶单价</nobr>
+                </th>
+                <th>
+                  <nobr>三阶单价</nobr>
+                </th>
+                <th>
+                  <nobr>一阶补差单价</nobr>
+                </th>
+                <th>
+                  <nobr>二阶补差单价</nobr>
+                </th>
+                <th>
+                  <nobr>三阶补差单价</nobr>
+                </th>
+                <th>
+                  <nobr>一阶补差金额</nobr>
+                </th>
+                <th>
+                  <nobr>二阶补差金额</nobr>
+                </th>
+                <th>
+                  <nobr>三阶补差金额</nobr>
+                </th>
+
+                <th><nobr>补差气量</nobr></th>
+                <th><nobr>补差金额</nobr></th>
+                <th><nobr>差价来源</nobr></th>
+                <th><nobr>操作</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{$index+1}}</td>
+              <th style="text-align: center;">{{row.f_userinfo_code}}</th>
+              <th style="text-align: center;">{{row.f_meternumber}}</th>
+              <th style="text-align: center;">{{row.f_user_name}}</th>
+              <th style="text-align: center;">{{row.f_user_type}}</th>
+              <th style="text-align: center;">{{row.f_meter_type}}</th>
+              <th style="text-align: center;"><nobr>{{row.sell_date}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></th>
+              <th style="text-align: center;">{{row.f_price_name}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas1}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas2}}</th>
+              <th style="text-align: center;">{{row.f_stair_gas3}}</th>
+              <th style="text-align: center;">{{row.f_stair_price1}}</th>
+              <th style="text-align: center;">{{row.f_stair_price2}}</th>
+              <th style="text-align: center;">{{row.f_stair_price3}}</th>
+              <th style="text-align: center;">
+                <div v-if="!row.f_change_price1">
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
+                  </button>
+
+                </div>
+                <div v-else>
+                  {{row.f_change_price1}}
+                </div>
+
+              </th>
+              <th style="text-align: center;">{{row.f_change_price2}}</th>
+              <th style="text-align: center;">{{row.f_change_price3}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee1}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee2}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee3}}</th>
+              <!--              <th style="text-align: center;">{{row.f_address}}</th>-->
+<!--              <th style="text-align: center;">-->
+<!--                <div class="form-group" style="margin-bottom:0px;"-->
+<!--                     v-if="!row.f_new_price>0">-->
+<!--                  <input type="text" class="form-control" v-model="row.oldprice"-->
+<!--                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">-->
+<!--                </div>-->
+<!--                <div v-else>{{row.f_old_price}}</div>-->
+<!--              </th>-->
+<!--              <th style="text-align: center;">-->
+<!--                <div class="form-group" style="margin-bottom:0px;"-->
+<!--                     v-if="!row.f_new_price>0">-->
+<!--                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"-->
+<!--                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">-->
+<!--                </div>-->
+<!--                <div v-else>{{row.f_new_price}}</div>-->
+<!--              </th>-->
+<!--              <th style="text-align: center;">-->
+<!--                <div class="form-group" style="margin-bottom:0px;" v-if="!row.f_surplus_id">-->
+<!--                  <input type="number" class="form-control" v-model="row.f_change_price"  @blur="$parent.$parent.$parent.enter(row)"-->
+<!--                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">-->
+<!--                </div>-->
+<!--                <div v-else>{{row.f_change_price}}</div>-->
+<!--              </th>-->
+<!--              <th style="text-align: center;">{{row.f_change_price}}</th>-->
+              <th style="text-align: center;">{{row.f_pregas}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee}}</th>
+              <th style="text-align: center;">{{row.f_source}}</th>
+              <th style="text-align: center;">
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                        @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
+                </button>
+              </th>
+            </template>
+          </data-grid>
+        </criteria-paged>
+        <modal :show.sync="show">
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">调 价 补 差</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <div class="flex">
+              <div class="row" v-if="model.model.price_type==='阶梯气价'">
+                <div class="row">
+                  <div class="form-group col-sm-6">
+                    <label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price1}})</span>一阶补差单价</label>
+                    <input type="text" class="form-control" v-model="f_change_price1">
+                  </div>
+                </div>
+                <div class="row" >
+                  <div class="form-group col-sm-6">
+                    <label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price2}})</span>二阶补差单价</label>
+                    <input type="text" class="form-control" v-model="f_change_price2">
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="form-group col-sm-6 ">
+                    <label class="font_normal_body col-sm-9"><span v-if="operatorrow">({{operatorrow.f_stair_price3}})</span>三阶补差单价</label>
+                    <input type="text" class="form-control" v-model="f_change_price3">
+                  </div>
+                </div>
+              </div>
+              <div v-else>
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">补差单价</label>
+                  <input type="text" class="form-control" v-model="f_change_price1">
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" @click="priceadjustment">生成调价补差表</button>
+            <button type="button" class="btn btn-default" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <work-busy :is-busy="locking" v-show="locking"></work-busy>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.criteria.model.f_change_date = ''
+    getPrice(self)
+    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.pricechange = false
+
+  }
+  let getPrice = async function(self) {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {
+      resolveMsg: null,
+      rejectMsg: null
+    }).then((res) => {
+      console.log('气价信息-------->',res.data)
+      let rs = []
+      for (let i = 0; i < res.data.length; i++) {
+        let temp = {
+          label: res.data[i].f_price_name+`(${res.data[i].id})`,
+          type:res.data[i].f_price_type,
+          flage: res.data[i].f_user_type,
+          value: res.data[i].id
+        }
+        rs.push(temp)
+      }
+      console.log(rs)
+      self.pricers = [ ...rs]
+      self.priceTypeChange()
+    })
+  }
+
+  export default {
+    title: '调价补差',
+    data () {
+      return {
+        f_orgid: '',
+        f_filialeid: this.$login.f.orgid,
+        operatorrow:'',
+        operatortype :'one',
+        pricechange: true,
+        criteriaShow: false,
+        f_change_price1:0,
+        f_change_price2:0,
+        f_change_price3:0,
+        pricers: [{label: '全部', value: '', flage: ''}],
+        price_name: [{label: '全部', value: ''}],
+        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' is not null'}, {label: '未调价', value: 'is null'}],
+        userTypes: this.$appdata.getParam('用户类型') ? [...this.$appdata.getParam('用户类型')] : [],
+        priceTypes: this.$appdata.getParam('气价类型') ? [ ...this.$appdata.getParam('气价类型')] : [],
+        condition: '',
+        locking: false,
+        model: new PagedList('rs/sql/get_AdjustSellCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
+        f_new_price: 0.0,
+        f_old_price:0.0,
+        f_change_price:0.0,
+        show: false,
+        curorgid: [this.$login.f.orgid],
+        addSelectParam: ''
+        // joinTable:'',
+      }
+    },
+    ready () {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      calculation (row) {
+        this.f_change_price1 = 0,
+          this.f_change_price2 = 0,
+          this.f_change_price3 = 0,
+          this.pricetime_states = ''
+        this.show = true
+        this.operatorrow = row
+        this.operatortype = 'one'
+      },
+      getorg (val) {
+        this.f_filialeid = val[0]
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      priceTypeChange () {
+        console.log(1)
+        this.price_name = []
+        if (this.$refs.paged.$refs.criteria.model.f_user_type) {
+          if (this.$refs.paged.$refs.criteria.model.price_type) {
+            console.log(2)
+            for (let i = 0; i < this.pricers.length; i++) {
+              if (this.pricers[i].type === this.$refs.paged.$refs.criteria.model.price_type && this.pricers[i].flage === this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+                let rs = {
+                  type:this.pricers[i].type,
+                  label: this.pricers[i].label,
+                  value: this.pricers[i].value
+                }
+                this.price_name.push(rs)
+              }
+            }
+          }
+        }
+      },
+      // 用户类型发生改变
+      userTypeChange () {
+        this.price_name = []
+        if (this.$refs.paged.$refs.criteria.model.price_type) {
+          if (this.$refs.paged.$refs.criteria.model.price_type) {
+            for (let i = 0; i < this.pricers.length; i++) {
+              if (this.pricers[i].type === this.$refs.paged.$refs.criteria.model.price_type && this.pricers[i].flage === this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+                let rs = {
+                  type:this.pricers[i].type,
+                  label: this.pricers[i].label,
+                  value: this.pricers[i].value
+                }
+                this.price_name.push(rs)
+              }
+            }
+          }
+        }
+      },
+      // 冲正
+      delectHand (row) {
+        this.$showMessage('冲正后不可恢复，确定冲正吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            row.f_operator = this.$login.f.name
+            row.f_operatorid = this.$login.f.id
+            row.f_orgid = this.$login.f.orgid
+            row.f_orgname = this.$login.f.orgs
+            row.f_depid = this.$login.f.depids
+            row.f_depname = this.$login.f.deps
+            this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
+              // this.$dispatch('refresh', '正在处理', row)
+              this.selfSearch(this.model)
+            })
+          }
+        })
+      },
+      priceshow () {
+        this.operatorrow = this.model.rows[0]
+        this.show = true
+        this.f_change_price1 = 0
+        this.f_change_price2 = 0
+        this.f_change_price3 = 0
+        this.pricetime_states = ''
+        this.operatortype = 'batch'
+      },
+      close () {
+        this.show = false
+        this.f_change_price1 = 0
+        this.f_change_price2 = 0
+        this.f_change_price3 = 0
+      },
+      async priceadjustment () {
+        if (this.operatortype == 'one') {
+          this.enter()
+        } else if (this.operatortype == 'batch') {
+          this.$showMessage('确认生成补差记录吗?', ['cancel', 'confirm']).then(
+            (response) => {
+              if (response === 'confirm') {
+                this.show = false
+                this.locking = true
+                this.getAdjustData()
+              }
+            })
+        }
+      },
+      async enter (row) {
+
+        let param = {
+          f_state: '有效',
+          f_change_price1:this.f_change_price1,
+          f_change_price2:this.f_change_price2,
+          f_change_price3:this.f_change_price3,
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          f_start_date: this.model.model.startDate + ' 00:00:00',
+          f_end_date: this.model.model.endDate + ' 23:59:59',
+          f_change_date: this.model.model.f_change_date,
+          row: this.operatorrow
+        }
+        await this.$resetpost('rs/logic/newpriceAdjustmentSell', {data: param}, {resolveMsg: '调价补差成功!', rejectMsg: '调价补差失败!'})
+        this.operatorrow = {}
+        this.show = false
+        this.selfSearch(this.model)
+
+
+
+      },
+      async getAdjustData () {
+        try {
+          let param = {
+            f_state: '有效',
+            f_resource:'卡表收费',
+            pricetime_states: this.pricetime_states,
+            f_change_price1:this.f_change_price1,
+            f_change_price2:this.f_change_price2,
+            f_change_price3:this.f_change_price3,
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            f_start_date: this.model.model.startDate + ' 00:00:00',
+            f_end_date: this.model.model.endDate + ' 23:59:59',
+            f_change_date: this.model.model.f_change_date,  //调价时间
+            condition: ''
+          }
+          let searchCondition = {
+            data: {
+              condition: this.condition,
+              f_change_date: this.model.model.f_change_date === '' ? '1911-01-01' : this.model.model.f_change_date,
+              startDate: this.model.model.startDate,
+              endDate: this.model.model.endDate, addSelectParam: '', price_states: 'not'
+            }
+          }
+          param.condition = searchCondition
+          let res = await this.$resetpost('rs/logic/newpriceAdjustmentAll', {data: param}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          if (res.data) {
+            this.$showMessage(`本次调价用户数：${res.data.allsize},调价成功数量:${res.data.successsize},无需调价数量:${res.data.nodealsize},调价错误数量:${res.data.errorsize}`, ['confirm'])
+          }
+          this.close()
+          this.$refs.paged.$refs.criteria.search()
+          this.locking = false
+          this.pricetime_states = ''
+          this.f_new_price = ''
+        } catch (error) {
+          this.$showAlert('生成调价补差表失败!!!', 'error', 3)
+          this.locking = false
+        }
+      },
+      search () {
+        this.selfSearch()
+      },
+      async selfSearch (args) {
+        this.f_prices = [{label: '全部', value: ''}]
+        if (this.$refs.paged.$refs.criteria.model.price_type == '') {
+          this.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+          this.model.rows = []
+          this.pricechange = false
+          return
+        }
+        args.model.addSelectParam = ''
+        if( args.model.price_name[0] && args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
+          this.pricechange = true
+        }else {
+          this.pricechange = false
+        }
+        this.condition = `${args.condition} and u2.f_orgid = '${this.f_filialeid}'`
+        await this.model.search(this.condition, args.model)
+        // let arr2 = this.model.rows.filter((value, index, array) => {
+        //   return array.findIndex(item => item.key === value.key && item.f_price === value.f_price) === index
+        // })
+        // let rs = [{label: '全部', value: ''}]
+        // arr2.forEach(function (item) {
+        //   console.log('item', item.f_price)
+        //   let temp = {
+        //     label: item.f_price,
+        //     value: item.f_price
+        //   }
+        //   rs.push(temp)
+        // })
+        // this.f_prices = rs
+        // console.log('this.f_price', this.f_prices)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = ''
+        })
+      }
+    },
+    computed: {
+    },
+    watch: {
+      async 'f_filialeid' (val) {
+        // 更新抄表册
+        this.$refs.paged.$refs.criteria.model.f_meter_book = []
+        this.$refs.paged.$refs.criteria.model.f_book_slice_area = []
+        this.$refs.paged.$refs.criteria.model.f_inputtor = []
+        this.meterbooks = [{label: '全部', value: ''}]
+        if (this.f_filialeid) {
+          getPrice(this)
+        }
+      }
+    }
+  }
+</script>
+
+<style >
+</style>

package/src/filiale/liaoyuan/NewPriceAdjustmentWebmeter.vue

@@ -551,7 +551,7 @@
           return
         }
         args.model.addSelectParam = ''
-        if( args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
+        if(args.model.price_name[0] && args.model.price_type && args.model.price_states[0] && args.model.price_states[0]==='is null'){
           this.pricechange = true
         }else {
           this.pricechange = false

package/src/filiale/liaoyuan/PriceAdjustmentManage.vue

@@ -7,9 +7,9 @@
     <tabs header="机表调价补差">
       <new-price-adjustment @deal-msg="dealMsg"></new-price-adjustment>
     </tabs>
-<!--    <tabs header="卡表调价补差">-->
-<!--      <price-adjustment-card v-if="show[1]" @deal-msg="dealMsg"></price-adjustment-card>-->
-<!--    </tabs>-->
+    <tabs header="卡表调价补差">
+      <new-price-adjustment-sell  @deal-msg="dealMsg"></new-price-adjustment-sell>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/filiale/liaoyuan/sale.js

@@ -34,6 +34,7 @@ export default function () {
 
   // 调价补差(新)
   Vue.component('new-price-adjustment', (resolve) => { require(['./NewPriceAdjustment'], resolve) })
+  Vue.component('new-price-adjustment-sell', (resolve) => { require(['./NewPriceAdjustmentSell'], resolve) })
   Vue.component('new-price-adjustment-webmeter', (resolve) => { require(['./NewPriceAdjustmentWebmeter'], resolve) })
   // 售气收费 --弹出框
   Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })

package/src/filiale/lixianV3/MeterReadAudit.vue

@@ -37,9 +37,9 @@
 <!--              <button class="button_search button_spacing width-60"-->
 <!--                      @click="$parent.$parent.allsuccess()" v-el:cx>全部通过-->
 <!--              </button>-->
-              <button class="button_search button_spacing width-60"
-                      @click="$parent.$parent.allfaild()" v-el:cx>全部不通过
-              </button>
+<!--              <button class="button_search button_spacing width-60"-->
+<!--                      @click="$parent.$parent.allfaild()" v-el:cx>全部不通过-->
+<!--              </button>-->
 <!--              <export-excel-->
 <!--                :data="$parent.$parent.getCondition"-->
 <!--                :field="$parent.$parent.config.excelHeaders"-->
@@ -269,7 +269,7 @@ export default {
       orgCondtionStr: '',
       criteriaShow: false,
       show: false,
-      pushdata: {openid: '', cause: ''},
+      pushdata: {f_user_phone: '',f_userinfo_id: '',f_user_name: '',f_open_id: '',cause: '',isPass: ''},
       row: null,
       model: new PagedList('rs/sql/meterReadAudit', 20),
       states: [{label: '待审核', value: ` f_meter_state = '待审核' and f_hand_state ='有效'`}, {
@@ -355,7 +355,18 @@ export default {
           f_meter_brand: row.f_meter_brand,
           f_audit_person: this.$login.f.name
         }
-        await this.$resetpost('rs/logic/handPlanAudit', data, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
+        await this.$resetpost('rs/logic/handPlanAudit', data, {resolveMsg: '操作成功', rejectMsg: '操作失败'}).then((res) => {
+          // this.$info(`获取到数据, data:${JSON.stringify(a.data)}`)
+          if (res.data === 200) {
+            this.pushdata.f_open_id = row.f_open_id
+            this.pushdata.f_user_phone = row.f_user_phone
+            this.pushdata.f_userinfo_id = row.f_userinfo_id
+            this.pushdata.f_userfiles_id = row.f_userfiles_id
+            this.pushdata.f_user_name = row.f_user_name
+            this.pushdata.isPass = '通过'
+            this.confirm()
+          }
+        })
         this.search()
       }
     },
@@ -384,19 +395,24 @@ export default {
     async faild (row) {
       let res = await this.$showMessage('确定作废该条抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       if (res === 'confirm') {
-        // this.row = row
-        // this.pushdata.openid = row.f_open_id
-        // this.show = true
+        this.row = row
+        this.pushdata.f_open_id = row.f_open_id
+        this.pushdata.f_user_phone = row.f_user_phone
+        this.pushdata.f_userinfo_id = row.f_userinfo_id
+        this.pushdata.f_userfiles_id = row.f_userfiles_id
+        this.pushdata.f_user_name = row.f_user_name
+        this.pushdata.isPass = '不通过'
+        this.show = true
         let sql = `UPDATE t_handplan SET f_hand_state = '无效',f_audit_person = '${this.$login.f.name}',f_audit_date = getDate() WHERE id = ${row.id}`
         await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
         this.search()
       }
     },
     async confirm () {
-      await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
-      await this.$resetpost('http://www.hunanhongdaranqi.com/weixin/rs/logic/meterReadFailed', this.pushdata, {
-        resolveMsg: null,
-        rejectMsg: null
+      // await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
+      await this.$resetpost('wx/rs/logic/meterReadMsg', this.pushdata, {
+        resolveMsg: '推送请求发送成功',
+        rejectMsg: '推送请求发送失败'
       })
       this.show = false
       this.search()