sale-client 3.5.170 → 3.5.171

package/package.json

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

package/src/components/charge/ChargeManage.vue

@@ -35,7 +35,7 @@
 
   </div>
   <div v-if="!listpage">
-    <user-info-detail-manage-new :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    <user-info-detail-manage-new parentname="charge-manage" :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel" @cancel-re="cancelAndRefresh"></user-info-detail-manage-new>
   </div>
   <div v-if="showModal">
     <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>
@@ -145,6 +145,13 @@ export default {
       cancel (obj) {
         this.listpage = true
       },
+      cancelAndRefresh (obj) {
+        this.listpage = true
+        this.clean()
+        this.clearCondition()
+        this.$refs.list.searchNoData()
+        this.$refs.card.search()
+      },
       modalsuccess (obj) {
         this.showModal = false
         this.$refs.list.criteriaShow = false

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

@@ -94,25 +94,34 @@
                      v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
             </div>
 
-            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-3" v-if="row.f_collection_type === '按金额'">
+            <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-1 form-group">
+            <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
+              <label for="f_collection" class=" font_normal_body"><font size="4px"
+                                                                        style="font-weight:bold">*收&emsp;款</font></label>
+              <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;"
+                     type="number" v-model="model.f_collection"
+                     v-el:fcollection
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
+                     v-scale="[model.f_collection, 4]" disabled>
+            </div>
+            <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
             </div>
           </div>

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -279,48 +279,52 @@
       cancelmain () {
         this.$emit('cancel-main')
       },
-      clearBarrier(){
+      clearBarrier () {
         // 地址
         // 127.0.0.1:8445
         // 参数
-        let datas =  {
-          moduleName:"XiMeiSystem", // 固定值
-          content:{
-            tradeCode:"3015",// 固定值
-            appid: "yysf", // 固定值
-            partner: "cqsemay_bcts", // 固定值
-            version:"v1", // 固定值
-            tasked:this.getuuid(), // 任务id
-            notifyUrl:"http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack", // 固定值
-            meterNo: this.row.f_meternumber,// 表号
-            signType:" MD5" //固定值
+        let datas = {
+          moduleName: 'XiMeiSystem', // 固定值
+          content: {
+            tradeCode: '3015', // 固定值
+            appid: 'yysf', // 固定值
+            partner: 'cqsemay_bcts', // 固定值
+            version: 'v1', // 固定值
+            tasked: this.getuuid(), // 任务id
+            notifyUrl: 'http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack', // 固定值
+            meterNo: this.row.f_meternumber, // 表号
+            signType: ' MD5' // 固定值
           },
-          title: "清除异常", // 固定值
-          type: "清除异常", // 固定值
-          inputtor:this.row.f_operator, // 操作人
-          userId:this.row.f_userfiles_id,   // 表档案ID
+          title: '清除异常', // 固定值
+          type: '清除异常', // 固定值
+          inputtor: this.row.f_operator, // 操作人
+          userId: this.row.f_userfiles_id,   // 表档案ID
           dataId: null // 操作记录ID
         }
-        this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+        this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas}, {resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
         })
       },
-      getuuid(){
-        let uuidA = '';
-        var s = [];
-        var hexDigits = '0123456789abcdef';
+      getuuid () {
+        let uuidA = ''
+        var s = []
+        var hexDigits = '0123456789abcdef'
         for (var i = 0; i < 36; i++) {
-          s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+          s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
         }
-        s[14] = '4';
-        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
-        s[8] = s[13] = s[18] = s[23] = '-';
-        uuidA = s.join('');
-        return uuidA;
+        s[14] = '4'
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1)
+        s[8] = s[13] = s[18] = s[23] = '-'
+        uuidA = s.join('')
+        return uuidA
       },
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        if (this.row.parentname === 'charge-manage') {
+          this.$emit('cancel-re')
+        } else {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
@@ -328,7 +332,7 @@
             let data = {
               f_userfiles_id: this.row.f_userfiles_id
             }
-            this.$resetpost('rs/logic/startup',data)
+            this.$resetpost('rs/logic/startup', data)
           }
         })
       },
