sale-client 3.6.50 → 3.6.51

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/OffGasAddGas/OffGasAddGas.vue

@@ -5,13 +5,13 @@
         <div class="row" style="margin-top:10px;">
           <div class="col-sm-4"  :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
             <label class=" font_normal_body" >*补气量</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_pregas"
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_pregas" :readonly="!applyButtonShow"
                    v-validate:f_pregas='{required: true, dctest: [0, ">=" ]}'  placeholder="补气量">
           </div>
           <div class="col-sm-4">
             <label  for="f_pregas" class=" font_normal_body" >补气金额</label>
             <input class="input_search" style="width:60%" type="text" v-model="model.f_fillamount"
-                   v-validate:f_pregas='{required: true }'  placeholder="补气金额">
+                   v-validate:f_pregas='{required: true }' :readonly="!applyButtonShow" placeholder="补气金额">
           </div>
           <div class="col-sm-4">
             <label for="f_reason" class=" font_normal_body" >补气原因</label>
@@ -20,6 +20,7 @@
                       placeholder='补气原因'
                       :value.sync="model.f_reason"
                       :options='addGasReason'
+                      :disabled="!applyButtonShow"
                       close-on-select ></v-select>
           </div>
           <div class="col-sm-4">
@@ -30,6 +31,7 @@
                       value-single
                       :value.sync="model.f_write_card"
                       :options='writecard'
+                      :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -37,7 +39,7 @@
         <div class="row" style="margin-top:10px;" v-if="model.f_reason[0] ==='其他'">
           <div class="col-sm-offset-2 col-sm-8" :class="[$v.f_othereason.required ? 'has-error' : '']">
             <label for="f_reason" class=" font_normal_body" >其他原因</label>
-            <input class="input_search" style="width:60%" v-validate:f_othereason='{required: true }' rows="3" v-model="model.f_othereason" placeholder="请填写补气原因">
+            <input class="input_search" style="width:60%" v-validate:f_othereason='{required: true }' rows="3" :readonly="!applyButtonShow" v-model="model.f_othereason" placeholder="请填写补气原因">
           </div>
         </div>
       </form>
