manage-client 3.2.26 → 3.2.27

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

@@ -225,6 +225,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               卡费合计:&emsp;{{sumsmodel.f_cardfees}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              户数合计:&emsp;{{sumsmodel.hushu}}
+            </td>
           </tr>
         </table>
       </div>
@@ -268,7 +271,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0,hushu:0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -336,15 +339,16 @@
       cancel() {
         this.show = false
       },
-      selfSearch(args) {
+      async selfSearch(args) {
         console.log("--------------------?")
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
+       await 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
       },
 
       initParams() {

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

@@ -73,8 +73,9 @@
                   <label class="font_normal_body">补气类型</label>
                   <v-select :value.sync="model.f_type"
                             v-model="model.f_type"
+                            :multiple="true"
                             :options='$parent.$parent.fillGasTypes' placeholder='请选择'
-                            condition="f_type = '{}'"
+                            condition="f_fill_type in {}"
                             close-on-select></v-select>
                 </div>
 
@@ -83,6 +84,13 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.f_meter_type" multiple
+                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                            condition="f_meter_type in {}"
+                            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_meter_brand"
@@ -237,6 +245,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               补气金额合计:&emsp;{{sumsmodel.f_preamount}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              户数合计:&emsp;{{sumsmodel.hushu}}
+            </td>
           </tr>
         </table>
       </div>
@@ -279,7 +290,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0}),
+        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu:0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -307,7 +318,9 @@
         selected:{},
         gasproperties:[],
         //合计数据
-        sumsmodel: {}
+        sumsmodel: {},
+        metertypes: this.$appdata.getParam('气表类型')?[{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]:[]
+
       }
     },
     ready() {
@@ -359,8 +372,10 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
+       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
+       console.log("this.sumsmodel",this.sumsmodel,this.$refs.paged.$refs.grid)
       },
       clear() {
         //清空部门和人员