manage-client 4.0.46 → 4.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.46",
+    "version": "4.0.47",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/filiale/jiaxian/DayReportList.vue

@@ -29,23 +29,37 @@
               >
               </datepicker>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
-                     condition1="f_residential_area like '%{}%'" placeholder='小区'>
-            </div>
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;县</label>-->
+<!--              <input type="text" style="width:60%" class="input_search" v-model="model.f_zones"-->
+<!--                     condition="f_zones like '%{}%'" placeholder='区县'>-->
+<!--            </div>-->
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>-->
+<!--              <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"-->
+<!--                     condition="f_residential_area like '%{}%'" placeholder='小区'>-->
+<!--            </div>-->
+
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;县</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_pcd"
-                     condition1="f_pcd like '%{}%'" placeholder='区县'>
+              <v-select
+                :value.sync="model.f_zones" :value-single="true"
+                v-model="model.f_zones"
+                @change="$parent.$parent.communityChange"
+                :options='$parent.$parent.sliceArea' placeholder='请选择'
+                condition1="f_zones = '{}'"
+                close-on-select search="true"></v-select>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">用气性质</label>
-              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties" multiple
-                        :options='$parent.$parent.gasproperties' placeholder='请选择'
-                        condition="f_gasproperties in {}"
-                        close-on-select></v-select>
+            <div  :class="$parent.$parent.style">
+              <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
+              <v-select :value.sync="model.f_residential_area"
+                        v-model="model.f_residential_area"
+                        :value-single="true"
+                        :options='$parent.$parent.areaslist' placeholder='请选择'
+                        condition1="f_residential_area = '{}'"
+                        close-on-select search="true"></v-select>
             </div>
+
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">操作类型</label>
               <v-select :value.sync="model.f_type" v-model="model.f_type"
@@ -60,13 +74,6 @@
                         condition="f_state in {}"
                         close-on-select></v-select>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
-                        :options='$parent.$parent.userTypes' placeholder='请选择'
-                        condition="f_user_type in {}"
-                        close-on-select></v-select>
-            </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">包含APP</label>
               <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
@@ -85,7 +92,21 @@
                         close-on-select clear-button>
               </v-select>
             </div>
-
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        v-model="model.f_user_type" condition="f_user_type = '{}'"
+                        @change="$parent.$parent.userTypeChange()"
+                        :options='$parent.$parent.userTypes' placeholder='请选择'
+                        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_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
             <div class="button-range" style="float:right;margin-top:10px">
               <button class="button_search button_spacing" @click="search()">查询</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -180,8 +201,8 @@
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
           <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
-          <td style="text-align: left;"><nobr>{{row.f_area}}</nobr></td>
-          <td style="text-align: left;"><nobr>{{row.f_pcd}}</nobr></td>
+          <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: left;"><nobr>{{row.f_zones}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
@@ -242,7 +263,7 @@
 
 <script>
 
-  import { PagedList } from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import exportConfig from './config/exportConfig'
   import DayReportSummary from "../../components/sale/report/aode/DayReportSummary";
   import getLodop from '../../plugins/LodopFuncs'
