manage-client 3.2.67-aode → 3.2.68-aode

package/src/components/sale/report/aode/DayReportList.vue

@@ -4,7 +4,21 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <res-select-group :style="$parent.$parent.style" :
+                              initres="$parent.$parent.initres"
+                              @re-res="$parent.$parent.getRes"
+                              :mul="false"
+                              :show-component="['company','department','operator']"
+                              :style="$parent.$parent.style"
+                              v-ref:sel></res-select-group>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select :value.sync="model.slice_area" v-model="model.slice_area"
+                        :value-single="true"
+                        :options='$parent.$parent.sliceArea' placeholder='片区/管理站'
+                        close-on-select v-ref:slice>
+              </v-select>
+            </div>
             <div :class="$parent.$parent.style" >
               <label for="startDate" class="font_normal_body">开始日期</label>
               <datepicker  placeholder="开始日期" style="width:60%"
@@ -190,7 +204,7 @@
 
 <script>
 
-  import { PagedList } from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import exportConfig from '../../config/exportConfig'
   import DayReportSummary from "./DayReportSummary";
   import getLodop from '../../../../plugins/LodopFuncs'
@@ -215,6 +229,7 @@
           dep:[this.$login.f.depids],
           user:[this.$login.f.id]
         },
+        sliceArea: [],
         model: new PagedList('rs/sql/aode_dayReport', 30, {orderitem: "'f_operate_date'"},{
           f_pregas: 0,
           f_collection: 0,
@@ -290,6 +305,7 @@
       if(this.$login.r.includes('收费推送')){
         this.pushncshow = true;
       }
+      this.initAreas(this.$login.f.orgid)
       this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
       this.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
       this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString() +' 00:00:00'
@@ -300,6 +316,24 @@
       // this.search()
     },
     methods: {
+      // 初始化片区
+      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) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = [{label: '全部', value: ''}]
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: res.name})
+          })
+        }
+      },
       //推送数据
       pushncdata(){
         this.$refs.pushmanage.pushncdata();
@@ -349,7 +383,10 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
-
+        let condvalue = '1=1'
+        if (this.$refs.paged.$refs.cri.model.slice_area) {
+          condvalue = condvalue + ` and isnull(ss.f_zones,u3.f_slice_area) = '${this.$refs.paged.$refs.cri.model.slice_area}'`
+        }
         this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
         this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
 
@@ -360,7 +397,7 @@
           this.pushncshow2= false;
         }
         this.searchCondition = this.getCondition;
-        await this.model.search(args.condition, args.model)
+        await this.model.search(args.condition, args.model,condvalue)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('计算合计。', this.sumsmodel)