manage-client 3.3.224 → 3.3.225-kelai

package/build/dev-server.js

@@ -19,13 +19,21 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:8400/'
+var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://203.57.101.233:8400/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
+  '/api/af-revenue/sql/compreQuery': {
+    pathRewrite: {'^/api/af-revenue': '/rs/sql/compreQuery'},
+    target: 'http://localhost:8080'
+  },
+  'api/af-revenue/sql/queryGasRecord': {
+    pathRewrite: {'^/api/af-revenue': '/rs/sql/queryGasRecord'},
+    target: 'http://localhost:8080'
+  },
   '/rs/logic/exportfile': {
     target: bendi
   },
@@ -57,6 +65,9 @@ var proxyTable = {
   '/rs/logic/getSaleInitData': {
     target: bendi
   },
+  '/rs/logic': {
+    target: 'http://localhost:8080'
+  },
   // 用户登录服务地址
   '/rs/user': {
     target: bendi
@@ -95,7 +106,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: wode
+    target: bendi
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.224",
+    "version": "3.3.225-kelai",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

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

@@ -152,6 +152,24 @@
                             condition="f_gasproperties in {}">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            @change="$parent.$parent.pricetypechanged"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            multiple
+                            :options="$parent.$parent.pricenames"
+                            condition="f_price_name in {}"
+                  ></v-select>
+                </div>
+
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表册片区</label>
@@ -261,6 +279,9 @@
                 <th>
                   <nobr>气表类型</nobr>
                 </th>
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
                 <th>
                   <nobr>气价详情</nobr>
                 </th>
@@ -348,6 +369,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_classify}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_value}}</nobr>
               </td>
@@ -483,6 +507,7 @@ import exportConfig from '../config/exportConfig'
         residentialArea: [],
         f_filialeid: this.$login.f.orgid,
         show: false,
+        pricenames: [],
         rowdata: {},
         criteriaShow: false,
         orgCondtionStr: '',
@@ -648,6 +673,37 @@ import exportConfig from '../config/exportConfig'
           this.gasproperties = [{label: '全部', value: ''}]
         }
       },
+      async pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_name = []
+        this.pricenames = []
+        if (this.$refs.paged.$refs.cri.model.pricetype) {
+          let http = new HttpResetClass()
+          let param = {
+            items: 'f_price_name',
+            tablename: 't_stairprice',
+            condition: `f_price_type = '${this.$refs.paged.$refs.cri.model.pricetype[0]}' and f_orgid = '${this.$login.f.orgid}'`,
+            orderitem: 'id'
+          }
+          var res = await http.load('POST', 'api/af-revenue/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
+          let uniqueMap  = {}
+          let arr = []
+          for (var i = 0; i < res.data.length; i++) {
+            let item = res.data[i];
+            if (!uniqueMap[item.f_price_name]) {
+              arr.push(item);
+              uniqueMap[item.f_price_name] = true;
+            }
+          }
+          console.log('arr',arr)
+          if (arr.length > 0) {
+            arr.forEach(row => {
+              this.pricenames.push({label: row.f_price_name,value: row.f_price_name})
+            })
+          } else {
+            this.pricenames.push({label: '全部', value: ''})
+          }
+        }
+      },
       search () {
         this.$refs.paged.$refs.cri.search()
       },
