manage-client 3.2.23 → 3.2.27

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() {
         //清空部门和人员

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

@@ -279,7 +279,7 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+        getfield:{"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
           "diffday":"未购气总天数"},
@@ -301,14 +301,14 @@
         if(val == '卡表') {
           this.url = 'rs/sql/inspectList'
           this.sqlName = 'inspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
             "diffday":"累计未购气天数"}
         }else{
           this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
-          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",
+          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
             "diffday":"累计未抄表天数"}

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

@@ -339,6 +339,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               收款合计:&emsp;{{sumsmodel.f_money}}
             </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>
 
@@ -395,7 +398,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -474,15 +477,17 @@
       search(){
         this.$refs.paged.$refs.cri.search()
       },
-      selfSearch(args) {
+    async  selfSearch(args) {
         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)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      },
+      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
+
+    },
       clear() {
         //清空部门和人员
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []

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

@@ -184,6 +184,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               过户费合计:&emsp;{{sumsmodel.f_transfer_fees}}
             </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>
@@ -225,7 +228,7 @@
         footer:[],
         show:false,
         rowdata:{},
-        model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
+        model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0,hushu:0}),
         criteriaShow: false,
         initres: {
           org:[this.$login.f.orgid],
@@ -302,8 +305,9 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
         console.log('我的阐述', JSON.stringify(args.condition))
         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
+
         console.log('合计字段', this.sumsmodel)
       },
       dealmsg(val) {

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

@@ -44,7 +44,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="usergas"
+                                sql-name="usergaszong"
                                 template-name='用户用气费用表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -199,8 +199,6 @@ export default {
     },
     selfSearch(args) {
       args.condition = `${args.condition} ` + this.orgCondtionStr
-      let f_orgstr = 'and  f_orgid = ' + this.f_orgid
-      args.condition = `${args.condition} ` + f_orgstr
       this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
     },

package/src/components/sale/config/exportConfig.js

@@ -548,7 +548,18 @@ export default{
     'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
     'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
     'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'
-
+  },
+  RechargeInstruct: {
+    'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_type': '收费类型',
+    'f_collection': '实收金额', 'f_instruct_state': '指令状态', 'f_receive_state': '表返回状态', 'f_instruct_date': '生成指令时间'
+  },
+  GasStatistics: {
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
+    'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
+    'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_input_date': '最后通讯日期'
+  },
+  ArrearageConfig: {
+    'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_type': '用户类型', 'f_gasproperties': '用气性质', 'f_curbalance': '欠费金额', 'f_oughtamount': '欠费气量'
   },
   ReportDataQueryConfig: {
     'f_userinfo_code': '客户编号', 'f_tablebase': '本次抄表底数', 'f_last_tablebase': '上次抄表底数', 'f_jval': '表计剩余余额', 'f_hand_date': '抄表日期',

package/src/components/webmeter/DrillData/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>
+<!--                  <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="$parent.$parent.resshow" :selectin="true" :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"-->
@@ -360,6 +361,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     components: {UserGasEcharts},
     data() {
       return {
+        resshow:['company','slicearea'],
         model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
@@ -423,7 +425,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        zonesdata:''
       }
     },
     ready() {
@@ -495,6 +498,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           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}`
+        if(this.zonesdata){
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -522,6 +528,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
+        if(obj.indexOf("f_zones = ")>0){
+          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+        }else{
+          this.zonesdata='';
+        }
       },
       getorg(obj) {
         this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'