sale-client 4.3.54 → 4.3.56

package/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
 
+## **🚀 V4.3.56 -2026-05-18 `@张科科`**
+### `🌟` 功能调整
+---金煌 物联网表收费  物联收费未开户提示是否开启 这个不要 改成单值表配置控制的
+
+
+
+## **🚀 V4.3.55 -2026-05-14 `@柳博`**
+
+### `🌟` 功能调整
+
+---
+
+修复保险记录表单中的日期验证和计算逻辑
+
+- 移除待执行状态下手动输入保费结束日期功能，改为根据开始日期和购买年限自动计算
+- 添加保费结束日期的验证逻辑，确保日期在当日之后
+- 重构日期计算方法，统一使用recalcExpirationDate函数处理到期日期计算
+- 优化日期比较逻辑，使用getTime()方法进行准确的时间对比
+- 在保险记录组件中添加太平洋保险公司条件判断
+- 修正日期格式化处理，统一时间戳为00:00:00格式
+- 删除不再使用的datepicker组件相关代码和验证规则
+
 ## **🚀 V4.3.54 -2026-05-13   `@柳博`**
 
 ### `🌟` 功能调整

package/package.json

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

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

@@ -547,7 +547,8 @@
       this.$refs.email.focus()
     },
     ready () {
-      if (this.row.f_sendsuccess && this.row.f_sendsuccess !== '成功') {
+      let open_state = this.$appdata.getSingleValue('物联收费未开户提示是否开启')
+      if (this.row.f_sendsuccess && this.row.f_sendsuccess !== '成功' && open_state == '是') {
         this.$showMessage('当前用户尚未开户成功，请谨慎购买!')
       }
       this.paytype = this.$appdata.getParam('付款方式')

package/src/filiale/jinhong/InsuranceAdd.vue

@@ -72,29 +72,19 @@
               <input type="number" v-model="model.f_salecount" placeholder="购买年限" style="width: 60%"
                    class="input_search" v v-el:style v-next-el="inpipe">
           </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_expiration_date2.required ? 'has-error' : '']" v-if="model.f_state === '待执行'">
-          <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date'  v-el:f_expiration_date2>
-          <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
-          <datepicker id="f_expiration_date" placeholder="保费结束日期" style="width:60%"
-                      @con-bulr="isShowSaleCount"
-                      v-ref:f_expiration_date
-                      v-model="model.f_expiration_date"
-                      :value.sync="model.f_expiration_date"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="true">
-          </datepicker>
-        </div>
-          <div class="col-sm-6  form-group" :class="[$v.f_expiration_date2.required ? 'has-error' : '']" v-else="model.f_state !== '待执行'">
+          <div class="col-sm-6  form-group" v-if="model.f_state === '待执行'">
+            <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date'  v-el:f_expiration_date2>
+            <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
+            <input type="text" class="input_search" style="width:60%" disabled="disabled"
+                   :value="model.f_expiration_date"
+                   placeholder="根据开始日期和购买年限自动计算">
+          </div>
+          <div class="col-sm-6  form-group" v-else="model.f_state !== '待执行'">
             <input type="text" v-show="false" v-model="tmp" :value.sync='model.f_expiration_date' v-validate:f_expiration_date2='{required: true }' v-el:f_expiration_date2>
             <label class="font_normal_body">&emsp;&emsp;保费结束日期</label>
-            <datepicker id="f_expiration_date" placeholder="保费结束日期" style="width:60%"
-                        @con-bulr="isShowSaleCount"
-                        v-ref:f_expiration_date
-                        v-model="model.f_expiration_date"
-                        :value.sync="model.f_expiration_date"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="true">
-            </datepicker>
+            <input type="text" class="input_search" style="width:60%" disabled="disabled"
+                   :value="model.f_expiration_date"
+                   placeholder="根据开始日期和购买年限自动计算">
           </div>
           <div class="col-sm-6  form-group" :class="[$v.f_insurance_type.required ? 'has-error' : '']">
             <label class="font_normal_body" title="参数:险种">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;险种</label>
@@ -295,26 +285,12 @@
       this.model.f_buy_date = this.model.f_buy_date || Util.toStandardTimeString()
       this.$set('model.f_ins_start_date', this.getDefaultInsStartDate())
       this.model.f_salecount = 1
+      this.recalcExpirationDate()
       this.configMerge()
     },
     watch: {
       'model.f_ins_start_date' (val) {
-        if (val && this.model.f_salecount) {
-          let tx = new Date(val)
-          let tmp = {
-            year: tx.getFullYear(),
-            month: tx.getMonth() + 1,
-            day: tx.getDate()
-          }
-          let tmpdate = new Date((tmp.year + (this.model.f_salecount - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-          let date = tmpdate
-          let jt = {
-            year: date.getFullYear(),
-            month: date.getMonth() + 1,
-            day: date.getDate()
-          }
-          this.$refs.f_expiration_date.value = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
-        }
+        this.recalcExpirationDate()
       },
       'model.f_money' (val) {
         if (val && (val < 0 || Math.floor(val - 0) !== (val - 0))) {
@@ -328,22 +304,10 @@
           this.model.f_salecount = 0
           this.f_salecount.dctest = false
         } else if (val && this.model.f_ins_start_date) {
-          let tx = new Date(this.model.f_ins_start_date)
-          let tmp = {
-            year: tx.getFullYear(),
-            month: tx.getMonth() + 1,
-            day: tx.getDate()
-          }
-          let tmpdate = new Date((tmp.year + (val - 0)) + '-' + (tmp.month < 10 ? '0' + tmp.month : tmp.month) + '-' + (tmp.day < 10 ? '0' + tmp.day : tmp.day))
-          let date = tmpdate
-          let jt = {
-            year: date.getFullYear(),
-            month: date.getMonth() + 1,
-            day: date.getDate()
-          }
-          this.$refs.f_expiration_date.value = jt.year + '-' + (jt.month < 10 ? '0' + jt.month : jt.month) + '-' + (jt.day < 10 ? '0' + jt.day : jt.day)
+          this.recalcExpirationDate()
           this.f_salecount.dctest = true
         } else {
+          this.model.f_expiration_date = ''
           this.f_salecount.dctest = true
         }
       },
@@ -352,6 +316,8 @@
           this.model.f_insurance_type = this.model.f_insurance_type == null ? this.config.insuranceType : this.model.f_insurance_type
           this.model.f_state = this.model.f_state == null ? this.config.insurancestate : this.model.f_state
           this.model.f_ins_start_date = this.getDefaultInsStartDate()
+          this.model.f_salecount = 1
+          this.recalcExpirationDate()
           console.log('cs===================cs', this.model.f_userinfo_id, this.model.f_ins_start_date)
         }
       }
@@ -423,23 +389,32 @@
         return new Date(date.getFullYear(), date.getMonth(), date.getDate())
       },
       getDefaultInsStartDate () {
-        let tomorrow = new Date()
-        tomorrow.setHours(0, 0, 0, 0)
-        tomorrow.setDate(tomorrow.getDate() + 1)
-        let minDate = tomorrow
+        let today = new Date()
+        today.setHours(0, 0, 0, 0)
         let stopDate = this.parseDateOnly(this.model.f_ins_stop_date)
-        if (stopDate) {
-          let nextStopDate = new Date(stopDate.getTime())
-          nextStopDate.setDate(nextStopDate.getDate() + 1)
-          if (nextStopDate.getTime() > minDate.getTime()) {
-            minDate = nextStopDate
-          }
+        if (stopDate && stopDate.getTime() > today.getTime()) {
+          return this.formatYmd(stopDate)
+        }
+        let tomorrow = new Date(today.getTime())
+        tomorrow.setDate(tomorrow.getDate() + 1)
+        return this.formatYmd(tomorrow)
+      },
+      recalcExpirationDate () {
+        let startDate = this.parseDateOnly(this.model.f_ins_start_date)
+        let saleCount = this.model.f_salecount - 0
+        if (!startDate || !saleCount || saleCount < 0) {
+          this.model.f_expiration_date = ''
+          return
         }
-        return this.formatYmd(minDate)
+        let expirationDate = new Date((startDate.getFullYear() + saleCount) + '-' + ((startDate.getMonth() + 1) < 10 ? '0' + (startDate.getMonth() + 1) : (startDate.getMonth() + 1)) + '-' + (startDate.getDate() < 10 ? '0' + startDate.getDate() : startDate.getDate()))
+        this.model.f_expiration_date = this.formatYmd(expirationDate)
       },
       async save () {
         let saveState = true
         let startDate = this.parseDateOnly(this.model.f_ins_start_date)
+        let expirationDate = this.parseDateOnly(this.model.f_expiration_date)
+        let today = new Date()
+        today.setHours(0, 0, 0, 0)
         let tomorrow = new Date()
         tomorrow.setHours(0, 0, 0, 0)
         tomorrow.setDate(tomorrow.getDate() + 1)
@@ -447,13 +422,20 @@
           this.$showAlert('保险开始日期必须在当前日期的次日及之后', 'warning', 2000)
           saveState = false
         }
+        if (saveState && (!expirationDate || expirationDate.getTime() <= today.getTime())) {
+          this.$showAlert('保单截止日期必须在当日之后', 'warning', 2000)
+          saveState = false
+        }
         if (this.model.f_state !== '待执行') {
-          if (saveState && Date.parse(this.model.f_ins_start_date) > Date.parse(this.model.f_expiration_date)) {
+          if (saveState && startDate.getTime() > expirationDate.getTime()) {
             this.$showAlert('结束日期不能早于开始日期', 'warning', 2000)
             saveState = false
-          } else if (saveState && this.model.f_ins_start_date !== null && this.model.f_ins_start_date !== '' && Date.parse(this.model.f_ins_stop_date) > Date.parse(this.model.f_ins_start_date)) {
-            this.$showAlert('开始日期不能早于上期保费截止日期', 'warning', 2000)
-            saveState = false
+          } else if (saveState) {
+            let stopDate = this.parseDateOnly(this.model.f_ins_stop_date)
+            if (stopDate && stopDate.getTime() > startDate.getTime()) {
+              this.$showAlert('开始日期不能早于上期保费截止日期', 'warning', 2000)
+              saveState = false
+            }
           }
         }
 
@@ -470,9 +452,8 @@
           if (startDate) {
             this.model.f_ins_start_date = this.formatYmd(startDate) + ' 00:00:00'
           }
-          let expirationDate = this.parseDateOnly(this.model.f_expiration_date)
           if (expirationDate) {
-            this.model.f_expiration_date = this.formatYmd(expirationDate) + ' 23:59:59'
+            this.model.f_expiration_date = this.formatYmd(expirationDate) + ' 00:00:00'
           }
           this.model.f_total_ins_charge = this.model.f_total_ins_charge == null ? 0 : this.model.f_total_ins_charge
           this.model.f_operat_type = '保险'

package/src/filiale/jinhong/InsuranceRecord.vue

@@ -149,7 +149,7 @@
               </div>
             </div>
             <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : 'has-success']">
-              <label for="f_cancel_reason" class=" col-sm-2 control-label">撤销原因1:</label>
+              <label for="f_cancel_reason" class=" col-sm-2 control-label">撤销原因:</label>
               <div class="col-sm-8">
                 <textarea class="form-control"
                           v-model="model.f_cancel_reason" rows="2"
@@ -165,13 +165,13 @@
         </validator>
       </article>
       <footer slot="modal-footer" class="modal-footer">
+        <button class="btn btn-default" @click="clean()">取消</button>
         <button class="btn btn-success" v-if="config.hasAudit && !isTodayResult" @click="auditConfirm()"
                 :disabled="!$v.valid">提交审核
         </button>
         <button class="btn btn-success" v-if="!config.hasAudit || isTodayResult" @click="confirm()"
                 :disabled="!$v.valid">确认
         </button>
-        <button class="btn btn-default" @click="clean()">取消</button>
       </footer>
     </modal>
   </div>
@@ -261,6 +261,7 @@ export default {
     /** 核销期使用购买时间判断：当前操作时间已超过购买当日 17:30:00 */
     needsVerificationPeriod (row) {
       if (!row) return false
+      if (row.f_insurance_company !== '太平洋保险') return false
       const buyDate = this.parseDateTime(row.f_buy_date)
       if (!buyDate) return false
       const now = new Date()

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -43,7 +43,7 @@
             <input class="input_search" style="width:60%" type="number"
                    v-model="model.f_remanent_gas"
                    placeholder="补气量"
-                   :disabled="changeType == 'gasToAmount'"
+                   :disabled="changeType == 'gasToAmount' || !$login.r.includes('换表允许修改补气数据')"
                    v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
           </div>
           <div class="col-sm-4 form-group">
@@ -59,7 +59,7 @@
                    v-model="model.f_remanent_money"
                    placeholder="补气金额"
                    @blur="remanentChange"
-                   :disabled="changeType == 'amountToGas'"
+                   :disabled="changeType == 'amountToGas' || !$login.r.includes('换表允许修改补气数据') "
                    v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
           </div>
         </div>
@@ -70,6 +70,7 @@
             <input class="input_search" style="width:60%" type="number"
                    v-model="model.f_remanent_gas"
                    placeholder="补气量"
+                   :disabled="!$login.r.includes('换表允许修改补气数据')"
                    v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
           </div>
         </div>
@@ -82,6 +83,7 @@
             <input class="input_search" style="width:60%" type="number"
                    v-model="model.f_remanent_money"
                    placeholder="补气金额"
+                   :disabled="!$login.r.includes('换表允许修改补气数据')"
                    v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
           </div>
         </div>
@@ -661,7 +663,7 @@ export default {
         data: {
           items: 'f_whether_pay',
           tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_whether_pay = '否'`,
+          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' and f_whether_pay = '否'`,
           orderitem: ' id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}

package/src/filiale/liaoyuan/ChargeManage.vue

@@ -23,7 +23,7 @@
         <otherinfo v-show="worktype === '其他信息'" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></otherinfo>
         <card-list v-show="worktype === '历史操作'" :btns="operatebtn" :f_orgid="f_orgid" :userinfoid="row ? row.f_userinfo_code : ''" @list-select-oper="recordCancel"
                    v-ref:card></card-list>
-        <hand-list  v-show="worktype === '历史抄表'" :f_userfiles_id="row ? row.f_userfiles_id : ''" v-ref:hand></hand-list>
+        <hand-list  v-if="worktype === '历史抄表'" :f_userfiles_id="row ? row.f_userfiles_id : ''" v-ref:hand></hand-list>
       </div>
 
     </div>

package/src/filiale/liaoyuan/ChargeModal.vue

@@ -5,7 +5,7 @@
         <p>{{warninginfo.data.msgData}}</p>
         <div  style="font-size: 15px;padding: 10px">
           <span style="float: right">
-            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files-complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
             <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
             <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>

package/src/filiale/liaoyuan/FileManage/MeterinfoTest.vue

@@ -5,24 +5,24 @@
         <div class="row">
           <div class="col-sm-4 form-group" :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber" :disabled="(!jurisdiction.includes('档案信息查询修改'))||(row.f_userfiles_id  && row.gasbrand[0].f_meter_type==='物联网表')"
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber" :disabled="(!jurisdiction.includes('档案信息查询修改'))||(row.f_userfiles_id  && row.gasbrand[0].f_meter_type==='物联网表') || (jurisdiction.includes('表号') == false && controlledArray.includes('表号') == true)"
                    @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
                    v-next-el="{id: 'metertitles'}">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_metertitles" class="font_normal_body">&ensp;表&ensp;箱&ensp;号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表箱号'
-                   v-next-el="{id: 'meterbase'}" :disabled="!jurisdiction.includes('档案信息查询修改')">
+                   v-next-el="{id: 'meterbase'}" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('表箱号') == false && controlledArray.includes('表箱号') == true)">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('表读数') == false && controlledArray.includes('表读数') == true)" :readonly="!row.f_userfiles_id">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;初始底数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('初始底数') == false && controlledArray.includes('初始底数') == true)">
           </div>
 
           <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
@@ -30,19 +30,19 @@
             <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="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      :disabled="!jurisdiction.includes('档案信息查询修改')" search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
+                      :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表品牌') == false && controlledArray.includes('气表品牌') == true)" search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">*气表型号</label>
             <input type="text" v-show="false" v-model="$refs.model.selectedItems"
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
-                      close-on-select :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      close-on-select :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表型号') == false && controlledArray.includes('气表型号') == false)"
                       v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label for="pricename" class="font_normal_body">*气价名称</label>
-            <v-select :value.sync="row.pricename" v-model="row.pricename" search :disabled="!jurisdiction.includes('档案信息查询修改')"
+            <v-select :value.sync="row.pricename" v-model="row.pricename" search :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气价名称') == false && controlledArray.includes('气价名称') == true)"
                       placeholder='气价名称' :options="getPricenames" @change="priceChange"
                       close-on-select :disabled="permissionPrice" v-ref:name></v-select>
             <input type="text" v-show="false" v-model="$refs.name.selectedItems" v-validate:name='{required: true }'>
@@ -83,13 +83,13 @@
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('累购气量') == false && controlledArray.includes('累购气量') == true)">
           </div>
 
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购金额</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_total_fee" placeholder='累购金额'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('累购金额') == false && controlledArray.includes('累购金额') == true)">
           </div>
           <!--<div class="row">-->
           <!--<div class="col-sm-12" style="margin-top: -10px">-->
@@ -102,19 +102,19 @@
             <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表'
                       close-on-select    :value-single="true"
-                      :disabled="!jurisdiction.includes('档案信息查询修改')" v-model='row.f_aroundmeter'></v-select>
+                      :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('左右表') == false && controlledArray.includes('左右表') == false)" v-model='row.f_aroundmeter'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_gas_person" class="font_normal_body">&ensp;通&ensp;气&ensp;人</label>
             <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="row.f_gas_person"
-                   :disabled="!jurisdiction.includes('档案信息查询修改')" placeholder='通气人'></input>
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('通气人') == false && controlledArray.includes('通气人') == true)" placeholder='通气人'></input>
             <!-- <v-select :value.sync="row.f_gas_person" v-model="row.f_gas_person"
                 :options='gasperson' placeholder='通气人'
                 close-on-select></v-select> -->
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_gas_date" class="font_normal_body">&ensp;通气日期</label>
-            <datepicker style="width:60%" placeholder="通气日期" :disabled="!jurisdiction.includes('档案信息查询修改')"
+            <datepicker style="width:60%" placeholder="通气日期" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('通气日期') == false && controlledArray.includes('通气日期') == true)"
                         v-model="row.f_gas_date"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