@@ -237,6 +239,7 @@ export default {
     async apply () {
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name}，编号：${this.row.f_userinfo_code} 申请掉气补气`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+      this.addTaskModel.f_memorandum = this.model.f_othereason
       this.addTaskModalShow = true
     },
     close () {

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -6,7 +6,7 @@
           <div class="row" v-if="isGas">
             <div class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
               <label class="font_normal_body">应补气量</label>
-              <input class="input_search" style="width:60%" type="number" @blur="pregas"
+              <input class="input_search" style="width:60%" type="number" @blur="pregas" :readonly="!applyButtonShow"
                      v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="应补气量" v-ref:f_pregas>
             </div>
             <div class="col-sm-4">
@@ -16,6 +16,7 @@
                         placeholder='请选择'
                         :value.sync="model.f_add_gas"
                         :options='addGas'
+                        :disabled="!applyButtonShow"
                         close-on-select clear-button>
               </v-select>
             </div>
@@ -25,6 +26,7 @@
                         v-model="model.f_write_card"
                         placeholder='是否写卡'
                         value-single
+                        :disabled="!applyButtonShow"
                         :value.sync="model.f_write_card"
                         :options='writecard'
                         close-on-select clear-button></v-select>
@@ -33,7 +35,7 @@
           <div class="row" v-if="!isGas">
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">应补金额:</label>
-              <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" placeholder="金额">
+              <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" :readonly="!applyButtonShow" placeholder="金额">
             </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计:</label>
@@ -41,13 +43,14 @@
                         placeholder='请选择'
                         :value.sync="model.f_add_gas"
                         :options='addGas'
+                        :disabled="!applyButtonShow"
                         close-on-select clear-button>
               </v-select>
             </div>
           </div>
           <div class="row" style="margin-top:10px;">
             <label for="f_reason" class=" font_normal_body">备&emsp;&emsp;注</label>
-              <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" placeholder="备注">
+              <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" :readonly="!applyButtonShow" placeholder="备注">
           </div>
         </form>
         <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
@@ -326,6 +329,7 @@
       async apply () {
         this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请其他补气`
         this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+        this.addTaskModel.f_memorandum = this.model.f_reason
         this.addTaskModalShow = true
       },
       accept () {

package/src/filiale/shexian/revenue/MeterMessage.vue

@@ -0,0 +1,186 @@
+<template>
+  <!--<div class="auto">-->
+    <validator name='v'  @valid="onValid()"  @invalid="onInvalid()">
+        <form novalidate class="form-horizontal">
+          <div class="row auto" >
+
+            <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
+              <label for="f_meter_type" class="font_normal_body">新表类型</label>
+              <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+              <v-select :value.sync="metermessage.f_meter_type"
+                        v-model="metermessage.f_meter_type"
+                        :options='meterType' placeholder='气表类型'
+                        :disabled="!isdisabled"
+                        close-on-select v-ref:metertype style="width: 60%"></v-select>
+            </div>
+
+            <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+              <label for="gasbrand" class="font_normal_body">新表品牌</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+              <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' @change='brandChange' placeholder='气表品牌' close-on-select
+                        search v-model='metermessage.gasbrand' v-ref:brand
+                        :disabled="!isdisabled"></v-select>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+              <label for="gasmodel" class="font_normal_body">新表型号</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.model.selectedItems"  v-validate:model='{required: true }'>
+              <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='气表型号' close-on-select
+                        v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 || !isdisabled' @change='modelChange' v-ref:model></v-select>
+            </div>
+
+          </div>
+          <div class="row auto" >
+            <div class="col-sm-4 form-group" :class="[$v.meternumber.required ? 'has-error' : '']">
+              <label for="f_meternumber" class="font_normal_body">新&ensp;表&ensp;号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"
+                     @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" :readonly="!isdisabled" v-validate:meternumber='{required: true }' placeholder='表号' >
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_metertitles" class="font_normal_body">新表封号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search" :readonly="!isdisabled" v-model="metermessage.f_metertitles" placeholder='表封号'>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+              <label for="f_meter_base" class="font_normal_body">新表底数</label>
+              <input type="text" class="input_search" style="width:60%" :readonly="!isdisabled" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
+            </div>
+          </div>
+
+        </form>
+    </validator>
+  <!--</div>-->
+</template>
+
+<script>
+  import {HttpResetClass} from "vue-client";
+
+  /**
+   *公共组件
+   *获取气表信息
+   */
+  export default {
+    data () {
+      return {
+        isdecimal: '否',
+        imgsrc: '/images/mainicon/biaopan.png',
+        imgmeter: '/images/mainicon/addmeter.png',
+
+        meterType: this.$appdata.getParam('气表类型')
+      }
+    },
+    props: ['f_userfiles_id', 'metermessage','isdisabled'],
+    methods: {
+      onValid () {
+        this.$dispatch('valid')
+      },
+      onInvalid () {
+        this.$dispatch('invalid')
+      },
+      brandChange (val) {
+        this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
+        this.meternumberValidate()
+      },
+      modelChange (val) {
+        this.$dispatch('gasmodel', this.metermessage.gasbrand)
+      },
+      resetValidate () {
+        this.$resetValidation()
+      },
+      meterbase () {
+        if (this.isdecimal === '是') {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(4)
+        } else {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
+        }
+      },
+      getMeterBrands (meterType) {
+        let res = []
+        if (meterType.length > 0) {
+          this.meterbrands.forEach((item) => {
+            if (item.value.f_meter_type === meterType[0]) {
+              res.push(item)
+            }
+          })
+        }
+        return res
+      },
+      async meternumberValidate () {
+        let http1 = new HttpResetClass()
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.metermessage.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        if (res1.data.length > 0) {
+
+
+          // 已经选择了气表 则不再替换
+          if (this.metermessage.f_meter_type <= 0 ){
+            this.metermessage.f_meter_type = [res1.data[0].f_meter_classify]
+          }
+            // 替换表号自带的气表品牌和型号
+          let meterbrands = this.meterbrands
+          for (let row of meterbrands) {
+            if (row.label == res1.data[0].f_meter_brand) {
+              // 已经选择了气表品牌则不再替换
+              if (this.metermessage.gasbrand.length <= 0) this.metermessage.gasbrand = [row.value]
+              // 替换气表型号
+              if (res1.data[0].f_meter_style) {
+                for (let model of row.value.gasmodel) {
+                  if (model.label == res1.data[0].f_meter_style) {
+                    // 已经选择了气表型号则不再替换
+                    if (this.metermessage.gasmodel.length <= 0) this.metermessage.gasmodel = [model.value]
+                    continue
+                  }
+                }
+              }
+              continue
+            }
+          }
+        }
+        if (this.metermessage.f_meternumber && this.metermessage.gasbrand.length > 0) {
+          // 表号位数验证
+          let meternumberLen = this.metermessage.gasbrand[0].f_meternumber_len
+          if (meternumberLen) {
+            if (this.metermessage.f_meternumber.length != meternumberLen) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert(`表号位数不正确, 当前气表品牌表号位数是: ${meternumberLen}`, 'warning', 3000)
+              return
+            }
+          }
+          // 表计信息验证
+          if (this.metermessage.gasbrand[0].f_meterverification == '是') {
+            if (res1.data.length <= 0) {
+              this.$showAlert(`当前表号: ${this.metermessage.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
+              this.metermessage.f_meternumber = ''
+              return
+            }
+          }
+          if (this.metermessage.gasbrand[0].f_meter_type === '物联网表') {
+            let param = {
+              f_userfiles_id: this.f_userfiles_id,
+              f_meternumber: this.metermessage.f_meternumber,
+              f_gasbrand_id: this.metermessage.gasbrand[0].id
+            }
+
+            let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
+              resolveMsg: null,
+              rejectMsg: '表号验证失败！！'
+            })
+            console.log('标号验证返回：', res)
+            if (res.data) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert('表号已存在！！', 'warning', 3000)
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      usertypes () {
+        return this.$appdata.getParam('用户类型')
+      },
+      positions () {
+        return this.$appdata.getParam('安装位置')
+      },
+      meterbrands () {
+        return this.$GetSaleParam.getGasbrand()
+      }
+    }
+  }
+</script>

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

@@ -13,14 +13,14 @@
                       :value.sync="model.f_type"
                       :options='replacewatchtype'
                       @change="typeChange"
-                      :disabled="!(row.f_meter_type.includes('卡表')||row.f_meter_type ==='物联网表')"
+                      :disabled="!(row.f_meter_type.includes('卡表')||row.f_meter_type ==='物联网表') || !applyButtonShow"
                       close-on-select clear-button>
             </v-select>
           </div>
           <div class="col-sm-4 form-group">
             <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="换表人">
+                   placeholder="换表人" :readonly="!applyButtonShow">
           </div>
 
           <div class="col-sm-4 form-group"
@@ -28,7 +28,7 @@
             <label for="f_remanent_gas" class=" font_normal_body">旧表底数</label>
             <input class="input_search" style="width:60%" type="number"
                    v-model="model.f_using_base_old"
-                   placeholder="请输入旧表底数"
+                   placeholder="请输入旧表底数" :readonly="!applyButtonShow"
                    v-validate:f_using_base_old='{required: true, dctest: [-1, ">" ] }'
                    @blur="pregasChange()">
           </div>
@@ -36,7 +36,7 @@
         <!--<p class="bg-info text-center" v-if="!model.f_type.includes('清零')" style="padding: 8px;">新表信息</p>-->
         <meter-message v-if="!model.f_type.includes('清零') && !model.f_type.includes('换卡控流量计')"
                        :f_userfiles_id="row.f_userfiles_id" :metermessage.sync="model.metermessage"
-                       @valid="meterinfo = true"
+                       @valid="meterinfo = true" :isdisabled="applyButtonShow"
                        @invalid="meterinfo = false" @gasmodel="gasModelChange" v-ref:metermsg></meter-message>
 
         <div v-if="row.f_meter_type != '机表'">
@@ -47,7 +47,7 @@
                  :class="[$v.f_remanent_gas.required || $v.f_remanent_gas.dctest ? 'has-error' : 'has-success']">
               <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
               <input class="input_search" style="width:60%" type="number"
-                     v-model="model.f_remanent_gas"
+                     v-model="model.f_remanent_gas" :readonly="!applyButtonShow"
                      placeholder="补气量"
                      v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
             </div>
@@ -63,7 +63,7 @@
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_money"
                      placeholder="补气金额"
-                     @blur="remanentChange"
+                     @blur="remanentChange" :readonly="!applyButtonShow"
                      v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -74,7 +74,7 @@
               <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_gas"
-                     placeholder="补气量"
+                     placeholder="补气量" :readonly="!applyButtonShow"
                      v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -86,7 +86,7 @@
               <label for="f_remanent_money" class=" font_normal_body">补气金额</label>
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_money"
-                     placeholder="补气金额"
+                     placeholder="补气金额" :readonly="!applyButtonShow"
                      v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -96,52 +96,52 @@
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计表号">新流量计表号</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_number"
-                   placeholder='流量计表号'></input>
+                   placeholder='流量计表号' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计通经">新流量计通经</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_pass"
-                   placeholder='流量计通经'></input>
+                   placeholder='流量计通经' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
             <label class="font_normal_body">新表底数</label>
             <input type="number" class="input_search" style="width:60%" v-validate:f_meter_base='{required: true }'
-                   v-model="model.metermessage.f_meter_base" placeholder='表底数'>
+                   v-model="model.metermessage.f_meter_base" placeholder='表底数' :readonly="!applyButtonShow">
           </div>
 
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计品牌">新流量计品牌</label>
             <v-select :value.sync="model.f_flowmeter_brand" :options='flowmeterbrands' value-single placeholder='流量计品牌'
                       close-on-select
-                      search v-model='model.f_flowmeter_brand'></v-select>
+                      search v-model='model.f_flowmeter_brand' :disabled="!applyButtonShow"></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计型号">新流量计型号</label>
             <v-select :value.sync="model.f_flowmeter_model" :options='flowmetermodels(model.f_flowmeter_brand)'
-                      value-single placeholder='流量计型号' close-on-select
+                      value-single placeholder='流量计型号' close-on-select :disabled="!applyButtonShow"
                       v-model='model.f_flowmeter_model' :disabled='model.f_flowmeter_brand.length === 0'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计精准度">新流量计精准度</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_accuracy"
-                   placeholder='流量计精准度'></input>
+                   placeholder='流量计精准度' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计压力等级">新流量计压力等级</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_mpa_level"
-                   placeholder='流量计压力等级'></input>
+                   placeholder='流量计压力等级' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计安装日期">新流量计安装日期</label>
             <datepicker style="width:60%" placeholder="流量计安装日期"
                         v-model="model.f_flowmeter_install_date"
                         :value.sync="model.f_flowmeter_install_date"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :format="'yyyy-MM-dd HH:mm:ss'" :readonly="!applyButtonShow"
             ></datepicker>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">业务单号</label>
-            <input class="input_search" style="width:60%" type="text"
+            <input class="input_search" style="width:60%" type="text" :readonly="!applyButtonShow"
                    v-model="model.f_serial_number" placeholder="业务单号">
           </div>
         </div>
@@ -152,17 +152,17 @@
           <div class="col-sm-4 form-group">
             <label for="f_changemeter_fee" class=" font_normal_body">换表金额</label>
             <input class="input_search" style="width:60%" type="number" v-model="model.f_changemeter_fee"
-                   placeholder="换表金额">
+                   placeholder="换表金额" :readonly="!applyButtonShow">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
             <v-select id="f_payment"
                       title="参数:付款方式"
-                      v-model="f_payment"
+                      v-model="model.f_payment"
                       placeholder='请选择'
                       :value-single="true"
                       :value.sync="model.f_payment"
-                      :options='paytype'
+                      :options='paytype' :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
           <div class="col-sm-4 form-group">
@@ -173,7 +173,7 @@
                       placeholder='请选择'
                       :multiple="mulPrint"
                       :value.sync="model.f_print"
-                      :options='printstyle'
+                      :options='printstyle' :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -195,20 +195,20 @@
           <div class="col-sm-4 form-group" :class="[$m.type.required ? 'has-error' : '']">
             <label class="font_normal_body">气价类型</label>
             <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
-                      placeholder='气价类型' :options="pricetypes"
+                      placeholder='气价类型' :options="pricetypes" :disabled="!applyButtonShow"
                       close-on-select v-ref:type>
             </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label class="font_normal_body">气价名称</label>
             <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
-                      placeholder='气价名称' :options="getPricenames()"
+                      placeholder='气价名称' :options="getPricenames()" :disabled="!applyButtonShow"
                       close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">新抄表册</label>
             <v-select :value.sync="newinfo.f_meter_book" v-model="newinfo.f_meter_book"
-                      placeholder='新抄表册' :options="meterbookoptions"
+                      placeholder='新抄表册' :options="meterbookoptions" :disabled="!applyButtonShow"
                       close-on-select></v-select>
           </div>
 
@@ -216,7 +216,7 @@
         <div class="row auto" v-if="!model.f_type.includes('换卡控流量计')">
           <div class="col-sm-4 ">
             <label for="f_comments" class=" font_normal_body">业务单号</label>
-            <input class="input_search" style="width:60%" type="text"
+            <input class="input_search" style="width:60%" type="text" :readonly="!applyButtonShow"
                    v-model="model.f_serial_number" placeholder="业务单号">
           </div>
           <div class="col-sm-4 ">
@@ -227,14 +227,14 @@
                       :search="false"
                       :value-single="true"
                       :value.sync="model.f_ladder_sync"
-                      :options='ladder'
+                      :options='ladder' :disabled="!applyButtonShow"
                       close-on-select clear-button></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 !=='不同步'">
             <label class=" font_normal_body">阶梯用量</label>
-            <input class="input_search" style="width:60%" type="number"
+            <input class="input_search" style="width:60%" type="number" :readonly="!applyButtonShow"
                    v-validate:f_stair_use='{required: true, dctest: [0, ">=" ] }'
                    v-model="model.f_stair_use" placeholder="旧表阶梯使用量">
           </div>
@@ -248,6 +248,7 @@
                       :value-single="true"
                       :value.sync="model.f_open_type"
                       :options='opentype'
+                      :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -256,7 +257,7 @@
                v-if="!commitflag"
           >
             <label class="font_normal_body ">差额原因</label>
-            <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason"></textarea>
+            <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason" :readonly="!applyButtonShow"></textarea>
           </div>
           <div class="col-sm-12"
                :class="[$v.f_difference_reason.required ? 'has-error' : 'has-success']"
@@ -264,7 +265,7 @@
           >
             <label class="font_normal_body ">差额原因</label>
             <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason"
-                      v-validate:f_difference_reason='{required: true}'
+                      v-validate:f_difference_reason='{required: true}' :readonly="!applyButtonShow"
             ></textarea>
           </div>
         </div>
@@ -273,7 +274,7 @@
                v-if="!commitflag"
           >
             <label class="font_normal_body ">备&emsp;&emsp;注</label>
-            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"></textarea>
+            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments" :readonly="!applyButtonShow"></textarea>
           </div>
           <div class="col-sm-12"
                :class="[$v.f_comments.required ? 'has-error' : 'has-success']"
@@ -281,7 +282,7 @@
           >
             <label class="font_normal_body ">备&emsp;&emsp;注</label>
             <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"
-                      v-validate:f_comments='{required: true}'
+                      v-validate:f_comments='{required: true}' :readonly="!applyButtonShow"
             ></textarea>
           </div>
         </div>
@@ -332,15 +333,15 @@ import { HttpResetClass } from 'vue-client'
 let getPrice = async function (self) {
   await self.$LoadParams.loadParam(self.$login.f.orgid)
   await self.$getConfig(self, 'ChargeMeter')
-
-  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
-  self.model.f_payment = self.config.payment
+  if (self.applyButtonShow) {
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = self.config.payment
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.model.f_open_type = self.config.open_way
+  }
   self.mulPrint = self.config.printType instanceof Array
-  self.model.f_use_type = self.config.billType
-  self.model.f_bill_type = self.model.f_print
   self.hasValidateBill = self.config.hasBillManage
-
-  self.model.f_open_type = self.config.open_way
   self.isGas = (self.row.f_collection_type == '按气量')
 
   let http = new HttpResetClass()
@@ -630,6 +631,7 @@ export default {
     async apply () {
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请换表`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+      this.addTaskModel.f_memorandum = this.model.f_difference_reason
       this.addTaskModalShow = true
     },
     async confirmbefore () {
@@ -917,13 +919,8 @@ export default {
       }
 
       if (this.model.f_using_base_old > param) {
-        // this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
-        this.$showMessage('该表可能存在超用，请核实输入后进行换表操作！！', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            this.$dispatch('button-specifies', {name: '超用收费', value: 'over-use-charge'}, this.row)
-          }
-        })
-        // this.$dispatch('refresh')
+        this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
+        this.$dispatch('refresh')
       }
       if (this.model.f_remanent_price > 0) {
         this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
@@ -1053,8 +1050,10 @@ export default {
     'dataModel' (val) {
       console.log('看看dataModel的值：', val)
       if (val) {
-        Object.assign(this.model, val)
+        // Object.assign(this.model, val)
+        this.model=Object.assign({},this.model,val)
       }
+      console.log('看看this.model的值：', this.model)
     }
   }
 }

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

@@ -21,7 +21,7 @@
           <div class="col-sm-4 form-group">
             <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="换表人">
+                   placeholder="换表人"  :readonly="!applyButtonShow">
           </div>
 
           <div class="col-sm-4 form-group"
@@ -29,7 +29,7 @@
             <label for="f_remanent_gas" class=" font_normal_body">旧表底数</label>
             <input class="input_search" style="width:60%" type="number"
                    v-model="model.f_using_base_old"
-                   placeholder="请输入旧表底数"
+                   placeholder="请输入旧表底数"  :readonly="!applyButtonShow"
                    v-validate:f_using_base_old='{required: true, dctest: [-1, ">" ] }'
                    @blur="pregasChange()">
           </div>
@@ -41,7 +41,7 @@
               <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_gas"
-                     placeholder="补气量"
+                     placeholder="补气量" :readonly="!applyButtonShow"
                      v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -50,7 +50,7 @@
         <!--<p class="bg-info text-center" v-if="!model.f_type.includes('清零')" style="padding: 8px;">新表信息</p>-->
         <meter-message v-if="!model.f_type.includes('清零') && !model.f_type.includes('换卡控流量计')"
                        :f_userfiles_id="row.f_userfiles_id" :metermessage.sync="model.metermessage"
-                       @valid="meterinfo = true"
+                       @valid="meterinfo = true" :isdisabled="applyButtonShow"
                        @invalid="meterinfo = false" @gasmodel="gasModelChange" v-ref:metermsg></meter-message>
 <!--         这部分是清零的-->
         <div v-if="row.f_meter_type != '机表'">
@@ -62,7 +62,7 @@
               <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_gas"
-                     placeholder="补气量"
+                     placeholder="补气量" :readonly="!applyButtonShow"
                      v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
             </div>
             <div class="col-sm-4 form-group">
@@ -78,6 +78,7 @@
                      v-model="model.f_remanent_money"
                      placeholder="补气金额"
                      @blur="remanentChange"
+                     :readonly="!applyButtonShow"
                      v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -90,6 +91,7 @@
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_remanent_money"
                      placeholder="补气金额"
+                     :readonly="!applyButtonShow"
                      v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
             </div>
           </div>
@@ -99,52 +101,52 @@
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计表号">新流量计表号</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_number"
-                   placeholder='流量计表号'></input>
+                   placeholder='流量计表号' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计通经">新流量计通经</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_pass"
-                   placeholder='流量计通经'></input>
+                   placeholder='流量计通经' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
             <label class="font_normal_body">新表底数</label>
             <input type="number" class="input_search" style="width:60%" v-validate:f_meter_base='{required: true }'
-                   v-model="model.metermessage.f_meter_base" placeholder='表底数'>
+                   v-model="model.metermessage.f_meter_base" :readonly="!applyButtonShow" placeholder='表底数'>
           </div>
 
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计品牌">新流量计品牌</label>
             <v-select :value.sync="model.f_flowmeter_brand" :options='flowmeterbrands' value-single placeholder='流量计品牌'
-                      close-on-select
+                      close-on-select :disabled="!applyButtonShow"
                       search v-model='model.f_flowmeter_brand'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计型号">新流量计型号</label>
             <v-select :value.sync="model.f_flowmeter_model" :options='flowmetermodels(model.f_flowmeter_brand)'
-                      value-single placeholder='流量计型号' close-on-select
+                      value-single placeholder='流量计型号' close-on-select  :disabled="!applyButtonShow"
                       v-model='model.f_flowmeter_model' :disabled='model.f_flowmeter_brand.length === 0'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计精准度">新流量计精准度</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_accuracy"
-                   placeholder='流量计精准度'></input>
+                   placeholder='流量计精准度' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计压力等级">新流量计压力等级</label>
             <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_mpa_level"
-                   placeholder='流量计压力等级'></input>
+                   placeholder='流量计压力等级' :readonly="!applyButtonShow"></input>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="流量计安装日期">新流量计安装日期</label>
             <datepicker style="width:60%" placeholder="流量计安装日期"
                         v-model="model.f_flowmeter_install_date"
                         :value.sync="model.f_flowmeter_install_date"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :format="'yyyy-MM-dd HH:mm:ss'" :readonly="!applyButtonShow"
             ></datepicker>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">业务单号</label>
-            <input class="input_search" style="width:60%" type="text"
+            <input class="input_search" style="width:60%" type="text" :readonly="!applyButtonShow"
                    v-model="model.f_serial_number" placeholder="业务单号">
           </div>
         </div>
@@ -155,7 +157,7 @@
           <div class="col-sm-4 form-group">
             <label for="f_changemeter_fee" class=" font_normal_body">换表金额</label>
             <input class="input_search" style="width:60%" type="number" v-model="model.f_changemeter_fee"
-                   placeholder="换表金额">
+                   placeholder="换表金额" :readonly="!applyButtonShow">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
@@ -165,7 +167,7 @@
                       placeholder='请选择'
                       :value-single="true"
                       :value.sync="model.f_payment"
-                      :options='paytype'
+                      :options='paytype' :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
           <div class="col-sm-4 form-group">
@@ -176,7 +178,7 @@
                       placeholder='请选择'
                       :multiple="mulPrint"
                       :value.sync="model.f_print"
-                      :options='printstyle'
+                      :options='printstyle' :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -199,19 +201,19 @@
             <label class="font_normal_body">气价类型</label>
             <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
                       placeholder='气价类型' :options="pricetypes"
-                      close-on-select v-ref:type>
+                      close-on-select v-ref:type :disabled="!applyButtonShow">
             </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label class="font_normal_body">气价名称</label>
             <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
-                      placeholder='气价名称' :options="getPricenames()"
+                      placeholder='气价名称' :options="getPricenames()" :disabled="!applyButtonShow"
                       close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">新抄表册</label>
             <v-select :value.sync="newinfo.f_meter_book" v-model="newinfo.f_meter_book"
-                      placeholder='新抄表册' :options="meterbookoptions"
+                      placeholder='新抄表册' :options="meterbookoptions" :disabled="!applyButtonShow"
                       close-on-select></v-select>
           </div>
 
@@ -219,7 +221,7 @@
         <div class="row auto" v-if="!model.f_type.includes('换卡控流量计')">
           <div class="col-sm-4 ">
             <label for="f_comments" class=" font_normal_body">业务单号</label>
-            <input class="input_search" style="width:60%" type="text"
+            <input class="input_search" style="width:60%" type="text" :readonly="!applyButtonShow"
                    v-model="model.f_serial_number" placeholder="业务单号">
           </div>
 <!--          <div class="col-sm-4 ">-->
@@ -237,7 +239,7 @@
                :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 !=='不同步'">
             <label class=" font_normal_body">阶梯用量</label>
-            <input class="input_search" style="width:60%" type="number"
+            <input class="input_search" style="width:60%" type="number" :readonly="!applyButtonShow"
                    v-validate:f_stair_use='{required: true, dctest: [0, ">=" ] }'
                    v-model="model.f_stair_use" placeholder="旧表阶梯使用量">
           </div>
@@ -251,6 +253,7 @@
                       :value-single="true"
                       :value.sync="model.f_open_type"
                       :options='opentype'
+                      :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -259,7 +262,7 @@
                v-if="!commitflag"
           >
             <label class="font_normal_body ">差额原因</label>
-            <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason"></textarea>
+            <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason"  :readonly="!applyButtonShow"></textarea>
           </div>
           <div class="col-sm-12"
                :class="[$v.f_difference_reason.required ? 'has-error' : 'has-success']"
@@ -267,7 +270,7 @@
           >
             <label class="font_normal_body ">差额原因</label>
             <textarea class="input_textarea" rows="1" style="width:87%;" v-model="model.f_difference_reason"
-                      v-validate:f_difference_reason='{required: true}'
+                      v-validate:f_difference_reason='{required: true}'  :readonly="!applyButtonShow"
             ></textarea>
           </div>
         </div>
@@ -276,7 +279,7 @@
                v-if="!commitflag"
           >
             <label class="font_normal_body ">备&emsp;&emsp;注</label>
-            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"></textarea>
+            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments" :readonly="!applyButtonShow"></textarea>
           </div>
           <div class="col-sm-12"
                :class="[$v.f_comments.required ? 'has-error' : 'has-success']"
@@ -284,7 +287,7 @@
           >
             <label class="font_normal_body ">备&emsp;&emsp;注</label>
             <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"
-                      v-validate:f_comments='{required: true}'
+                      v-validate:f_comments='{required: true}' :readonly="!applyButtonShow"
             ></textarea>
           </div>
         </div>
@@ -335,14 +338,18 @@ let getPrice = async function (self) {
   await self.$LoadParams.loadParam(self.$login.f.orgid)
   await self.$getConfig(self, 'ChargeMeter')
 
-  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
-  self.model.f_payment = self.config.payment
+  if (self.applyButtonShow) {
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = self.config.payment
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.model.f_open_type = self.config.open_way
+  }
+
   self.mulPrint = self.config.printType instanceof Array
-  self.model.f_use_type = self.config.billType
-  self.model.f_bill_type = self.model.f_print
   self.hasValidateBill = self.config.hasBillManage
 
-  self.model.f_open_type = self.config.open_way
+
   self.isGas = (self.row.f_collection_type == '按气量')
 
   let http = new HttpResetClass()
@@ -578,6 +585,7 @@ export default {
     async apply () {
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请清零`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+      this.addTaskModel.f_memorandum = this.model.f_difference_reason
       this.addTaskModalShow = true
     },
     validateBill (val) {

package/src/filiale/shexian/sale.js

@@ -24,4 +24,6 @@ export default function () {
   Vue.component('reset-meter', (resolve) => { require(['./revenue/newchangemeter/ResetMeter'], resolve) })
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./revenue/base/leftview/meterinfodetail'], resolve) })
+  // 获取气表信息
+  Vue.component('meter-message', (resolve) => { require(['./revenue/MeterMessage'], resolve) })
 }