sale-client 3.6.147 → 3.6.148

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -240,7 +240,7 @@
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
           </div>
-          <div class="col-sm-4 form-group" v-show="true" :class="[$m.f_install_date.required ? 'has-error' : '']">
+          <div class="col-sm-4 form-group" v-if="config.f_install_date" :class="[$m.f_install_date.required ? 'has-error' : '']">
             <input type="text" v-model="$refs.f_install_date.value" v-show="false" v-validate:f_install_date='{required: true }'>
             <label for="f_install_date" class="font_normal_body">&ensp;安装日期</label>
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
@@ -252,6 +252,18 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
+          <div class="col-sm-4 form-group" v-if="!config.f_install_date" :class="[$m.f_install_date.required ? 'has-error' : '']">
+            <input type="text" v-model="$refs.f_install_date.value" v-show="false">
+            <label for="f_install_date" class="font_normal_body">&ensp;安装日期</label>
+            <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
+                        v-model="row.f_install_date"
+                        :value.sync="row.f_install_date"
+                        class="datepicker"
+                        v-ref:f_install_date
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
           <div class="col-sm-4 form-group">
             <label for="f_adjustable" class="font_normal_body">&ensp;调&ensp;压&ensp;箱</label>
             <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
@@ -539,6 +551,7 @@
           // 卡控流量计相关字段显示
           stuckFlowmeterShow: false,
           overduesetShow: true,
+          f_install_date: true,
           open_way: '指令开户'
         },
         mapShow: false,

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -44,13 +44,13 @@
           </div>
           <div style="" class="col-sm-8 form-group"
                :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
-               v-if="baseinfo.base.f_credentials === '身份证'">
+               v-if="baseinfo.base.f_credentials === '身份证' &&  config.f_idnumber ">
             <label for="f_idnumber" class="font_normal_body">*证件号码</label>
             <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
                    v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
                    placeholder="证件号码">
           </div>
-          <div style="" class="col-sm-8 form-group" v-if="baseinfo.base.f_credentials !== '身份证'">
+          <div style="" class="col-sm-8 form-group" v-if="baseinfo.base.f_credentials !== '身份证' ||  !config.f_idnumber ">
             <label class="font_normal_body">&ensp;证件号码</label>
             <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
                    placeholder="证件号码">
@@ -234,6 +234,7 @@
       let result = await http.load('GET', `rs/vue/EditUserState.json`, {}, {resolveMsg: null, rejectMsg: null})
       console.log(result.data.EditUserState)
       self.edituserstate = result.data.EditUserState
+      self.config.f_idnumber = result.data.f_idnumber
     } catch (e) {
       console.log(e)
     }
@@ -246,6 +247,9 @@
       return {
         showselectaddress: false,
         site: '',
+        config: {
+          f_idnumber: true
+        },
         showphone: false,
         areas: [],
         streets: [],

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -36,14 +36,14 @@
           </div>
           <div style="" class="col-sm-8 form-group"
                :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
-               v-if="baseinfo.base.f_credentials === '身份证'||baseinfo.base.f_credentials[0] === '身份证'">
+               v-if="(baseinfo.base.f_credentials === '身份证'||baseinfo.base.f_credentials[0] === '身份证') && config.f_idnumber  ">
             <label for="f_idnumber" class="font_normal_body color-red">*证件号码</label>
             <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
                    v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
                    placeholder="证件号码">
           </div>
           <div style="" class="col-sm-8 form-group"
-               v-if="baseinfo.base.f_credentials !== '身份证'&&baseinfo.base.f_credentials[0] !== '身份证'">
+               v-if="(baseinfo.base.f_credentials !== '身份证'&&baseinfo.base.f_credentials[0] !== '身份证')|| !config.f_idnumber ">
             <label class="font_normal_body">&ensp;证件号码</label>
             <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
                    placeholder="证件号码">
@@ -222,6 +222,7 @@
         self.config.f_print_dh = result.data.f_print_dh
         self.baseinfo.base.f_print_dh = (self.baseinfo.base.f_print_dh && self.baseinfo.base.f_print_dh != '' && self.baseinfo.base.f_print_dh != '否') ? self.baseinfo.base.f_print_dh : result.data.f_print_dh
         self.edituserstate = result.data.EditUserState
+        self.config.f_idnumber = result.data.f_idnumber
       } catch (e) {
         console.log(e)
       }
@@ -237,7 +238,9 @@
           areas: [],
           streets: [],
           residentials: [],