@@ -122,7 +122,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_gas_date" class="font_normal_body">&ensp;生产日期</label>
-            <datepicker style="width:60%" placeholder="生产日期" :disabled="!jurisdiction.includes('档案信息查询修改')"
+            <datepicker style="width:60%" placeholder="生产日期" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('生产日期') == false && controlledArray.includes('生产日期') == true)"
                         v-model="row.f_llj_date"
                         :value.sync="row.f_llj_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
@@ -132,26 +132,26 @@
           <div class="col-sm-4 form-group" >
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;安装位置</label>
             <v-select :value.sync="row.f_position" v-model="row.f_position"
-                      :options='positions' placeholder='安装位置' :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      :options='positions' placeholder='安装位置' :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('安装位置') == false && controlledArray.includes('安装位置') == true)"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group"  v-show="false">
             <label for="f_remanent_gas" class="font_normal_body">剩余气量</label>
             <input type="number" class="input_search" style="width:60%" style="width:60%" v-model="row.f_remanent_gas"
-                   placeholder='剩余气量' :disabled="!jurisdiction.includes('档案信息查询修改')"
+                   placeholder='剩余气量' :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('剩余气量') == false && controlledArray.includes('剩余气量') == true)"
                    :disabled="f_userinfo_id"></input>
             <!--<button type="button" name="button" class="btn btn-link" @click="modefiy('f_remanent_gas')" v-if="f_userinfo_id">修改</button>-->
           </div>
           <div class="col-sm-4 form-group" v-show="true">
             <label for="f_install_person" class="font_normal_body">&ensp;安&ensp;装&ensp;人</label>
             <v-select :value.sync="row.f_install_person" v-model="row.f_install_person"
