manage-client 4.0.49 → 4.0.51

package/src/filiale/rongcheng/sale.js

@@ -19,4 +19,12 @@ export default function () {
   // 小区楼栋汇总信息
   Vue.component('area-building-info-summary', (resolve) => { require(['./AreaBuildingInfoSummary'], resolve) })
   Vue.component('area-building-detail-info', (resolve) => { require(['./AreaBuildingDetailInfo'], resolve) })
+  // 机表抄表查询
+  Vue.component('handplan-query', (resolve) => {
+    require(['./HandplanQuery'], resolve)
+  })
+  // 物联网抄表查询
+  Vue.component('web-handplan-query', (resolve) => {
+    require(['./WebHandplanQuery'], resolve)
+  })
 }

package/src/filiale/tongchuan/GasInspection.vue

@@ -234,6 +234,19 @@
                        placeholder="">
               </div>
             </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">小&emsp;&emsp;区&emsp;</label>
+              <v-select :value.sync="model.f_residential_area_id"
+                        enter-push
+                        :disabled="$parent.$parent.isAreaShow"
+                        v-model="model.f_residential_area_id"
+                        multiple="true"
+                        @select-search="$parent.$parent.getAreaList"
+                        :options='$parent.$parent.areaList'
+                        placeholder='请选择'
+                        condition="f_residential_area_id in {}">
+              </v-select>
+            </div>
           </div>
 
         </div>
@@ -341,7 +354,7 @@
   /**
    *用户档案查询列表以及添加操作组件
    */
-  import { PagedList } from 'vue-client'
+  import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
@@ -392,6 +405,8 @@
         config: {
           defaultPrint: ['f_userinfo_code','f_user_id']
         },
+        //小区
+        areaList: [],
         show:false,
         rowdata:{},
         initres: {
@@ -427,6 +442,7 @@
       }
     },
     ready () {
+      this.getAreaList('')
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -434,6 +450,30 @@
       })
     },
     methods: {
+      async getAreaList(searchText){
+        let condition = ` 1 = 1 and f_orgid = '${this.$login.f.orgid}'`
+        if (searchText) {
+          condition = ` f_residential_area like '%${searchText}%' and f_orgid = '${this.$login.f.orgid}'`
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
+          data: {
+            items: 'f_residential_area, id',
+            tablename: 't_area',
+            orderitem: 'id desc',
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+          let reData = []
+          req.data.forEach((row, n) => {
+            reData[n] = {
+              label: row.f_residential_area,
+              value: row.id
+            }
+          })
+          this.areaList = [{label: '全部', value: ''}, ...reData]
+        })
+      },
       // 初始化抄表册片区
       async initSlice (val) {
         if (val) {

package/src/filiale/xinjiangdexin/UserGasAll.vue

@@ -208,6 +208,15 @@
                               condition="f_stair = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">气价名称</label>
+                    <v-select :value.sync="model.f_price_name"
+                              v-model="model.f_price_name"
+                              multiple
+                              :options="$parent.$parent.pricenames"
+                              condition="f_price_name in {}"
+                    ></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -223,6 +232,9 @@
                   <th style="text-align:center">
                     <nobr>用气性质</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>气价名称</nobr>
+                  </th>
                   <th style="text-align:center">
                     <nobr>用户电话</nobr>
                   </th>
@@ -306,6 +318,7 @@
                 <td>{{row.f_userinfo_code}}</td>
                 <td style="text-align:center">{{row.f_user_type}}</td>
                 <td style="text-align:center">{{row.f_gasproperties}}</td>
+                <td style="text-align:center">{{row.f_price_name}}</td>
                 <td style="text-align:center">{{row.f_user_phone}}</td>
                 <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
                 <td style="text-align:center">
@@ -392,6 +405,7 @@ let readyGen = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
   self.getaddress()
+  self.getPricenames()
 }
 
 export default {
@@ -419,6 +433,7 @@ export default {
         {label: '周', value: 'week'}
       ],
       meterbrands: [],
+      pricenames: [],
       residentialArea: [],
       criteriaShow: false,
       reportStr: null,
@@ -443,6 +458,7 @@ export default {
           'f_userinfo_code':'客户编号',
           'f_user_type':'客户类型',
           'f_gasproperties': '用气性质',
+          'f_price_name': '气价名称',
           'f_user_name': '客户名称',
           'f_user_phone':'客户电话',
           'f_residential_area': '小区',
@@ -488,6 +504,17 @@ export default {
     this.getfield = this.config.excelHeaders
   },
   methods: {
+    getPricenames() {
+      this.pricenames = []
+      let priceArr = []
+      this.$MagGetSaleParam.prices.forEach((item) => {
+        let temp = {}
+        temp.label = item.f_price_name
+        temp.value = item.f_price_name
+        priceArr.push(temp)
+      })
+      this.pricenames = [{label: '全部', value: ''}, ...priceArr]
+    },
     // 查询开关
     hidden() {
       this.criteriaShow = !this.criteriaShow