@@ -756,6 +812,9 @@ import exportConfig from '../config/exportConfig'
       getfield () {
         return exportConfig.fmygasConfig
       },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
       usertypes () {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

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

@@ -190,7 +190,7 @@ export default {
         condition = ` f_residential_area like '%${searchText}%' `
       }
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+      HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
         data: {
           items: 'f_residential_area, id',
           tablename: 't_area',

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

@@ -1173,6 +1173,7 @@ export default {
     'f_meternumber': '表号',
     'f_meter_brand': '气表品牌',
     'f_meter_classify': '气表类型',
+    'f_price_name': '气价名称',
     'f_price_value': '气价详情',
     'f_balance': '账户余额',
     'f_pregas': '预购气量',

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -333,7 +333,7 @@ export default {
     //     condition = ` f_company_name like '%${searchText}%' `
     //   }
     //   let HttpReset = new HttpResetClass()
-    //   HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+    //   HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
     //     data: {
     //       items: 'f_company_name, id',
     //       tablename: 't_company',

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -413,7 +413,7 @@ export default {
         condition = ` f_company_name like '%${searchText}%' `
       }
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+      HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
         data: {
           items: 'f_company_name, id',
           tablename: 't_company',
@@ -437,7 +437,7 @@ export default {
         condition = ` f_residential_area like '%${searchText}%' `
       }
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+      HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
         data: {
           items: 'f_residential_area, id',
           tablename: 't_area',

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -823,7 +823,7 @@
           condition = ` f_company_name like '%${searchText}%' `
         }
         let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+        HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
           data: {
             items: 'f_company_name, id',
             tablename: 't_company',
@@ -923,7 +923,7 @@
           condition = ` f_residential_area like '%${searchText}%' `
         }
         let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+        HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
           data: {
             items: 'f_residential_area, id',
             tablename: 't_area',

package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue

@@ -254,7 +254,7 @@ export default {
         condition = ` f_residential_area like '%${searchText}%' `
       }
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'api/af-revenue/sql/saleSingleTable?pageNo=1&pageSize=100', {
+      HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
         data: {
           items: 'f_residential_area, id',
           tablename: 't_area',

package/src/filiale/jingwei/RecordInfoQuery.vue

@@ -347,6 +347,26 @@
                               close-on-select>
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="startDate4" class="font_normal_body" title="最后缴费日期">最后缴费日期</label>
+                    <datepicker id="startDate4" placeholder="开始日期" style="width:52%"
+                                v-model="model.startDate4"
+                                :value.sync="model.startDate4"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_last_gas_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="endDate4" class="font_normal_body" title="最后缴费日期">最后缴费日期</label>
+                    <datepicker id="endDate4" placeholder="结束日期" style="width:52%"
+                                v-model="model.endDate4"
+                                :value.sync="model.endDate4"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_last_gas_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
                 </div>
 
               </div>
@@ -442,7 +462,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>-->
@@ -471,6 +491,9 @@
                   <th>
                     <nobr>换表时间</nobr>
                   </th>
+                  <th>
+                    <nobr>最后缴费日期</nobr>
+                  </th>
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
@@ -508,7 +531,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
-               <!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
+<!--                <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
 
                 <!-- <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
@@ -579,6 +602,7 @@
                 </td>
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_last_gas_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
               </template>
               <template partial='foot'>
@@ -703,7 +727,7 @@
         //排序
         orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
         orderFields: {
-          f_operate_date: 'no'
+          // f_operate_date: 'no'
         },
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_user_state']
@@ -819,6 +843,7 @@
       },
       search(){
         this.$refs.paged.$refs.cri.search()
+        console.debug(this.model)
       },
       cancel() {
         this.show = false

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

@@ -217,7 +217,7 @@ export default{
     'f_user_phone': '联系电话', 'f_usetype': '使用类型',
     'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
     'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
-    'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
+    'f_balance': '账户余额', 'f_hand_date': '最后抄表日期','f_last_gas_date': '最后缴费日期', 'f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',
     'f_open_date': '开户时间', 'f_credentials': '证件类型', 'f_idnumber': '身份证号', 'f_people_num': '人口数', 'f_ins_stop_date': '保险结束日期',
     'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_depname': '所属营业厅', 'f_comments': '备注信息',

package/src/filiale/kelai/NewGasStatistics.vue

@@ -36,6 +36,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"
+                                :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="queryGasRecord" template-name='用气量统计表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -312,6 +313,7 @@ export default {
   title: '新用气分析',
   data () {
     return {
+      other: [],
       show:false,
       org:[this.$login.f.orgid],
       orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
@@ -364,6 +366,13 @@ export default {
     this.$refs.paged.$refs.criteria.model.inputEndDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
   },
   methods: {
+    getheader() {
+      this.other=[];
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+    },
     initParams() {
       // 初始化气表品牌
       let brandArr = []
@@ -450,6 +459,12 @@ export default {
         this.f_filialeid = res[1]
         // this.updateParams()
       }
+    },
+    sumsmodel:{
+      handler: function (val){
+        this.getheader()
+      },
+      deep: true
     }
   },
   computed: {

package/src/filiale/kelai/WebmeterQuery.vue

@@ -0,0 +1,77 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="指令查询" v-if="permission('指令查询')">
+      <instruct-manage v-if="show.includes('指令查询')"></instruct-manage>
+    </tabs>
+    <tabs header="历史指令查询" v-if="permission('历史指令查询')">
+      <instruct-manage-history v-if="show.includes('历史指令查询')"></instruct-manage-history>
+    </tabs>
+    <tabs header="上报查询" v-if="permission('上报查询')">
+      <report-list v-if="show.includes('上报查询')"></report-list>
+    </tabs>
+    <tabs header="结算查询" v-if="permission('结算查询')">
+      <report-data-query v-if="show.includes('结算查询')"></report-data-query>
+    </tabs>
+    <tabs header="缴费查询" v-if="permission('缴费查询')">
+      <recharge-instruct-query v-if="show.includes('缴费查询')"></recharge-instruct-query>
+    </tabs>
+    <tabs header="异常查询" v-if="permission('异常查询')">
+      <meter-exception-list v-if="show.includes('异常查询')"></meter-exception-list>
+    </tabs>
+    <tabs header="用户失联" v-if="permission('用户失联')">
+      <user-lost-contact-analysis v-if="show.includes('用户失联')"></user-lost-contact-analysis>
+    </tabs>
+    <tabs header="失联查询" v-if="permission('失联查询')">
+      <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
+    </tabs>
+    <tabs header="用气查询" v-if="!newWebHand && permission('用气查询')">
+      <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
+    </tabs>
+    <tabs header="新用气查询" v-if="permission('用气查询')">
+      <new-use-gas-statistics v-if="show.includes('用气查询')"></new-use-gas-statistics>
+    </tabs>
+    <tabs header="未用气查询" v-if="permission('未用气查询')">
+      <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
+    </tabs>
+    <tabs header="物联网表结算分析" v-if="!newWebHand && permission('物联网表结算分析')">
+      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
+    </tabs>
+    <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
+      <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
+    </tabs>
+    <tabs header="物联用户月度结算查询" v-if="permission('物联用户月度结算查询')">
+      <webhand-month-gas v-if="show.includes('物联用户月度结算查询')"></webhand-month-gas>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+import TabButton from '../../components/sale/common/TabButton'
+import Tabs from '../../components/sale/common/Tabs'
+
+export default {
+  title: '物联查询',
+  data () {
+    return {
+      newWebHand: this.$appdata.getSingleValue('新抄表'),
+      show: []
+    }
+  },
+  components: {Tabs, TabButton},
+  methods: {
+    permission (name) {
+      // 保留是为了后面可能也会和综合查询一样加权限
+      if (this.$login.r.find(value => value === '物联查询') || name === '历史指令查询') {
+        if (!this.$login.r.find(value => value === name)) {
+          return false
+        }
+      }
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Jun 18 18:38:37 CST 2024
-gradle.version=7.4