manage-client 3.2.127 → 3.2.128

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

@@ -459,7 +459,11 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
       },
       getfield() {
         return exportConfig.BalanceTableConfig

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

@@ -103,8 +103,6 @@
 <script>
   import TabButton from '../common/TabButton'
   import Tabs from '../common/Tabs'
-  import ArrearsQuery from './ArrearsQuery'
-
 
   export default {
     title: '汇总查询',
@@ -122,7 +120,7 @@
         show: []
       }
     },
-    components: {Tabs, TabButton, ArrearsQuery},
+    components: {Tabs, TabButton},
     methods: {
       permission (name) {
         if (this.$login.r.find(value => value == '综合查询')) {

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

@@ -284,9 +284,9 @@
       getCondition() {
         var con = ""
         if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.cri.condition} `
+          con = `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr
         } else {
-          con = `${this.$refs.paged.$refs.cri.condition}`
+          con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
         }
         return {
           startdate: this.$refs.paged.$refs.cri.model.startDate,

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

@@ -46,7 +46,7 @@
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 :defaultselect="$parent.$parent.defaultexport"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='团缴查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="manage_singleTable" template-name='团缴查询导出'
                                 :choose-col="true">
                   </export-excel>
 
@@ -415,7 +415,9 @@
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc",
+          items: "*",
+          tablename: "t_sellinggasbatch"
         }
       },
       getfield() {

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

@@ -46,7 +46,7 @@
                                     <export-excel :data="$parent.$parent.getCondition"
                                                   :field="$parent.$parent.getfield"
                                                   :header="$parent.$parent.other"
-                                                  sqlurl="rs/logic/exportfile" sql-name="enableQuery" template-name='迁表查询导出'
+                                                  sqlurl="rs/logic/exportfile" sql-name="movemeterQuery" template-name='迁表查询导出'
                                                   :choose-col="true"></export-excel>
                                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                                :defaultfield="$parent.$parent.defaultfield"

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

@@ -194,15 +194,15 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>用户编号</nobr>
-<!--                  <data-order field="f_userinfo_code" name="用户编号">-->
-<!--                    :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
+                  <data-order field="f_userinfo_code" name="客户编号">
+                    :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                   </th>
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>表号</nobr>
@@ -223,7 +223,6 @@
                   <nobr>收票人</nobr>
                 </th>
                 <th>
-<!--                  <nobr>操作日期</nobr>-->
                   <data-order field="f_operate_date" name="操作日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
@@ -234,8 +233,7 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
+                  <data-order field="f_buy_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_buy_address"></data-order>
                 </th>
                 <th>

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

@@ -438,7 +438,7 @@
     getCondition () {
       var con = ""
       if (this.orgCondtionStr) {
-        con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in  (${this.orgCondtionStr})`
+        con = `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
       }
       else {
         con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`

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

@@ -654,7 +654,8 @@ export default{
   expectgasConfig: {
     'f_month': '月份', 'f_orgname': '公司', 'f_gy_num': '工业户数', 'f_my_num': '民用户数', 'f_jt_num': '集体户数', 'f_sy_num': '商业户数', 'f_sum_num': '户数合计',
     'f_gy_gas': '工业抄表量', 'f_my_gas': '民用抄表量', 'f_jt_gas': '集体抄表量', 'f_sy_gas': '商业抄表量', 'f_sum_gas': '抄表量合计',
-    'f_gy_account': '工业抄表金额', 'f_my_account': '民用抄表金额', 'f_jt_account': '集体抄表金额', 'f_sy_account': '商业抄表金额', 'f_sum_account': '抄表金额合计'
+    'f_gy_account': '工业抄表金额', 'f_my_account': '民用抄表金额', 'f_jt_account': '集体抄表金额', 'f_sy_account': '商业抄表金额', 'f_sum_account': '抄表金额合计',
+    'f_old_gas': '冲正气量','f_old_fee': '冲正金额','f_old_num':'冲正户数'
   },
   pregaslistConfig: {
     'f_month': '月份', 'f_last_balance': '期初余额', 'f_wechat_pay': '微信', 'f_money_pay': '现金', 'f_bank_pay': '银行转账',

package/src/components/sale/resourcequery/LoginQuery.vue

@@ -230,7 +230,8 @@
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " logindate desc"
+          orderitem: this.orderitem?`${this.orderitem}`: " logindate desc",
+          tablename: 't_loginrecord'
         }
       },
       getfield() {

package/src/components/valueaddinfo/renewalvalueAddUserQuery.vue

@@ -49,7 +49,7 @@
                                      :defaultselect="$parent.$parent.selectfields"
                                      :field="$parent.$parent.getfield"
                                      :exportprogress="true"
-                                     sqlurl="rs/logic/exportfileplus"
+                                     sqlurl="rs/logic/exportfile"
                                      sql-name='getValueaddInfo'
                                      template-name="续保用户增值业务信息"  :choose-col="true"></export-excel-plus>
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>

package/src/components/valueaddinfo/valueAddCountQuery.vue

@@ -172,7 +172,7 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      for(var item in exportConfig.valueuserinfoConfig){
+      for(var item in exportConfig.valuecountConfig){
         this.selectfields.push(item)
       }
     },
@@ -307,7 +307,7 @@
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
       getfield() {
-        return exportConfig.valueuserinfoConfig
+        return exportConfig.valuecountConfig
       },
 
     }

package/src/components/valueaddinfo/valueAddUserQuery.vue

@@ -39,7 +39,7 @@
                                      :defaultselect="$parent.$parent.selectfields"
                                      :field="$parent.$parent.getfield"
                                      :exportprogress="true"
-                                     sqlurl="rs/logic/exportfileplus"
+                                     sqlurl="rs/logic/exportfile"
                                      sql-name='getValueaddInfo'
                                      template-name="用户增值业务信息"  :choose-col="true"></export-excel-plus>
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>

package/src/components/webmeter/WebmeterQuery.vue

@@ -27,9 +27,9 @@
     <tabs header="未用气查询" v-if="permission('未用气查询')">
       <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
     </tabs>
-    <!--<tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">-->
-      <!--<webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>-->
-    <!--</tabs>-->
+    <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
+      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
+    </tabs>
   </tab-button>
 
 </template>

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -47,7 +47,7 @@
                                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                                 <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                               :field="$parent.$parent.getfield"
-                                              sqlurl="rs/logic/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
+                                              sqlurl="rs/logic/exportfile" sql-name="getExceptionList" template-name='异常查询'
                                               :choose-col="true"></export-excel>
                                 <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
                                 <!--                <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
@@ -355,9 +355,9 @@
                     {label: '日', value: 'day'}
                 ],
                 getfield:{
-                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称", "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
-                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_insert_date":"上报时间","f_error_level":"异常级别","f_error_type":"异常类型",
-                    "f_error_msg":"异常描述","f_orgname":"组织机构"
+                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_balance_amount":"账户余额","f_user_phone":"联系电话",
+                    "f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
+                    "f_signal":"信号强度","f_magneticInterference":"磁干扰异常","f_valvestate":"阀门状态","f_error_type":"异常类型","f_error_level":"异常级别","f_orgname":"分公司"
                 },
                 outlets: [],
                 operator: [],
@@ -520,17 +520,11 @@
             }
         },
         computed: {
-            // usertypes () {
-            //   return this.$appdate.getParams("客户类型")
-            // },
             getCondition() {
                 let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
                 return {
-                    condition: condition  ,
-                    startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
-                    endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+                    condition: condition
                 }
-
             },
             usertypes() {
                 return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/filiale/liaoyuan/exportConfig.js

@@ -405,7 +405,8 @@ monthGasConfig: {
   expectgasConfig:{
     "f_month":"月份","f_orgname":"公司","f_gy_num":"工业户数","f_my_num":"民用户数","f_jt_num":"集体户数","f_sy_num":"商业户数","f_sum_num":"户数合计",
     "f_gy_gas":"工业抄表量","f_my_gas":"民用抄表量","f_jt_gas":"集体抄表量","f_sy_gas":"商业抄表量","f_sum_gas":"抄表量合计",
-    "f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计"
+    "f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计",
+    "f_old_gas": "冲正气量","f_old_fee": "冲正金额","f_old_num":"冲正户数"
   },
   pregaslistConfig:{
     "f_month":"月份","f_last_balance":"期初余额","f_wechat_pay":"微信","f_money_pay":"现金","f_bank_pay":"银行转账",

package/src/filiale/macheng/MonthGasQuery.vue

@@ -350,8 +350,8 @@
             },
             selfSearch(args) {
                 args.condition = `${args.condition} ` + this.orgCondtionStr
-                let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
-                args.condition = `${args.condition} ` + f_orgstr
+                // let f_orgstr = this.orgCondtionStr + '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/filiale/macheng/RecordInfoQuery.vue

@@ -344,7 +344,7 @@
                   <th><nobr>小区名称</nobr></th>
                   <th><nobr>客户地址</nobr></th>
                   <th><nobr>客户电话</nobr></th>
-                  <th><nobr>通气日期</nobr></th>
+                  <th><nobr>片区</nobr></th>
                   <!-- 气价类型,单价暂时未处理 -->
                   <th><nobr>气价类型</nobr></th>
                   <th><nobr>气价名称</nobr></th>
@@ -453,7 +453,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_zones}}</nobr></td>
                 <!-- 气价类型,单价暂时未处理 -->
                 <td style="text-align: center;"><nobr>{{row.f_price_type}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>