@@ -259,6 +280,12 @@
     data() {
       return {
         orderDefault: "'f_operate_date'",
+        gasproperties:[],
+        areaslist: [],
+        f_filialeids: '',
+        //片区
+        sliceArea: [],
+        slice_area:[],
         orderFields: {
           f_userinfo_code: 'no'
         },
@@ -299,7 +326,6 @@
         listpage:false,
         rowdata: {},
         orgCondtionStr: '',
-        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
         count: 0,
         sumsmodel: {},
         printshow: false,
@@ -316,9 +342,15 @@
       this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
       this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
       this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
+      this.initdata()
       // this.search()
     },
     methods: {
+      async initdata(){
+        this.f_filialeids = this.orgCondtionStr.match(/'(\d+)'/)
+        this.initAreas(this.f_filialeids[1])
+        // this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
+      },
       showmsg(obj){
         this.criteriaShow = false
         this.$emit('close')
@@ -342,17 +374,19 @@
         this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate + ' 23:59:59'
 
         this.model.params.operatorState = this.$refs.paged.$refs.cri.model.f_type + ''
+
         console.log("========")
         console.log(this.$refs.paged.$refs.cri.model.f_residential_area)
-        if(this.$refs.paged.$refs.cri.model.f_residential_area != '' && this.$refs.paged.$refs.cri.model.f_pcd != ''){
-          this.$refs.paged.model.params.condition1 = `f_residential_area like '%${this.$refs.paged.$refs.cri.model.f_residential_area}%' and f_pcd like '%${this.$refs.paged.$refs.cri.model.f_pcd}%'`
+        if(this.$refs.paged.$refs.cri.model.f_residential_area != '' && this.$refs.paged.$refs.cri.model.f_zones != ''){
+          this.$refs.paged.model.params.condition1 = `f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}' and f_zones = '${this.$refs.paged.$refs.cri.model.f_zones}'`
         }else if (this.$refs.paged.$refs.cri.model.f_residential_area != ''){
-          this.$refs.paged.model.params.condition1 = `f_residential_area like '%${this.$refs.paged.$refs.cri.model.f_residential_area}%'`
-        }else if (this.$refs.paged.$refs.cri.model.f_pcd != '') {
-          this.$refs.paged.model.params.condition1 = `f_pcd like '%${this.$refs.paged.$refs.cri.model.f_pcd}%'`
+          this.$refs.paged.model.params.condition1 = `f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
+        }else if (this.$refs.paged.$refs.cri.model.f_zones != '') {
+          this.$refs.paged.model.params.condition1 = `f_zones = '${this.$refs.paged.$refs.cri.model.f_zones}'`
         }else {
           this.$refs.paged.model.params.condition1 = `1=1`
         }
+
         await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('计算合计。', this.sumsmodel)
@@ -380,6 +414,16 @@
         this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
         this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
       },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
       close() {
         this.printshow = false
       },
@@ -416,6 +460,92 @@
 
         this.search()
       },
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let http = new HttpResetClass()
+          let getAllArea = await http.load('POST', '/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            if(Array.isArray(val)){
+              for (let i = 0; i <val.length ; i++) {
+                if(res.parentid == val[i]){
+                  return true
+                }
+              }
+            }
+            return res.parentid == val
+          })
+          this.sliceArea = []
+          this.slice_area = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: res.name})
+          })
+          console.log("===============")
+          console.log(this.sliceArea)
+        }
+      },
+      //初始化小区添加小区
+      async initareas(pconditon){
+        console.log(123)
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/querySingleTable?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.f_residential_area,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist=redata
+        console.log('看看modal',this.model)
+        console.log('小区', redata)
+      },
+      async  communityChange(val){
+        console.log("val")
+        console.log(val)
+        if(val){
+          await this.initareas(` f_orgid = '${this.f_filialeids[1]}' and f_slice_area ='${val}' `)
+          if(this.model.f_residential_area_id){
+            // if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
+            //   let pcd_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_community_id
+            //   if(pcd_id!=val){
+            //     this.model.f_residential_area_id=''
+            //   }
+            // } else {
+            //   this.model.f_residential_area_id=''
+            // }
+
+          }
+          // if(this.model.f_pcd_id.length==0){
+          // if (this.findbyid(this.streetslist,this.model.f_street_id)) {
+          //   this.model.f_pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
+          // }
+          // }
+        }
+      },
+    },
+    watch: {
+      // 监听 `this.$login.f.orgid` 的变化
+      'orgname'() {
+        // 检查是否发生了变化
+          // 重新初始化数据
+          this.initdata();
+      }
     },
     computed: {
       getCondition() {
@@ -430,9 +560,6 @@
       getfield() {
         return exportConfig.dataReportConfig
       },
-      gasproperties() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       },

package/src/filiale/jiaxian/config/exportConfig.js

@@ -1644,8 +1644,8 @@ export default {
   dataReportConfig: {
     'f_userinfo_code': '客户编号',
     'f_user_name': '客户姓名',
-    'f_area': '小区',
-    'f_pcd': '区/县',
+    'f_residential_area': '小区',
+    'f_zones': '区/县',
     'f_address': '地址',
     'f_meter_brand': '气表厂家',
     'f_meternumber': '表号',