-          config: {},
+          config: {
+            f_idnumber: true,
+          },
           inputtores: this.$appdata.getParam('抄表员'),
           credentials: this.$appdata.getParam('证件类型'),
           costtypes: this.$appdata.getParam('缴费类型'),

package/src/components/charge/HandList.vue

@@ -34,7 +34,7 @@
                   <!--</div>-->
                   <div class="row">
                     <label class = "col-sm-4">用气量:</label>
-                    <pre style="text-align:left" class = "col-sm-2">{{row.f_oughtamount}}</pre>
+                    <span style="text-align:left" class = "col-sm-2">{{row.f_oughtamount}}</span>
                     <label class = "col-sm-4">用气金额:</label>
                     <span class = "col-sm-2" style="text-align:left">{{row.f_oughtfee}}</span>
                   </div>

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -155,7 +155,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -148,7 +148,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/components/revenue/changeInsurance/InsuranceAdd.vue

@@ -145,11 +145,16 @@
             <input type="text" v-model="model.f_ok_number"  style="width: 60%"
                    class="input_search">
           </div>
-          <div class="col-sm-6" v-show="false">
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保险单号</label>
+            <input type="text" v-model="model.f_ins_number"  style="width: 60%"
+                   class="input_search">
+          </div>
+          <div class="col-sm-6 form-group"  v-show="false">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;公司 </label>
             <right-tree @re-res="getRes"></right-tree>
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;部门</label>
             <res-select restype='department'
                         :is-mul="mul"
@@ -158,7 +163,7 @@
                         :initresid='depid'>
             </res-select>
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;人员</label>
             <res-select restype='user'
                         @res-select="getuser"

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -34,13 +34,17 @@
                 </div>
                   <div style="float: right">
                     <button class="button_search" @click="search()">查 询</button>
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="rs/logic/saleExport" sql-name="getInsuranceChargesList" template-name='保险明细查询导出'
+                                  :choose-col="true"></export-excel>
                     <div class="button_spacing"  style="float:right;"
                          :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" >
-                <res-select-group :initres="$parent.$parent.initres"  :show-component="['company','department']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2  form-group">
                   <label class="font_normal_body">购买年限</label>
                   <input type="text" class="input_search" style="width: 60%" v-model="model.f_salecount"
@@ -71,7 +75,7 @@
                   <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>客户姓名</nobr>
+                  <nobr>投保人</nobr>
                 </th>
                 <th>
                   <nobr>客户地址</nobr>
@@ -113,7 +117,7 @@
                   <nobr>缴费时间</nobr>
                 </th>
                 <th>
-                  <nobr>确认书编号</nobr>
+                  <nobr>保险单号</nobr>
                 </th>
                 <th>
                   <nobr>险种</nobr>
@@ -124,6 +128,9 @@
                 <th>
                   <nobr>备注信息</nobr>
                 </th>
+                <th>
+                  <nobr>变更记录</nobr>
+                </th>
             </template>
             <template partial='body'>
               <td style="text-align: center;">
@@ -177,7 +184,7 @@
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_ok_number}}</nobr>
+                <nobr>{{row.f_ins_number}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_insurance_type}}</nobr>
@@ -188,9 +195,42 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>
+                  <span @click="$parent.$parent.$parent.changeDetail(row)"><a><b>变更记录</b></a></span>
+                </nobr>
+              </td>
             </template>
           </data-grid>
         </criteria-paged>
+        <modal :show.sync="insChnageDetailShow" v-ref:insChnageDetailShow backdrop="false" class="insChnageDetailShow">
+          <header slot="modal-header" class="modal-header" style="text-align: center">
+            <h4 class="modal-title">保险变更记录</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <data-grid class="list_area table_sy" :model="insChangeHistorys" partial='list'>
+              <template partial='head'>
+                <th style="text-align: center"><nobr>序号</nobr></th>
+                <th style="text-align: center"><nobr>更改内容</nobr></th>
+                <th style="text-align: center"><nobr>更改前</nobr></th>
+                <th style="text-align: center"><nobr>更改后</nobr></th>
+                <th style="text-align: center"><nobr>变更时间</nobr></th>
+                <th style="text-align: center"><nobr>变更人</nobr></th>
+              </template>
+              <template partial='body'>
+                <td style="text-align: center">{{$index+1}}</td>
+                <td style="text-align: center"><nobr>{{row.f_field_name}}</nobr></td>
+                <td style="text-align: center"><nobr>{{row.f_used_content}}</nobr></td>
+                <td style="text-align: center"><nobr>{{row.f_new_content}}</nobr></td>
+                <td style="text-align: center"><nobr>{{row.f_operate_date}}</nobr></td>
+                <td style="text-align: center"><nobr>{{row.f_operator}}</nobr></td>
+              </template>
+            </data-grid>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button type="button" class="btn btn-default"  @click='insChnageDetailShow = false'>关闭</button>
+          </footer>
+        </modal>
       </div>
     </div>
   </div>
