manage-client-xy 3.2.20 → 3.2.22

package/package.json

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

package/src/components/SellReport/OrderCenter.vue

@@ -0,0 +1,197 @@
+<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>
+        <p class="bg-info text-center" style="padding: 8px;">咸阳其他收费汇总</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-4">
+              <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-4">
+              <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-4">
+              <label class="font_normal_body">&emsp;&emsp;公司:</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-4" style="float:right;">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&emsp;&emsp;&nbsp;&nbsp;&nbsp;</label>
+              <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'
+                            v-if="$parent.$parent.jurisdiction.includes('excel导出')"
+              ></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">
+          <thead>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">线上预约汇总</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' 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>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{ $parent.operatorname }}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='17'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+        </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: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      jurisdiction: this.$login.r,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/orderCenter', {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'
+      }),
+      reportStr: null
+    }
+  },
+  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()
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      console.log(args.condition + 'yyyqqq')
+      this.printTime = this.$login.toStandardTimeString()
+      let orgCondition = '1=1'
+      if (this.f_orgid[0]) {
+        let id = this.f_orgid.toString()
+        let ids = id.split(',')
+        console.log('几个公司:' + ids.length)
+        let orgids = ''
+        let f_orgids = ''
+        if (ids.length === 1) {
+          f_orgids += "'" + ids[0] + "'"
+        } else {
+          for (let i = 0; i < ids.length; i++) {
+            console.log('id = ' + ids[i])
+            orgids += "'" + ids[i] + "',"
+          }
+          f_orgids = orgids.substring(0, orgids.length - 1)
+        }
+
+        orgCondition += " and f_orgstr in ( " + f_orgids + " ) "
+        console.log('f_orgids:' + f_orgids)
+      }
+      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
+      this.userresid = obj.resids
+    },
+    getdep(obj, val) {
+      this.depname = val[0]
+      this.f_depid = obj
+    },
+    getuser(obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+    // 根据文件路径获取储存的报表内容
+    getFileContent(path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    close() {
+      this.show = false
+    }
+  },
+  watch: {
+    'data'(val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {}
+}
+</script>
+<style scoped>
+.noborder {
+  border: none;
+}
+</style>

package/src/components/SellReport/tonghua/outletTableTongHua.vue

@@ -0,0 +1,181 @@
+<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-3 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-3 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>
+            <res-select-group class="col-sm-6 form-group" :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+            <div class="col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_gasmeterstyle"
+                        v-model='model.f_gasmeterstyle'
+                        :options='$parent.$parent.gasmeterstyle'
+                        condition="curr.f_gasmeterstyle = '{}'"
+                        placeholder='气表品牌'
+                        close-on-select></v-select>
+            </div>
+          </div>
+          <div class="span" 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>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: l eft;">
+              <h3 style="text-align: center">网点人员汇总报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <td :colspan='$parent.tablen'>
+              {{{ model.data.substring(26,model.data.length-8)}}}
+            </td>
+          </tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.depname"> 收费网点：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">收费员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </thead>
+        </table>
+      </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: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_gasmeterstyle: [],
+      // f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('api/af-revenue/report/outletTongHua', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  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'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      if (condition && condition !== '1=1') {
+        // 为特定字段添加curr.前缀
+        this.orgCondtionStr = condition
+          .replace(/\bf_orgid\b/g, 'curr.f_orgid')
+          .replace(/\bf_depid\b/g, 'curr.f_depid')
+          .replace(/\bf_operatorid\b/g, 'curr.f_operatorid')
+      }
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      this.operatorname = obj.operatornames[0]
+    },
+    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: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    gasmeterstyle () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型2')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -150,7 +150,7 @@
                 <th rowspan="2">
                   <nobr>小区名称</nobr>
                 </th>
-                <th colspan="7">
+                <th colspan="6">
                   <nobr>用户数(档案户数)</nobr>
                 </th>
                 <th colspan="4">
@@ -167,9 +167,6 @@
                 </th>
               </tr>
               <tr>
-                <th>
-                  <nobr>总户数</nobr>
-                </th>
                 <th>
                   <nobr>正常</nobr>
                 </th>
@@ -234,9 +231,6 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_residential_area }}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{ row.f_user_number }}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_zhengchang }}</nobr>
               </td>

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

@@ -151,6 +151,12 @@
                 <th>
                   <nobr>卡费</nobr>
                 </th>
+                <th>
+                  <nobr>收款方式</nobr>
+                </th>
+                <th>
+                  <nobr>补卡状态</nobr>
+                </th>
                 <th>
                   <nobr>补卡日期</nobr>
                 </th>
@@ -197,6 +203,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_cardfees}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
@@ -264,8 +276,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         data: {},
         model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 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"],
+        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_payment","f_state", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
 
         orgCondtionStr: '',
         jurisdiction:this.$login.r,

package/src/components/sale/filesquery/UserQuery.vue

@@ -511,7 +511,7 @@
       async  getaddress(){
         console.log('开始获取小区')
         let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist?pageNo=1&pageSize=5000', {
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
           data: {
             condition: '1=1'
           }

package/src/main.js

@@ -2,12 +2,12 @@ import Vue from 'vue'
 import App from './App'
 import { all } from 'vue-client'
 import { system } from 'system-clients'
-// import { sale } from 'sale-client'
+import { sale } from 'sale-client'
 import saleManage from './saleManage'
-// import webmeterManage from './webmeterManage'
-// import reportManage from './reportManage'
-// import newmanage from './newmanage'
-// import ManageHome from './ManageHome'
+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';
 
@@ -38,13 +38,13 @@ AMap.initAMapApiLoader({
 
 Vue.prototype.$echarts = echarts
 all()
-// sale()
+sale()
 system(false)
 saleManage()
-// webmeterManage()
-// ManageHome()
-// newmanage()
-// reportManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
 require('./bootstrap/less/bootstrap.less')
 require('./bootstrap/less/manageStyle/manageStyle.less')
 require('./bootstrap/less/manageStyle/manageChile.less')

package/src/reportManage.js

@@ -275,4 +275,8 @@ export default function () {
   Vue.component('manage-other-charge', (resolve) => {
     require(['./components/SellReport/ManageOtherChargeReport'], resolve)
   })
+  // 预约汇总报表
+  Vue.component('order-center', (resolve) => {
+    require(['./components/SellReport/OrderCenter'], resolve)
+  })
 }