sale-client 4.2.51 → 4.2.53

package/src/filiale/qingjian/FileUserFiles.vue

@@ -526,7 +526,7 @@ let loadParamGem = async function (self) {
     await self.$LoadParams.loadParam(self.f_filialeid)
     // await self.$LoadParams.loadMeterBook(self.f_filialeid)
     // await self.search()
-    self.initAdjustables()
+    await self.initAdjustables()
   }
 
   let addressInfoGen = async function (self, areainfo) {
@@ -941,7 +941,7 @@ let loadParamGem = async function (self) {
         delete row.id
         this.bulidFiles(row)
       },
-      initAdjustables () {
+      async initAdjustables () {
         console.log('初始化调压箱', this.$GetSaleParam)
         let arr = []
         let filter = this.$login.f.orgid
@@ -963,23 +963,25 @@ let loadParamGem = async function (self) {
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 
-        // 初始化气表型号
-        let modelArr = []
-        this.$GetSaleParam.getGasbrand().forEach((item) => {
-          if (item.value.gasmodel && item.value.gasmodel.length > 0) {
-            item.value.gasmodel.forEach((model) => {
-              let temp2 = {}
-              temp2.label = model.label
-              temp2.value = model.label
-              modelArr.push(temp2)
-            })
+        // 初始化现场表具型号：从后端查询 t_userfiles.f_xc_meter_style 去重
+        try {
+          const result = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+            data: {
+              tablename: 't_userfiles',
+              items: 'distinct f_xc_meter_style as label',
+              condition: "f_xc_meter_style is not null and f_xc_meter_style != ''",
+              orderitem: 'f_xc_meter_style'
+            }
+          }, {resolveMsg: null, rejectMsg: '获取现场表具型号失败'})
+          const options = []
+          for (let row of result.data) {
+            if (row.label) options.push({label: row.label, value: row.label})
           }
-        })
-        // 去重
-        let uniqueModels = modelArr.filter((item, index, self) =>
-          index === self.findIndex(t => t.label === item.label)
-        )
-        this.metermodels = [{label: '全部', value: ''}, ...uniqueModels]
+          this.metermodels = [{label: '全部', value: ''}, ...options]
+        } catch (e) {
+          console.error('获取现场表具型号失败', e)
+          this.metermodels = [{label: '全部', value: ''}]
+        }
       },
       importFile () {
         this.show = true

package/src/filiale/qingjian/MeterinfoTest.vue

@@ -154,6 +154,10 @@
             <label class="font_normal_body">&ensp;卡&emsp;&emsp;号</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_card_id" placeholder='卡号' @blur="checkCardId" :disabled="!jurisdiction.includes('卡号修改')">
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">现场表具型号</label>
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_xc_meter_style" placeholder='现场表具型号'>
+          </div>
           <div class="col-sm-4 form-group" :class="[$m.f_force_measure.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_force_measure && formconfig.f_force_measure.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_force_measure',false)">