-                      :options='installperson' placeholder='安装人' :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      :options='installperson' placeholder='安装人' :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('安装人') == false && controlledArray.includes('安装人') == true)"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_subscribe_date" class="font_normal_body">&ensp;预约时间</label>
             <datepicker style="width:60%" placeholder="预约通气时间"
-                        v-model="row.f_subscribe_date" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                        v-model="row.f_subscribe_date" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('预约通气时间') == false && controlledArray.includes('预约通气时间') == true)"
                         :value.sync="row.f_subscribe_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
@@ -159,7 +159,7 @@
           <div class="col-sm-4 form-group" v-show="opteratormetrbook" >
             <label for="f_position" class="font_normal_body"  >&ensp;抄&ensp;表&ensp;册</label>
             <v-select :value.sync="row.f_meter_book_num" v-model="row.f_meter_book_num"
-                      :value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      :value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('抄表册') == false && controlledArray.includes('抄表册') == false)"
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
           </div>
@@ -168,7 +168,7 @@
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
                         v-model="row.f_install_date"
                         :value.sync="row.f_install_date"
-                        class="datepicker" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                        class="datepicker" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('安装日期') == false && controlledArray.includes('安装日期') == true)"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
@@ -176,12 +176,12 @@
           <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
-                      :disabled="!jurisdiction.includes('档案信息查询修改')" v-model='row.f_adjustable' :search='true'></v-select>
+                      :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('调压箱') == false && controlledArray.includes('调压箱') == true)" v-model='row.f_adjustable' :search='true'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_hand_date" class="font_normal_body">&ensp;上次抄表</label>
             <datepicker style="width:60%" id="f_hand_date" placeholder="上次抄表日期"
