manage-client 3.3.83 → 3.3.84

package/src/filiale/WEINAN/UserGasAll.vue

@@ -70,11 +70,12 @@
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>
-                  <div class="col-sm-2">
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getorg"
-                                :initresid='$parent.$parent.orgid'></right-tree>
-                  </div>
+                  <res-select-group
+                    :show-component="['company','slicearea']"
+                    :initres="$parent.$parent.initres"
+                    @re-res="$parent.$parent.getRes"
+                    v-ref:sel
+                  ></res-select-group>
 <!--                  <div class="col-sm-2 form-group">-->
 <!--                    <label class="font_normal_body">组织机构</label>-->
 <!--                    <res-select :initresid="$parent.$parent.orgid"-->
@@ -83,20 +84,6 @@
 <!--                                restype='organization'>-->
 <!--                    </res-select>-->
 <!--                  </div>-->
-
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户类型</label>
-                    <v-select :options='$parent.$parent.Gasusertype'
-                              :value.sync="model.f_user_type"
-                              close-on-select
-                              style="width:60%"
-                              condition="f_user_type = '{}'"
-                              id="f_user_type"
-                              placeholder='客户类型'
-                              v-model="model.f_user_type"
-                              value-single="true">
-                    </v-select>
-                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">用气性质</label>
                     <v-select :options='$parent.$parent.Gasproperties'
@@ -197,6 +184,20 @@
                              condition="f_curbalance <= {} " placeholder="">
                     </div>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户类型</label>
+                    <v-select :options='$parent.$parent.Gasusertype'
+                              :value.sync="model.f_user_type"
+                              close-on-select
+                              style="width:60%"
+                              condition="f_user_type = '{}'"
+                              id="f_user_type"
+                              placeholder='用户类型'
+                              @change="$parent.$parent.userTypeChange()"
+                              v-model="model.f_user_type"
+                              :value-single="true">
+                    </v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
                     <v-select :value.sync="model.f_user_usetype" :search="false"
@@ -205,7 +206,7 @@
                               :options='$parent.$parent.userusetypes'
                               condition="f_user_usetype = '{}'"
                               placeholder='用气类型'
-                              value-single="true"
+                              :value-single="true"
                               close-on-select>
                     </v-select>
                   </div>
@@ -217,7 +218,7 @@
                               :options='$parent.$parent.useinstitutions'
                               condition="f_use_institution = '{}'"
                               placeholder='用气机构'
-                              value-single="true"
+                              :value-single="true"
                               close-on-select>
                     </v-select>
                   </div>
@@ -228,10 +229,15 @@
                               :options='$parent.$parent.userusenatures'
                               condition="f_user_usenature = '{}'"
                               placeholder='使用性质'
-                              value-single="true"
+                              :value-single="true"
                               close-on-select>
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">单位名称</label>
+                    <input  style="width:60%" class="input_search" condition="f_corporate_name like '%{}%'" placeholder='单位名称' type="text"
+                            v-el:corporatename v-model="model.f_corporate_name" v-next-el='corporatename'>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -395,9 +401,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         reportStr: null,
         show: false,
         initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
+          org: [this.$login.f.orgid],
+          slice_area: [],
         },
         outlets: [],
         operator: [],
@@ -405,6 +410,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         searchshow: true,
         startDate1:'',
         endDate1:'',
+        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         // startDate: '',
@@ -441,8 +447,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           {label: '周', value: 'week'},
           {label: '日', value: 'day'}
         ],
-        // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
-        orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        // orgConditionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
+        orgConditionStr: '',
         orgid:[this.$login.f.orgid],
         usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
       }
@@ -454,26 +460,41 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
       this.startDate1 = Util.addDate(new Date(),-4).substring(0,10)
       this.endDate1 = Util.toStandardDateString()
-        this.$refs.paged.$refs.cri.search()
+        // this.$refs.paged.$refs.cri.search()
         this.getfield = this.config.excelHeaders
     },
     methods: {
-      userUseInstitutionChange () {
+      userTypeChange () {
+        this.userusetypes = []
         this.userusenatures = []
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
         this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
-          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
-          this.userusenatures = this.$appdata.getParam(str)
+        if (this.$refs.paged.$refs.cri.model.f_user_type) {
+          console.log('this.$refs.paged.$refs.cri.model.f_user_type', this.$refs.paged.$refs.cri.model.f_user_type)
+          let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
+          this.userusetypes = this.$appdata.getParam(str)
         }
       },
       userUseTypeChange () {
         this.useinstitutions = []
+        this.userusenatures = []
         this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
         if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
           let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
       // 查询开关
       hidden() {
         this.criteriaShow = !this.criteriaShow
@@ -533,11 +554,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.endDate1 == '' || this.startDate1 == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
-        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
-        if (this.orgCondtionStr)
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
-        else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgConditionStr}`
+        if (!this.orgConditionStr) {
+          this.condition = this.$refs.paged.$refs.cri.condition + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          this.condition = this.$refs.paged.$refs.cri.condition + this.orgConditionStr
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -563,11 +585,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       close() {
         this.show = false
       },
-      getRes(obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj)
+      getRes (obj) {
+        this.orgConditionStr = obj
       },
       getorg(obj) {
-        this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+        this.orgConditionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
       },
       getCondition () {
         return {
@@ -577,7 +599,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         }
       }
       // getRes(condition,obj) {
-      //   this.orgCondtionStr = condition
+      //   this.orgConditionStr = condition
       //   this.orgname = obj.orgnames[0]
       //   this.depname = obj.depnames[0]
       // }
@@ -592,9 +614,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     computed: {
-      userusetypes () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
-      },
       startDate(){
         return this.startDate1 + ' 00:00:00'
       },

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

@@ -839,7 +839,7 @@ monthGasConfig: {
     'f_company_name': '单位名称',
     'f_pregas': '购气（充值）数量',
     'f_stairamount1': '一阶气量',
-    'f_collection': '实收款',
+    'f_collection': '实收款'
   },
   manageChargeSummaryByAreaConfig: {
     'f_residential_area': '小区名称',
@@ -853,7 +853,9 @@ monthGasConfig: {
     'id': '单位编号',
     'f_company_name': '单位名称',
     'f_oughtamount': '期间用气量',
+    'f_oughtfee': '期间用气金额',
     'f_pregas': '期间售气量',
+    'f_collection': '期间售气金额',
     'f_table_num': '表具数量'
   }
 }

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -433,7 +433,6 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-
     self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
 
@@ -441,7 +440,7 @@
     // self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    self.getaddress()
+    // self.getaddress()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -502,6 +501,7 @@
       this.startDate=this.$parent.startDate
       this.endDate=this.$parent.endDate
       console.log("this",this)
+      this.getaddress()
       readySomething(this)
     },
     methods: {