@@ -338,11 +342,11 @@
           f_userfiles_id: this.row.f_userfiles_id
         }
         if (this.row.f_network_valve !== '1') {
-           this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
-           this.row.f_network_valve = '1'
+          this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+          this.row.f_network_valve = '1'
         } else {
-            this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
-            this.row.f_network_valve = null
+          this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+          this.row.f_network_valve = null
         }
       },
       // 阀控管理

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="binary flex" >
     <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
-      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
+      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel" @cancel-re="cancelRe"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
           <record-query-user :row="row"></record-query-user>
@@ -104,7 +104,7 @@ import ChangeRecord from './ic_detail/ChangeRecord'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
 export default {
     title: '用户详细信息',
-    props: ['f_userfiles_id', 'f_userinfo_id','f_userinfo_code'],
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname'],
     components: {
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
@@ -155,19 +155,24 @@ export default {
           condition = `f_userfiles_id = '${this.f_userfiles_id}'`
         } else if (this.f_userinfo_id) {
           condition = `f_userinfo_id = '${this.f_userinfo_id}'`
-        }else if (this.f_userinfo_code){
+        } else if (this.f_userinfo_code) {
           condition = `f_userinfo_code = '${this.f_userinfo_code}'`
         }
 
         let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
           {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
       },
 
       cancel (val) {
         this.$emit('cancel-main', val)
       },
 
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
       butOper (val) {
         this.name = val
       }

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -126,7 +126,7 @@
           <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >左&ensp;右&ensp;表</label>
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
           <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
         </div>
         <div class="row">
@@ -158,7 +158,7 @@
           <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >建表日期</label>
+          <label class = "col-sm-5 " >建档日期</label>
           <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
         </div>
         <div class="row">

package/src/components/revenue/comprehen/Maintenance/fillgas/fillgasSpecific.vue

@@ -113,7 +113,6 @@
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
   import * as Util from "../../../../../Util";
-  var data
   let readyGen = async function (self) {
     await  self.$LoadParams.loadParam(self.f_filialeid)
     await    self.$GetSaleParam.initinputtor()

package/src/filiale/shanxian/components/FilesManage/MeterinfoTest.vue

@@ -6,6 +6,22 @@
           <a style="font-size: 16px;font-weight: 500;">表具信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
         </div>
         <div class="row" >
+          <div class="col-sm-4 form-group" :class="[$m.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="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" 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
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
+          </div>
+
           <div class="col-sm-4 form-group" v-if="isiot" :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"
@@ -38,21 +54,7 @@
                    :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
 
-          <div class="col-sm-4 form-group" :class="[$m.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="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" 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
-                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
-          </div>
+
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
             <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='累购气量'
@@ -271,21 +273,29 @@
                         :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
-                      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"
-                        :value.sync="row.f_hand_date"
+          <div class="col-sm-4 form-group" >
+            <label for="f_scrap_date" class="font_normal_body">&ensp;报废日期</label>
+            <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'
+                        :v-model="f_scrap_date"
+                        :value.sync="f_scrap_date"
                         class="datepicker"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
           </div>
+          <div class="col-sm-4 form-group">
+            <label for="gasmodel" class="font_normal_body">&ensp;调压类型</label>
+            <v-select :value.sync="row.f_adjustable_type" :options='adjustableTypes' placeholder='调压类型' close-on-select
+                      :value-single="true"
+                      v-model='row.f_adjustable_type'></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_adjustable" class="font_normal_body">&ensp;调压型号</label>
+            <v-select :value.sync="row.f_adjustable" :options='adjustableTypesChange(row.f_adjustable_type)' placeholder='调压型号' close-on-select
+                      v-model='row.f_adjustable'></v-select>
+          </div>
+
+
           <div v-if="ratioshow" class="col-sm-4 form-group"
                :class="[$m.meternumber.required ? 'has-error' : '']">
             <label for="f_ratio" class="font_normal_body">比&emsp;&emsp;率</label>
@@ -303,22 +313,16 @@
 <!--                        :show-reset-button="true">-->
 <!--            </datepicker>-->
 <!--          </div>-->
-          <div class="col-sm-4 form-group" >
-            <label for="f_scrap_date" class="font_normal_body">&ensp;报废日期</label>
-            <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'
-                        :v-model="f_scrap_date"
-                        :value.sync="f_scrap_date"
+          <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"
+                        :value.sync="row.f_hand_date"
                         class="datepicker"
-                        :format="'yyyy-MM-dd'"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
           </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"
-                      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'
@@ -354,29 +358,29 @@
                       :options='handmonth' placeholder='抄表月份'
                       close-on-select></v-select>
           </div>
-          <div style="" class="col-sm-4 form-group">
-            <label for="f_userfiles_address" class="font_normal_body ">&ensp;用气点名</label>
-            <input class="input_search" style="width:60%" v-model="row.f_userfiles_address"/>
-          </div>
-          <div style="" class="col-sm-4 form-group">
-            <label class="font_normal_body">&ensp;经&ensp;&ensp;&ensp;&ensp;度</label>
-            <input type="text" style="width:60%" v-model="row.f_userfiles_lng" class="input_search" placeholder="经度"/>
-          </div>
-          <div style="" class="col-sm-4 form-group">
-            <label class="font_normal_body">&ensp;纬&ensp;&ensp;&ensp;&ensp;度</label>
-            <input type="text" style="width:48%" v-model="row.f_userfiles_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
-          </div>
+<!--          <div style="" class="col-sm-4 form-group">-->
+<!--            <label for="f_userfiles_address" class="font_normal_body ">&ensp;用气点名</label>-->
+<!--            <input class="input_search" style="width:60%" v-model="row.f_userfiles_address"/>-->
+<!--          </div>-->
+<!--          <div style="" class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">&ensp;经&ensp;&ensp;&ensp;&ensp;度</label>-->
+<!--            <input type="text" style="width:60%" v-model="row.f_userfiles_lng" class="input_search" placeholder="经度"/>-->
+<!--          </div>-->
+<!--          <div style="" class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">&ensp;纬&ensp;&ensp;&ensp;&ensp;度</label>-->
+<!--            <input type="text" style="width:48%" v-model="row.f_userfiles_lat" class="input_search" placeholder="纬度"/>-->
+<!--            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
+<!--          </div>-->
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">备&ensp;&ensp;&ensp;&ensp;注</label>
             <input type="text" style="width:60%" v-model="row.f_comments" class="input_search" placeholder="备注"/>
           </div>
-          <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
-            <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
-                      close-on-select></v-select>
-          </div>
+<!--          <div class="col-sm-4 form-group" v-if="config.overduesetShow">-->
+<!--            <label class="font_normal_body">滞纳金规则</label>-->
+<!--            <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"-->
+<!--                      :options='overdueset' placeholder='滞纳金规则'-->
+<!--                      close-on-select></v-select>-->
+<!--          </div>-->
 
           <template v-if="config.stuckFlowmeterShow">
             <div class="col-sm-4 form-group">
@@ -596,7 +600,9 @@
         bfrq:10,
         f_factory_date:'',
         f_scrap_date: '',
-        f_install_date:''
+        f_install_date:'',
+        adjustables: [],
+        adjustable: [],
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
@@ -641,6 +647,31 @@
       co(meterBookGen(this))
     },
     methods: {
+      adjustableTypesChange(){
+        if (this.row.f_adjustable_type===''||this.row.f_adjustable_type===null){
+          this.row.f_adjustable = []
+        }
+          let filter = this.$login.f.orgid
+          let ret = this.$GetSaleParam.getAdjustable(filter)
+        console.log("f_adjustable_type",this.row.f_adjustable_type)
+          let newadjustables = ret.filter(adjustable=>{
+            return adjustable.value.f_adjustable_type === this.row.f_adjustable_type
+          })
+          let arr = new Array()
+          newadjustables.forEach((item)=>{
+            let temp = {}
+            temp.label = `[${item.value.f_adjustable_style}]-${item.label}`
+            temp.value = item.value
+            arr.push(temp)
+          })
+        console.log("过滤后的数组", arr)
+          return arr
+      },
+      initAdjustables () {
+        let filter = this.$login.f.orgid
+        let ret = this.$GetSaleParam.getAdjustable(filter)
+        this.adjustables = ret
+      },
       updatayear (data) {
         const today = new Date(data)
         const year = today.getFullYear()
@@ -678,6 +709,7 @@
           }
         }
       },
+
       // 获取集中器下拉框
       async getConcentrators () {
         let condition = {
@@ -874,6 +906,10 @@
       }
     },
     watch: {
+      'row'(){
+        debugger
+        console.log("row",this.row)
+      },
       'meter' () {
         this.row = Object.assign(this.row, this.meter, {})
         this.isdecimal = this.row.gasbrand.f_isdecimal
@@ -949,17 +985,17 @@
         return Array.from(new Set(result))
       },
 
-      adjustables () {
-        let arr = []
-        let filter = this.f_filialeid
-        this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
-          let temp = {}
-          temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
-          temp.value = item.value
-          arr.push(temp)
-        })
-        return [{label: '全部', value: ''}, ...arr]
-      },
+      // adjustables () {
+      //   let arr = []
+      //   let filter = this.f_filialeid
+      //   this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
+      //     let temp = {}
+      //     temp.label = `[${item.value.f_adjustable_style}]-${item.label}`
+      //     temp.value = item.value
+      //     arr.push(temp)
+      //   })
+      //   return [{label: '全部', value: ''}, ...arr]
+      // },
       inputtores () {
         // return this.$login.f.f_gasman
         let rs = new Array()
@@ -984,6 +1020,9 @@
         }
         return rs
       },