-                        v-model="row.f_hand_date" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                        v-model="row.f_hand_date" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('上次抄表日期') == false && controlledArray.includes('上次抄表日期') == true)"
                         :value.sync="row.f_hand_date"
                         class="datepicker"
                         :format="'yyyy-MM-dd HH:mm:ss'"
@@ -192,7 +192,7 @@
                :class="[$m.meternumber.required ? 'has-error' : '']">
             <label for="f_ratio" class="font_normal_body">比&emsp;&emsp;率</label>
             <input type="number" class="input_search" style="width:60%" style="width:60%" v-model="row.f_price_ratio"
-                   :value.sync="row.f_price_ratio" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                   :value.sync="row.f_price_ratio" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('比率') == false && controlledArray.includes('比率') == true)"
                    v-validate:meternumber='{required: true }' placeholder='比率'>
           </div>
           <div class="col-sm-4 form-group" >
@@ -200,7 +200,7 @@
             <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'
                         v-model="row.f_scrap_date"
                         :value.sync="row.f_scrap_date"
-                        class="datepicker" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                        class="datepicker" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('报废日期') == false && controlledArray.includes('报废日期') == true)"
                         :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
@@ -208,18 +208,17 @@
           <div class="col-sm-4 form-group">
             <label for="gasmodel" class="font_normal_body">&ensp;阀门状态</label>
             <v-select :value.sync="row.f_valve_state" :options='valvestate' placeholder='阀门状态' close-on-select