@@ -218,8 +258,32 @@
         model: new PagedList('rs/sql/getInsuranceChargesList', 20),
         // 控制查询条件显示
         criteriaShow: false,
+        condition: '1=1',
         // 公司下拉
         curorgid: [this.$login.f.orgid],
+        insChangeHistorys: {rows: []},
+        insChnageDetailShow: false,
+        getExportField: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '投保人',
+          'f_address': '客户地址',
+          'f_idnumber': '身份证号',
+          'f_user_phone': '电话',
+          'f_fee_type': '费用类型',
+          'f_buy_date': '购买日期',
+          'f_expiration_date': '到期日期',
+          'f_shengxiao_date': '保费开始日期',
+          'f_last_insexpiration_date': '上期保费截至日期',
+          'f_days': '到期剩余天数',
+          'f_money': '金额',
+          'f_payment': '收款方式',
+          'f_state': '状态',
+          'f_operate_date': '缴费时间',
+          'f_ins_number': '保险单号',
+          'f_insurance_type': '险种',
+          'f_salecount': '购买年限',
+          'f_comments': '备注信息'
+        },
         f_filialeid: this.$login.f.orgid,
         percent: 0
       }
@@ -228,6 +292,21 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      async changeDetail (row) {
+        this.insChangeHistorys.rows = []
+        let data = {
+          tablename: `t_ins_change`,
+          items: '*',
+          condition: `1=1 and f_ins_id = '${row.id}'`,
+          orderitem: 'f_ins_id desc'
+        }
+        let urlParam = 'rs/sql/singleTable_OrderBy'
+        let res = await this.$resetpost(urlParam, {data: data}, {rejectMsg: '获取变更记录出错', resolveMsg: null})
+        if (res) {
+          this.insChangeHistorys.rows = res.data
+        }
+        this.insChnageDetailShow = true
+      },
       hidden () {
         this.criteriaShow = !this.criteriaShow
       },
@@ -246,10 +325,17 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        this.condition = args.condition
         this.model.search(args.condition, args.model)
       }
     },
-    computed: {}
+    computed: {
+      getCondition () {
+        return {
+          condition: this.condition
+        }
+      }
+    }
   }
 </script>
 <style>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -17,9 +17,15 @@
                       close-on-select clear-button>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" v-if="!config.f_change_operator">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   placeholder="换表人">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.f_change_operator" :class="[$v.f_change_operator.required ? 'has-error' : '']">
             <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
             <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   v-validate:f_change_operator="{required: true }"
                    placeholder="换表人">
           </div>
 
