manage-client 3.2.34 → 3.2.38

package/src/components/sale/businessquery/CollectManage.vue

@@ -9,6 +9,9 @@
     <tabs header="小区综合查询" v-if="permission('小区综合查询')">
       <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
     </tabs>
+    <tabs header="小区收费查询" v-if="permission('小区收费查询')">
+      <area-charge-query v-if="show.includes('小区收费查询')"  @deal-msg="dealMsg"></area-charge-query>
+    </tabs>
     <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
       <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
     </tabs>

package/src/components/sale/config/exportConfig.js

@@ -134,6 +134,9 @@ export default{
     'overdue': '滞纳金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数', 'f_balance': '上期余额',
     'f_oughtfee_all': '合计欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
   },
+  areaChargeQueryConfig: {
+    'f_residential_area': '小区','f_price': '单价','f_gas': '购气方量','f_money': '购气金额'
+  },
   arrearsGYConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_residential_area': '小区名称', 'f_address': '客户地址',
     'f_user_phone': '客户电话', 'f_rent_phone': '备用电话', 'f_inputtor': '抄表员', 'f_book_name': '抄表册', 'f_user_type': '客户类型',

package/src/components/statistical/DendrogramManage.vue

@@ -21,7 +21,9 @@ export default {
       userstreet: "",
       residential:"",
       userinfo:"",
-      slicearea:""
+      slicearea:"",
+      meterTypeArea:"",
+      meterTypeUser:""
     }
   },
   methods: {
@@ -116,6 +118,18 @@ export default {
       let getmetertype = await HttpReset.load('post', 'rs/sql/getMetertype', {data: {}})
       this.metertype=getmetertype.data
     },
+    async getmetertypeArea() {
+      let HttpReset = new HttpResetClass()
+
+      let meterTypeArea = await HttpReset.load('post', 'rs/sql/getMeterTypeArea', {data: {}})
+      this.meterTypeArea=meterTypeArea.data
+    },
+    async getmetertypeUser() {
+      let HttpReset = new HttpResetClass()
+
+      let meterTypeUser = await HttpReset.load('post', 'rs/sql/getMeterTypeUser', {data: {}})
+      this.meterTypeUser=meterTypeUser.data
+    },
 
     dataGeneration () {
       let model = {
@@ -153,9 +167,28 @@ export default {
               children: []
             }
             obj3.children.push(odj4)
+            const filter4 = this.conditionGenerate(this.meterTypeArea, ['name', 'f_slice_area','f_user_type'], [row1.name, row2.f_slice_area,row3.f_user_type,row4.f_meter_brand])
+            for (let row5 of filter4) {
+              let obj5 = {
+                name: row5.f_residential_area + `(${row5.num})`,
+                value: row5.num,
+                children: []
+              }
+              odj4.children.push(obj5)
+              // const filter5 = this.conditionGenerate(this.meterTypeUser, ['name', 'f_slice_area','f_user_type'], [row1.name, row2.f_slice_area,row3.f_user_type,row4.f_meter_brand,row5.f_residential_area])
+              // console.log()
+              // for (let row6 of filter5) {
+              //   let obj6 = {
+              //     name: row6.f_user_name + `(${row6.num})`,
+              //     value: row6.num,
+              //     children: []
+              //   }
+              //   obj5.children.push(obj6)
+              // }
             }
           }
         }
+        }
         model.children.push(obj1)
       }
       this.model = model
@@ -193,6 +226,8 @@ export default {
     await this.getslicearea()  //大区
     await this.getusertype()   //用户类型
     await this.getmetertype()  //表型
+    await this.getmetertypeArea()
+    // await this.getmetertypeUser()
     this.dataGeneration()
     this.setBar()
   },