-                      :disabled="!jurisdiction.includes('档案信息查询修改')" v-model='row.f_valve_state'></v-select>
+                      :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('阀门状态') == false && controlledArray.includes('阀门状态') == true)" v-model='row.f_valve_state'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="gasmodel" class="font_normal_body">&ensp;垃&ensp;圾&ensp;费</label>
             <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select
-                      :value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改')"
-                      v-model='row.f_garbage_fee'></v-select>
+                      :value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('垃圾费') == false && controlledArray.includes('垃圾费') == true)" v-model='row.f_garbage_fee'></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">&ensp;抄&ensp;表&ensp;员</label>
             <v-select :value.sync="row.f_inputtor" v-model='row.f_inputtor'
-                      style="width:60%" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      style="width:60%" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('抄表员') == false && controlledArray.includes('抄表员') == true)"
                       :options='inputtores' placeholder='抄表员'
                       close-on-select
                       condition="f_inputtor like '%{}%'" v-el:cc></v-select>
@@ -227,19 +226,19 @@
           <div class="col-sm-4 form-group" >
             <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;使用类型</label>
             <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
-                      :options='usetype' placeholder='使用类型' :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      :options='usetype' placeholder='使用类型' :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('使用类型') == false && controlledArray.includes('使用类型') == true)"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" >
             <label for="f_position" class="font_normal_body" title="参数:使用状态">&ensp;使用状态</label>
             <v-select :value.sync="row.f_usestate" v-model="row.f_usestate"
