manage-client 3.2.131 → 3.2.134

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

@@ -59,7 +59,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -106,7 +106,7 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
+                <div class="col-sm-2 form-group" v-if="titleShow">
                   <label class="font_normal_body" title="参数:支付渠道查询">支付渠道</label>
                   <v-select :value.sync="model.f_bank_type" multiple
                             v-model="model.f_bank_type"
@@ -430,7 +430,7 @@
               <th>
                   <nobr>写卡状态</nobr>
               </th>
-                <th>
+                <th v-if="titleShow">
                   <nobr>支付渠道</nobr>
                 </th>
                 <th>
@@ -626,7 +626,7 @@
                 <td style="text-align: center;">
                     <nobr>{{row.f_write_card}}</nobr>
                 </td>
-              <td style="text-align: center;">
+              <td style="text-align: center;" v-if="titleShow">
                 <nobr>{{row.f_bank_type}}</nobr>
               </td>
               <td style="text-align: center;">
@@ -832,6 +832,7 @@
      data() {
       return {
         IdCardInfo:'',
+        titleShow : true,
         card:'',
         isSingleUser: null,
         startDate1:'',
@@ -914,6 +915,7 @@
       this.$refs.paged.$refs.cri.model.f_state=['有效']
       this.getaddress()
       this.getEquipment()
+      this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null? true : this.$appdata.getSingleValue('是否显示筛选框')
       //加载抄表册
       this.$MagGetSaleParam.initinputtor();
       this.getinputtores();

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

@@ -132,7 +132,7 @@
                             condition="f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -388,6 +388,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -106,7 +106,7 @@
                             condition="f_operat_type = '{}'"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"  :cascade =true v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -339,6 +339,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition} ` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -397,6 +397,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },

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

@@ -58,7 +58,7 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -451,6 +451,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
        this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length

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

@@ -56,7 +56,7 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"

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

@@ -55,7 +55,7 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"

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

@@ -53,7 +53,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true  v-ref:sel></res-select-group>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>

package/src/components/sale/filesquery/MeterQuery.vue

@@ -92,14 +92,14 @@
                               :options='$parent.$parent.issecond' placeholder='请选择'
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2 form-group" v-if="titleShow">
                     <label for="f_usetype" class="font_normal_body"  title="参数:使用类型">使用类型</label>
                     <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
                               condition="f_usetype = '{}'"
                               :options='$parent.$parent.usetype' placeholder='请选择'
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2 form-group" v-if="titleShow">
                     <label class="font_normal_body">用气性质</label>
                     <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                               :options='$parent.$parent.gasproperties' placeholder='请选择'
@@ -210,7 +210,7 @@
                               condition="isbgl = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">
+                  <div class="col-sm-2 form-group" v-if="titleShow">
                     <label class="font_normal_body">用户等级</label>
                     <v-select :value.sync="model.f_user_grade"
                               v-model="model.f_user_grade"
@@ -284,10 +284,10 @@
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
-                  <th>
+                  <th v-if="titleShow">
                     <nobr>使用类型</nobr>
                   </th>
-                  <th>
+                  <th v-if="titleShow">
                     <nobr>用气性质</nobr>
                   </th>
                   <th>
@@ -363,10 +363,10 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_type}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;" v-if="titleShow">
                   <nobr>{{row.f_usetype}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;" v-if="titleShow">
                   <nobr>{{row.f_gasproperties}}</nobr>
                 </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
@@ -506,6 +506,7 @@
     data() {
       return {
         IdCardInfo:'',
+        titleShow : true,
         card:'',
         isSingleUser: null,
         other:[],
@@ -560,6 +561,7 @@
     },
     ready() {
       console.log("===========",this.$filialeInfo)
+      this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null? true : this.$appdata.getSingleValue('是否显示筛选框')
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {

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

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">时间类型</label>
                   <v-select
@@ -313,6 +313,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

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

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">时间类型</label>
@@ -323,6 +323,7 @@
         }
         //由于此处底层组件默认前面加了个and,所以此处前面硬补位一个1=1 等后面加condition了可以替换
         this.condition = `${args.condition} ` + f_orgstr
+        this.condition = this.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(this.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

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

@@ -6,7 +6,7 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
+            <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true  :mul="false" v-ref:sel></res-select-group>
             <div class="col-sm-2" >
               <label for="YeadDate" class="font_normal_body">统计年份</label>
               <datepicker  placeholder="结束日期" style="width:60%"
@@ -144,6 +144,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('计算合计。', this.sumsmodel)

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

@@ -6,7 +6,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" :cascade =true  :mul="false" v-ref:sel></res-select-group>
                 <div class="col-sm-2" >
                   <label for="YeadDate" class="font_normal_body">统计年份</label>
                   <datepicker  placeholder="结束日期" style="width:60%"
@@ -200,6 +200,7 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition =  `${args.condition} ` + f_orgstr
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
         await this.model.search(args.condition, args.model)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

package/src/filiale/WEINAN/BusinessManage.vue

@@ -7,7 +7,8 @@
     <tabs header="换表查询" v-if="permission('换表查询')">
       <change-meter-query v-if="show.includes('换表查询')" @deal-msg="dealMsg" :data="data"></change-meter-query>
     </tabs>
-    <tabs header="机表抄表查询" v-if="permission('机表抄表查询')">
+    <!--<tabs header="机表抄表查询" v-if="permission('机表抄表查询')">-->
+    <tabs header="机表抄表查询" v-if="false">
       <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
     </tabs>
     <tabs header="过户查询" v-if="permission('过户查询')">
@@ -37,7 +38,8 @@
 <!--    <tabs header="减免优惠查询" v-if="permission('减免优惠查询')">-->
 <!--      <over-due-query v-if="show.includes('减免优惠查询')" @deal-msg="dealMsg" :data="data"></over-due-query>-->
 <!--    </tabs>-->
-    <tabs header="调价补差查询" v-if="permission('调价补差查询')">
+    <!--<tabs header="调价补差查询" v-if="permission('调价补差查询')">-->
+    <tabs header="调价补差查询" v-if="false">
       <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
     </tabs>
     <tabs header="迁表查询" v-if="permission('迁表查询')">
@@ -52,13 +54,16 @@
     <!--      <tabs header="操作记录查询" v-if="permission('操作记录查询')">-->
     <!--        <record-query v-if="show == '操作记录查询'" @deal-msg="dealMsg" :data="data"></record-query>-->
     <!--      </tabs>-->
-    <tabs header="业务查询" v-if="permission('业务查询')">
+    <!--<tabs header="业务查询" v-if="permission('业务查询')">-->
+    <tabs header="业务查询" v-if="false">
       <busines-query v-if="show.includes('业务查询')" @deal-msg="dealMsg" :data="data"></busines-query>
     </tabs>
-    <tabs header="预存查询" v-if="permission('预存查询')">
+    <!--<tabs header="预存查询" v-if="permission('预存查询')">-->
+    <tabs header="预存查询" v-if="false">
       <yucun-detailss v-if="show.includes('预存查询')" @deal-msg="dealMsg" :data="data"></yucun-detailss>
     </tabs>
-    <tabs header="发折查询" v-if="permission('发折查询')">
+    <!--<tabs header="发折查询" v-if="permission('发折查询')">-->
+    <tabs header="发折查询" v-if="false">
       <sendbook-query v-if="show.includes('发折查询')" @deal-msg="dealMsg" :data="data"></sendbook-query>
     </tabs>
     <tabs header="用户参保查询" v-if="permission('用户参保查询')">