sale-client 4.2.24 → 4.2.25

package/src/filiale/qingjian/MeterinfoTest.vue

@@ -345,8 +345,14 @@
             <label for="f_adjustable" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_adjustable','调压箱')}}</label>
             <input type="text" v-model="row.f_adjustable" v-show="false"
                    v-validate:f_adjustable=getConfigValidate("f_adjustable",false)>
-            <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
-                      v-model='row.f_adjustable' :search='true'></v-select>
+            <v-select :value.sync="row.f_adjustable"
+                      :options='adjustables'
+                      placeholder='调压箱'
+                      close-on-select
+                      @select-search="getAdjustables"
+                      v-model='row.f_adjustable'
+                      :search='true'>
+            </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_hand_date.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_hand_date && formconfig.f_hand_date.required) || !onlyshowmust"
@@ -720,6 +726,7 @@
         opteratormetrbook: false, // 抄表册操作
         oldrow: [],
         overdueset: [],
+        adjustables: [],
         isiot: true,
         meterNumberDisabled: false,
         meterChangeDisabled: this.$appdata.getSingleValue('建档后禁止更改表号') ? this.$appdata.getSingleValue('建档后禁止更改表号') : false,
@@ -757,8 +764,26 @@
       }
       await this.getConcentrators()
       co(meterBookGen(this))
+      this.getAdjustables()
     },
     methods: {
+      async getAdjustables (searchText) {
+        let condition = `f_orgid = '${this.$login.f.orgid}'`
+        if (searchText) {
+          condition = condition + ` and (f_adjustable_name like '%${searchText}%' or f_adjustable_id like '%${searchText}%')`
+        }
+        let data = {
+          items: 'id,f_adjustable_name,f_adjustable_id',
+          tablename: 't_adjustablebox',
+          condition: condition,
+          orderitem: 'id desc'
+        }
+        let result = await this.$resetpost('rs/sql/singleTable_OrderBy?pageNo=1&pageSize=100', {data: data}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
+        this.adjustables = [{label: '全部', value: ''}]
+        for (let row of result.data) {
+          this.adjustables.push({label: `[${row.f_adjustable_id}]-${row.f_adjustable_name}`, value: row})
+        }
+      },
       validateInput (event, key) {
         const value = event.target.value
         const sanitizedValue = value.replace(/[^0-9.]/g, '')
@@ -1090,17 +1115,6 @@
         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]
-      },
       inputtores () {
         // return this.$login.f.f_gasman
         let rs = new Array()

package/src/filiale/qingjian/SafeCheck.vue

@@ -89,13 +89,29 @@
       </thead>
       <tbody>
       <tr v-show="nextCheckDateShow">
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">下次安检时间:</td>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">本次安检时间:</td>
         <td  colspan="3" :style=style>{{ model.f_next_check_date }}</td>
       </tr>
       <tr>
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检时间:</td>
         <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_check_date }}</td>
       </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检结果:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ lastDefectResult }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次是否有隐患:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ lastDefectResult === '有隐患' ? '是' : '否' }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次隐患名称:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_defect_text }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次处理结果:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_repaired === '已修' ? '已处理' : '未处理' }}</td>
+      </tr>
       <tr>
         <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检员:</td>
         <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_checker_name}}</td>
@@ -289,11 +305,28 @@
       }
     },
     computed: {
-      inspectionResult() {
+      inspectionResult () {
         if (this.model.safecheckitem == null || this.model.safecheckitem.every(item => item.f_repaire_state === '已处理')) {
-          return '正常';
+          return '正常'
+        }
+        return '有隐患'
+      },
+      lastDefectResult () {
+        let content = this.model.f_last_defect_content
+        if (!content) return ''
+
+        try {
+          // 先解析一次
+          let parsed = typeof content === 'string' ? JSON.parse(content) : content
+        // 如果 result 还是 undefined，再尝试一次解析
+          if (typeof parsed.result === 'undefined' && typeof parsed === 'string') {
+            parsed = JSON.parse(parsed)
+          }
+          return parsed.result || ''
+        } catch (e) {
+          console.warn('解析 f_last_defect_content 出错', e)
+          return ''
         }
-        return '有隐患';
       }
     },
     watch: {

package/src/filiale/qingjian/UserEssentialInfoTest.vue

@@ -441,14 +441,14 @@ export default {
     'baseinfo.base.f_cost_type[0]' () {
       this.$resetValidation()
     },
-    'baseinfo.base.f_user_name'(val) {
+    'baseinfo.base.f_user_name' (val) {
       console.log('f_user_name变化', val)
     },
-    'addressinfo.f_lat'(newVal) {
-      this.lat = newVal;
+    'addressinfo.f_lat' (newVal) {
+      this.lat = newVal
     },
-    'addressinfo.f_lng'(newVal) {
-      this.lng = newVal;
+    'addressinfo.f_lng' (newVal) {
+      this.lng = newVal
     }
   },
   computed: {

package/src/filiale/qingjian/WebHandQueryUser.vue

@@ -169,7 +169,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'api/af-revenue/sql/sale_WebHandplanQuery':'api/af-revenue/sql/sale_HandplanQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
+        model: new PagedList(`${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebHandplanQuery' : 'api/af-revenue/sql/sale_HandplanQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_stairamount1: 0,
@@ -252,7 +252,7 @@
         this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
-        let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'api/af-revenue/sql/sale_WebHandplanQuery':'api/af-revenue/sql/sale_HandplanQuery'}`, {
+        let res = await http.load('POST', `${this.row.f_meter_type === '物联网表' ? 'api/af-revenue/sql/sale_WebHandplanQuery' : 'api/af-revenue/sql/sale_HandplanQuery'}`, {
           data: {
             f_user_id: this.row.f_user_id,
             condition: this.condition