manage-client 3.1.48 → 3.1.51

package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue

@@ -27,16 +27,27 @@
                               >
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group ">
-                  <label class="font_normal_body">客户编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                <div class="col-sm-3 form-group" >
+                  <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+                  <right-tree id="org"
+                              @re-res="$parent.$parent.getRes" style="width: 60%">
+                  </right-tree>
                 </div>
+<!--                <res-select-group-->
+<!--                    :initres="$parent.$parent.initres"-->
+<!--                    :show-component="['company']"-->
+<!--                    @re-res="$parent.$parent.getRes" v-ref:sel>-->
+<!--                </res-select-group>-->
+<!--                <div class="col-sm-2 form-group ">-->
+<!--                  <label class="font_normal_body">客户编号</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"-->
+<!--                         condition="f_userinfo_code = '{}' " placeholder="客户编号">-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">客户名称</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
+<!--                         condition="f_user_name like '%{}%'" placeholder="客户名称">-->
+<!--                </div>-->
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -48,7 +59,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="getSellinggasList"
+                                sql-name="getSellinggasListNew"
                                 template-name='气费收款情况导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -59,20 +70,20 @@
                   <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>
                 </div>
               </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :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>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                         condition="f_user_phone like '%{}%'" placeholder="客户电话">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户地址</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                         condition="f_address like '%{}%'" placeholder='客户地址'>
-                </div>
+<!--              <div class="row" v-show="$parent.$parent.criteriaShow">-->
+<!--                -->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">客户电话</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"-->
+<!--                         condition="f_user_phone like '%{}%'" placeholder="客户电话">-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">客户地址</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"-->
+<!--                         condition="f_address like '%{}%'" placeholder='客户地址'>-->
+<!--                </div>-->
 
-              </div>
+<!--              </div>-->
             </div>
           </criteria>
 
@@ -200,7 +211,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           defaultPrint: ['f_account', 'f_pre_pay', 'f_month']
         },
         footer:[],
-        model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp'},{
           f_last_balance:0,
           f_account:0,
           f_wechat_pay:0,
@@ -210,6 +221,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           f_sum_pay:0,
           f_balance:0
         }),
+        f_orgid: '',
+        orgname: '',
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -258,16 +271,28 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
 
       selfSearch(args) {
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
-          {
-            condition:args.condition,
-            startDate:args.model.startDate,
-            endDate:args.model.endDate
-          }).then(res =>{
-          this.model.search(args.condition, args.model)
-          this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        })
+        let orgcondition = '1=1'
+        if(this.f_orgid[0]){
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+        }
+        args.condition = orgcondition
+        let s = new Date(new Date().getFullYear(), new Date().getMonth(), 1)
+        let e = new Date(args.model.endDate)
+        if (s <= e) {
+          args.model.temp = true
+        }else {
+          args.model.temp = false
+        }
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        // new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
+        //   {
+        //     condition:args.condition,
+        //     startDate:args.model.startDate,
+        //     endDate:args.model.endDate
+        //   }).then(res =>{
+        //
+        // })
       },
       clear() {
         //清空部门和人员
@@ -285,9 +310,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getRes(obj) {
-        console.log(obj,"========")
-        this.orgCondtionStr = obj
+      // getRes(obj) {
+      //   console.log(obj,"========")
+      //   this.orgCondtionStr = obj
+      // },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.f_orgid = obj.resids
       },
       stamp() {
         this.all = false
@@ -356,7 +385,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         return {
           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
+          condition: this.$refs.paged.model.condition,
+          temp: this.$refs.paged.$refs.cri.model.temp
         }
       },
       getfield() {

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

@@ -177,7 +177,7 @@
                 <nobr>{{row.f_real_amount}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_total_gas}}</nobr>
+                <nobr>{{row.totalgas}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_yuliang}}</nobr>

package/src/main.js

@@ -1,66 +1,66 @@
-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 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", //地图工具条
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-saleManage()
-
-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 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", //地图工具条
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+saleManage('liaoyuan')
+
+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 }
+})
+