+      adjustableTypes(){
+        return this.$appdata.getParam('装置类型')
+      },
       meterbrands () {
         return this.$GetSaleParam.getGasbrand()
       },

package/src/filiale/shanxian/components/FilesManage/UserGeneralInfoTest.vue

@@ -109,6 +109,7 @@ let getFileGen = async function (self, data) {
     rejectMsg: '用户详细信息加载失败，请重新选择，如果多次失败，请检查系统是否正常！',
     newly: true
   })
+  console.log(result.data)
   self.data = result.data
   self.data.meterinfo.forEach((item) => {
     item.devicesinfo.forEach((item2) => {
@@ -400,6 +401,7 @@ export default {
       this.$dispatch('clean', '取消档案修正', 'user-general-info', this.row)
     },
     checkout (val) {
+      debugger
           // 对收到的综合信息进行校验（主要目的是为了防止下拉框没有默认值）
           // 对综合用户基本信息进行校验
 
@@ -429,6 +431,17 @@ export default {
           // 对表具信息进行校验
       this.data.meterinfo.forEach((row) => {
         console.log(row)
+        if (row.f_adjustable) {
+          this.adjustables.forEach((item) => {
+            if (item.label === row.f_adjustable) {
+              row.f_adjustable = [item.value]
+              row.f_adjustable_type = item.value.f_adjustable_type
+            }
+          })
+        } else {
+          row.f_adjustable = []
+          row.f_adjustable_type = ''
+        }
         if (row.gasbrand) {
           this.meterbrands.forEach((item) => {
             if (item.label === row.gasbrand) {
@@ -489,15 +502,7 @@ export default {
           row.pricename = ''
         }
 
-        if (row.f_adjustable) {
-          this.adjustables.forEach((item) => {
-            if (item.label === row.f_adjustable) {
-              row.f_adjustable = [item.value]
-            }
-          })
-        } else {
-          row.f_adjustable = ''
-        }
+
       })
           // console.log('5555555555', this.data.meterinfo)
           // 对设备进行校验
@@ -591,6 +596,7 @@ export default {
           f_initial_base: 0,
                 // 通气人
           f_gas_person: '',
+          f_adjustable_type:'',
           f_adjustable: '', // 调压箱
           f_detailprice: '',  // 价格详情显示
           devicesinfo: [], // 设备信息