-                      :options='usestate' placeholder='使用状态' :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      :options='usestate' placeholder='使用状态' :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('使用状态') == false && controlledArray.includes('使用状态') == true)"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" v-show="row.f_gasproperties=='工业用气'">
             <label for="f_gongye_type" class="font_normal_body">&ensp;用气类型</label>
             <v-select :value.sync="row.f_gongye_type" v-model='row.f_gongye_type'
-                      style="width:60%" :disabled="!jurisdiction.includes('档案信息查询修改')"
+                      style="width:60%" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('工业类型') == false && controlledArray.includes('工业类型') == true)"
                       :options='gongyetype' placeholder='工业类型'
                       close-on-select
                       v-el:cc></v-select>
@@ -247,11 +246,11 @@
           <div class="col-sm-4 form-group" >
             <label for="f_limit_sms" class="font_normal_body">&ensp;短信限定</label>
             <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="row.f_limit_sms"
-                   :disabled="!jurisdiction.includes('档案信息查询修改')" placeholder='短信限定'></input>
+                   :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('短信限定') == false && controlledArray.includes('短信限定') == true)" placeholder='短信限定'></input>
           </div>
           <div style="" class="col-sm-8 form-group">
             <label for="f_userfiles_address" class="font_normal_body ">安装地址&nbsp;</label>
-            <input class="input_search" style="width:80%" v-model="row.f_userfiles_address" :disabled="!jurisdiction.includes('档案信息查询修改')"/>
+            <input class="input_search" style="width:80%" v-model="row.f_userfiles_address" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('安装地址') == false && controlledArray.includes('安装地址') == true)"/>
           </div>
         </div>
       </form>
@@ -353,7 +352,8 @@ let meterBookGen = function *(self) {
         pricetypes: this.$appdata.getParam('气价类型'),
         meterbookoptions: [],  // 抄表册选项
         opteratormetrbook: false, // 抄表册操作
-        oldrow: []
+        oldrow: [],
+        controlledArray: this.$appdata.getParam('档案信息受控配置').map(item => item.value),
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
@@ -520,7 +520,7 @@ let meterBookGen = function *(self) {
       },
 
       getPricenames () {
-        return this.$GetSaleParam.getPriceByOrg(this.f_filialeid)
+        return this.$GetSaleParam.getPriceByOrgNoLow(this.f_filialeid)
       },
 
       adjustables () {