@@ -413,6 +419,7 @@ export default {
         payment: '现金缴费',
         open_way: '指令开户',
         hasArrearsChange: false, // 是否可以有欠费换表
+        f_change_operator: false, // 换表人是否必填
         castInt: true,
         dispatch: false, // 是否派工
         showupload: true, //

package/src/components/revenue/comprehen/insurance/insuranceGuanL.vue

@@ -60,7 +60,7 @@
               <nobr>客户编号</nobr>
             </th>
             <th>
-              <nobr>客户姓名</nobr>
+              <nobr>投保人</nobr>
             </th>
             <th>
               <nobr>客户电话</nobr>
@@ -207,6 +207,18 @@
             </v-select>
           </div>
           </div>
+          <div class="row">
+            <div class="col-sm-6  form-group" >
+              <label class="font_normal_body">投保人：</label>
+              <input type="text" v-model="base.f_user_name" placeholder="投保人" style="width: 60%"
+                     class="input_search"/>
+            </div>
+            <div class="col-sm-6  form-group" >
+              <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保险单号</label>
+              <input type="text" v-model="base.f_ins_number" class="input_search" style="width:60%"
+                     placeholder="保险单号" />
+            </div>
+          </div>
           <div class="row">
             <div class="col-sm-12  form-group">
               <label class="font_normal_body">备注信息</label>

package/src/components/revenue/machineHandManage/machineHand.vue

@@ -281,9 +281,6 @@
               <th>
                 <nobr>上期结余</nobr>
               </th>
-              <th>
-                <nobr>平均用气量</nobr>
-              </th>
               <th>
                 <nobr>表号</nobr>
               </th>
@@ -376,7 +373,6 @@
             <!--<td>{{row.f_room}}</td>-->
             <td>{{row.belongmonth}}</td>
             <td style="text-align: center;">{{row.f_balance}}</td>
-            <td style="text-align: center;">{{Math.round(row.avggas)}}</td>
             <td>{{row.f_meternumber}}</td>
             <td>{{row.f_user_phone}}</td>
             <td>{{row.f_last_tablebase}}</td>

package/src/filiale/dongguan/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -148,7 +148,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/filiale/lixianV3/ic_detail/HandQueryUser.vue

@@ -155,7 +155,7 @@
           二阶用气金额合计: {{sumsmodel.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{sumsmodel.f_stair3amount}}
+          三阶用气量合计:&emsp;{{sumsmodel.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{sumsmodel.f_stair3fee}}

package/src/filiale/lixianV3/iotHand.vue

@@ -97,7 +97,35 @@
                 <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                        condition="f_address like '%{}%'" placeholder='客户地址'>
               </div>
-
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表单状态</label>
+                <v-select :value.sync="model.f_meter_state" v-model='model.f_meter_state'
+                          style="width:60%"
+                          :options='$parent.$parent.meterstates' placeholder='抄表单状态'
+                          close-on-select
+                          condition="f_meter_state = '{}'"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表时间</label>
+                <datepicker placeholder="开始日期"
+                            style="width:60%"
+                            class="datepicker"
+                            v-model="model.startDate"
+                            condition="f_last_input_date >='{} 00:00:00'"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd'"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表时间</label>
+                <datepicker placeholder="结束日期"
+                            style="width:60%"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            condition="f_last_input_date <='{} 23:59:59'"
+                            :format="'yyyy-MM-dd'"
+                ></datepicker>
+              </div>
             </div>
           </div>
         </criteria>
@@ -139,6 +167,9 @@
               <th>
                 <nobr>本期底数</nobr>
               </th>
+              <th>
+                <nobr>最近一次抄表时间</nobr>
+              </th>
               <th>
                 <nobr>抄表员</nobr>
               </th>
@@ -164,6 +195,7 @@
                        @focus="$parent.$parent.$parent.clearError(row)"
                        :disabled="row.state === '开始'">
               </div>
+            <td>{{ row.f_last_input_date }}</td>
             <td>{{ row.f_inputtor }}</td>
           </template>
         </data-grid>
@@ -200,6 +232,7 @@ export default {
         downWay: 'downWithUserfiles',
         downInputtor: []
       },
+      meterstates: this.$appdata.getParam('抄表状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')] : [],
       inputtorModel: {
         inputtor: [],
         reason: ''

package/src/filiale/macheng/ic_detail/HandQueryUser.vue

@@ -155,7 +155,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/filiale/macheng/ic_detail/WebHandQueryUser.vue

@@ -148,7 +148,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/filiale/qianneng/revenue/common/ic_detail/HandQueryUser.vue

@@ -148,7 +148,7 @@
           二阶用气金额合计: {{model.sums.f_stair2fee}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          三阶用气金额合计:&emsp;{{model.sums.f_stair3amount}}
+          三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}

package/src/filiale/tongchuan/ChangeMeter.vue

@@ -169,6 +169,14 @@
                             close-on-select clear-button></v-select>
                 </div>
 
+        <div class="col-sm-4 form-group" :class="[$m.whetherreset.required ? 'has-error' : '']">
+          <label class="font_normal_body">是否清零</label>
+          <v-select :value.sync="model.f_whether_reset" v-model="model.f_whether_reset"
+                    placeholder='是否清零' :options="whetherresets"
+                    :value-single="true"
+                    close-on-select v-ref:whetherreset>
+          </v-select>
+        </div>
         <div class="col-sm-4"
              :class="[$v.f_stair_use.required || $v.f_stair_use.dctest ? 'has-error' : 'has-success']"
              v-if="row.f_meter_type.includes('卡表') && model.metermessage.gasbrand[0].f_meter_type ==='物联网表'&& model.f_ladder_sync !=='不同步'">
@@ -292,6 +300,7 @@ export default {
         f_payment: '现金缴费',
         f_print: '普通收据',
         f_state: '有效',
+        f_whether_reset: '否',
         f_changemeter_date: this.$login.toStandardTimeString(),
         f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0
       },
@@ -325,6 +334,7 @@ export default {
         f_perform_date: this.$login.toStandardDateString() + ' 00:00:00' // 操作时间
       },
       ladder: [{label: '累计', value: '同步'}, {label: '不累计', value: '不同步'}],
+      whetherresets: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
       opentype: [{label: '指令开户', value: '指令开户'}, {label: '发卡开户', value: '发卡开户'}],
       pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],