manage-client 3.3.171 → 3.3.174

package/src/components/SellReport/GasMoneyPublicConReport.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid  ="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="分组项一">分组项一</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="分组项二">分组项二</label>
+              <v-select :value.sync="model.f_public_group2"
+                        v-ref:grouptwo
+                        v-model="model.f_public_group2"
+                        :options='$parent.$parent.group2' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
+            <div  style = "float:right;">
+              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='gasprice'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='6' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">用气统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='6' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='6' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='6' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='6' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='2' style="font-weight: normal; text-align: center;">
+              收款人：
+            </th><th colspan='2' style="font-weight: normal; text-align: center;">
+              审核人：
+            </th><th colspan='2' style="font-weight: normal; text-align: center;">
+              经手人：
+            </th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '用气统计报表',
+    props: ['data'],
+    data () {
+      return {
+        printTime: this.$login.toStandardTimeString(),
+        depresid: [],
+        userresid: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        f_public_group1: '',
+        f_public_group2: '',
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        group1Name: '',
+        group2Name: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('api/af-revenue/report/PublicConReport',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  f_public_group1: 'this.model.f_public_group1[0]',
+                  f_public_group2: 'this.model.f_public_group2[0]',
+                  group1Name: 'this.model.group1Name',
+                  group2Name: 'this.model.group2Name'
+          }
+        ),
+        reportStr: null,
+        show: false,
+        spans: ''
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      // this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+        this.$refs.paged.$refs.criteria.model.group2Name = this.$refs.paged.$refs.criteria.$refs.grouptwo.selectedItems
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]) {
+          orgcondition += `  and  t1.f_orgid in ('${this.f_orgid}')`
+        }
+        if (this.f_depid[0]) {
+          orgcondition += `  and  t1.f_depid in ('${this.f_depid}')`
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += `  and  t1.f_operatorid in ('${this.f_operatorid}')`
+        }
+        let name1 = args.model.f_public_group1
+        let name2 = args.model.f_public_group2
+        if (name1 == null || name1 == '' || name2 == null || name2 == ''){
+          alert("请选择分组项！！！")
+          return
+        }
+        if (name2.toString() == name1.toString()){
+          alert("分组项一与分组项二不能重复！！！")
+          return
+        }
+        console.log(args.model.f_public_group1)
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'model.data' (val) {
+        let tab = document.getElementById('test').children[0]
+        var tds = tab.getElementsByTagName('td')
+        var num = 0
+        for (let td of tds) {
+          let span = td.getAttribute('colspan')
+          num = num + ((span ? span : 1) - 0)
+        }
+        this.spans = num
+      }
+    },
+    computed: {
+      group1() {
+        return [{label:'用户类型', value:'f_user_type'},
+          {label:'用气性质', value:'f_gasproperties'},
+          {label:'付款方式', value:'f_payment'},
+          {label:'气价类型', value:'f_price_name'}]
+      },
+      group2() {
+        return [{label:'用户类型', value:'f_user_type'},
+          {label:'用气性质', value:'f_gasproperties'},
+          {label:'付款方式', value:'f_payment'},
+          {label:'气价类型', value:'f_price_name'}]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

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

@@ -135,6 +135,14 @@
                             condition="f_user_state = '{}'"
                             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_table_state"
+                            v-model="model.f_table_state"
+                            :options='$parent.$parent.tablestates' placeholder='请选择'
+                            condition="f_table_state = '{}'"
+                            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_gasproperties"
@@ -496,6 +504,7 @@ import exportConfig from '../config/exportConfig'
         // 使用类型,壁挂炉
         usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
         userstates: this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+        tablestates: this.$appdata.getParam('表具状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('表具状态')] : [],
         meterbooks: [{label: '全部',value: ''}],  //抄表册
         tempfalg :false,
         lastorgstr:'',

package/src/filiale/tongchuan/InspectListGas.vue

@@ -240,7 +240,7 @@
                 </div>
 
 
-                <div  v-if="$parent.$parent.meter_classify == '卡表' || $parent.$parent.meter_classify == '物联网表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                <div   class="col-sm-2 flex-row" style="white-space: nowrap">
                   <label  class="font_normal_body">&emsp;期间次数</label>
                   <div class="row">
                     <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
@@ -250,17 +250,7 @@
                            condition="sellcishu <= {} " placeholder="">
                   </div>
                 </div>
-                <div  v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-                  <label  class="font_normal_body">&emsp;期间次数</label>
-                  <div class="row">
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
-                           condition="sellcishu >= {} " placeholder="">
-                    <label   class="font_normal_body">  ≤ x ≤ </label>
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
-                           condition="sellcishu <= {} " placeholder="">
-                  </div>
-                </div>
-                <div v-if="$parent.$parent.meter_classify == '卡表'  || $parent.$parent.meter_classify == '物联网表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                <div  class="col-sm-2 flex-row" style="white-space: nowrap">
                   <label  class="font_normal_body">期间购气量</label>
                   <div class="row">
                     <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmin"
@@ -270,16 +260,6 @@
                            condition="sellpregas <= {} " placeholder="">
                   </div>
                 </div>
-                <div v-if="$parent.$parent.meter_classify == '机表'"  class="col-sm-2 flex-row" style="white-space: nowrap">
-                  <label class="font_normal_body">期间用气量</label>
-                  <div class="row">
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
-                           condition="sellpregas >= {} " placeholder="">
-                    <label   class="font_normal_body">  ≤ x ≤ </label>
-                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
-                           condition="sellpregas <= {} " placeholder="">
-                  </div>
-                </div>
 
 
               </div>
@@ -312,9 +292,8 @@
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
-                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify =='物联网表'"><nobr>期间购气次数</nobr></th>
-                <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
-                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify == '物联网表'"><nobr>期间购气量</nobr></th>
+                <th><nobr>期间购气次数</nobr></th>
+                <th><nobr>期间购气量</nobr></th>
                 <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
     <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
@@ -357,7 +336,7 @@
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
             <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
-            <td v-if="meter_classify == '卡表' || meter_classify == '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
+            <td  style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
             <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
             <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
           </tr>
@@ -564,16 +543,10 @@
         if(this.meter_classify == '物联网表'){
           this.model.url= 'api/af-revenue/sql/getwulw_listgas'
         }
-        if (this.meter_classify == '卡表') {
-          if (!this.$refs.paged.$refs.cri.model.sellcishumin && !this.$refs.paged.$refs.cri.model.sellcishumax) {
-            args.condition = args.condition + "and sellcishu > 0"
-          }
-        }
-        if (this.meter_classify == '机表') {
-          if (!this.$refs.paged.$refs.cri.model.handsellcishumin && !this.$refs.paged.$refs.cri.model.handsellcishumax) {
-            args.condition = args.condition + "and sellcishu > 0"
-          }
+        if (!this.$refs.paged.$refs.cri.model.sellcishumin && !this.$refs.paged.$refs.cri.model.sellcishumax) {
+          args.condition = args.condition + "and sellcishu > 0"
         }
+
         console.log(this.$login.f)
         if(this.$refs.paged.$refs.cri.model.startDate){
           this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
@@ -671,7 +644,7 @@
         }
       },
       f_meter_classify(){
-        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
+        return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '物联网表', value: '物联网表'} ]
         // return [{label: '卡表', value: '卡表'}]
       },
       Gasproperties2() {

package/src/main.js

@@ -1,68 +1,76 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/shexian/sale'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-ShanXianSaleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+// import saleManage from './saleManage'
+// import FilialeSaleManage from './filiale/WEINAN/sale'
+// import webmeterManage from './webmeterManage'
+// import FilialeWebmeterManage from './filiale/yuncheng/webmeterManage'
+import reportManage from './reportManage'
+// import FilialeReportManage from './filiale/WEINAN/reportManage'
+// import newmanage from './newmanage'
+// import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+// // 开启 nginx 加密
+// Vue.mmType = 'nginx'
+// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+//
+// Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+// saleManage()
+// FilialeSaleManage()
+// webmeterManage()
+// FilialeWebmeterManage()
+// ManageHome()
+// newmanage()
+reportManage()
+// FilialeReportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/src/reportManage.js

@@ -530,6 +530,10 @@ export default function () {
   Vue.component('public-sell-report', (resolve) => {
     require(['./components/SellReport/GasMoneyPublicReport'], resolve)
   })
+  // 气费通用报表简版
+  Vue.component('public-sell-con-report', (resolve) => {
+    require(['./components/SellReport/GasMoneyPublicConReport'], resolve)
+  })
   // 其他收费通用报表
   Vue.component('public-other-report', (resolve) => {
     require(['./components/SellReport/OtherChargePublicReport'], resolve)

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 22 14:41:19 CST 2024
-gradle.version=7.4