manage-client 3.2.299 → 3.2.300

package/src/filiale/shanxian/InspectListUserNew.vue

@@ -7,7 +7,7 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
           <div class="row">
             <div class="col-sm-2">
-              <label class="font_normal_body">&emsp;&emsp;公司</label>
+              <label class="font_normal_body">组织机构</label>
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
@@ -56,6 +56,7 @@
                           style="width:60%"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
+                          condition="delivery_date >= '{} 00:00:00'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
@@ -66,6 +67,7 @@
                           v-model="model.endDate"
                           style="width:60%"
                           :value.sync="model.endDate"
+                          condition="delivery_date <= '{} 23:59:59'"
                           :disabled-days-of-Week="[]"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
@@ -136,11 +138,11 @@
                        condition="collection <= {} " placeholder="">
             </div>
 
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">&emsp;&emsp;表号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                     condition="f_meternumber = '{}'" placeholder='表号'>
-            </div>
+            <!--<div class="col-sm-2 form-group">-->
+              <!--<label class="font_normal_body">&emsp;&emsp;表号</label>-->
+              <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"-->
+                     <!--condition="f_meternumber = '{}'" placeholder='表号'>-->
+            <!--</div>-->
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用户类型</label>
               <v-select :value.sync="model.f_user_type"
@@ -156,16 +158,16 @@
               <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" title="旧用户编号">档案编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                     condition="f_olduserinfo_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_phone"
-                     condition="f_user_phone like '%{}%'" placeholder="用户电话">
-            </div>
+            <!--<div class="col-sm-2 form-group">-->
+              <!--<label class="font_normal_body" title="旧用户编号">档案编号</label>-->
+              <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
+                     <!--condition="f_olduserinfo_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_phone"-->
+                     <!--condition="f_user_phone like '%{}%'" placeholder="用户电话">-->
+            <!--</div>-->
             <div class="col-sm-2 form-group">
               <label for="startDate" class="font_normal_body">建档开始</label>
               <datepicker id="createFileStartDate" placeholder="建档开始日期"
@@ -196,11 +198,13 @@
         <template partial='head'>
           <tr>
             <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>
             <th><nobr>用户电话</nobr></th>
-            <th><nobr>档案编号</nobr></th>
+            <!--<th><nobr>档案编号</nobr></th>-->
             <th><nobr>表号</nobr></th>
             <th><nobr>用户状态</nobr></th>
             <th><nobr>建档日期</nobr></th>
@@ -210,6 +214,7 @@
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
             <th><nobr>最后购气日期</nobr></th>
+            <th><nobr>未购气天数</nobr></th>
             <th><nobr>总购气次数</nobr></th>
 <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>-->
 
@@ -219,18 +224,20 @@
 
             <th><nobr>累计未购气天数</nobr></th>
 <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>-->
-            <th><nobr>组织机构</nobr></th>
+
           </tr>
         </template>
         <template partial='body'>
           <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
           <td style="text-align: center;"><nobr>
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
           <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
+          <!--<td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
@@ -240,12 +247,12 @@
           <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
 
           <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.collection}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
         </template>
       </data-grid>
     </criteria-paged>
@@ -291,11 +298,11 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_userinfo_code":"用户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"用户名称",
-          "f_user_state":"用户状态","f_user_phone":"用户电话","f_address":"用户地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
+        getfield:{"f_orgname":"组织机构","f_residential_area":"小区名称","f_user_name":"用户名称","f_userinfo_code":"用户编号","f_address":"详细地址",
+          "f_meternumber":"表号", "f_user_state":"用户状态","f_user_phone":"用户电话","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-          "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额",
-          "diffday":"未购气总天数"},
+          "delivery_date":"最后购气日期","diffday":"未购气总天数","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额"
+          },
         model: new PagedList('rs/sql/inspectListNew', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0,collection: 0}),
         rows: null,
         //orgid:'',

package/src/filiale/wenxi/GasStatistics.vue

@@ -274,6 +274,9 @@
           </tr>
         </table>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
     </div>
   </div>
 </template>

package/src/filiale/wenxi/NewGasStatistics.vue

@@ -274,6 +274,9 @@
           </tr>
         </table>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
     </div>
   </div>
 </template>
@@ -402,7 +405,6 @@
         this.rowdata=obj
         this.show=true
       },
-
       search (args) {
         args.condition =  `${args.condition}`+this.orgcondition
         this.condition = args.condition

package/src/filiale/wenxi/WebHandQuery.vue

@@ -18,7 +18,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber @change="$parent.$parent.inputChange"
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
@@ -238,6 +238,9 @@
           </data-grid>
         </criteria-paged>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
     </div>
   </div>
 </template>
@@ -281,7 +284,7 @@
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_webmeterHandQuery', 50,{
           startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate',f_userinfo_code: 'this.model.f_userinfo_code'
+          endDate: 'this.model.endDate'
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }
@@ -298,15 +301,15 @@
       // this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      inputChange () {
-        if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
-          this.$refs.paged.$refs.criteria.model.startDate = ''
-          this.$refs.paged.$refs.criteria.model.endDate = ''
-        }else{
-          this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-          this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
-        }
-      },
+      // inputChange () {
+      //   if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
+      //     this.$refs.paged.$refs.criteria.model.startDate = ''
+      //     this.$refs.paged.$refs.criteria.model.endDate = ''
+      //   }else{
+      //     this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+      //     this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+      //   }
+      // },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -401,8 +404,7 @@
         return {
           condition: this.condition,
           startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
-          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`,
-          f_userinfo_code:`${this.$refs.paged.$refs.criteria.model.f_userinfo_code}`
+          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`
         }
       },
       getstart(){

package/src/filiale/xinkang/GasStatistics.vue

@@ -189,11 +189,11 @@
                 <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>
-                <th><nobr>三阶气价</nobr></th>
+<!--                <th><nobr>一阶气价</nobr></th>-->
+<!--                <th><nobr>二阶气价</nobr></th>-->
+<!--                <th><nobr>三阶气价</nobr></th>-->
 
                 <th><nobr>用气性质</nobr></th>
                 <th><nobr>期初余额</nobr></th>
@@ -221,11 +221,11 @@
                 <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
+<!--                <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>-->
 
-                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
+<!--                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>-->
+<!--                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>-->
+<!--                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>-->
 
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
 
@@ -261,24 +261,24 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               期间充值金额:&emsp;{{sumsmodel.f_collection}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
-            </td>
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}-->
+<!--            </td>-->
           </tr>
         </table>
       </div>
@@ -329,13 +329,7 @@
         },{
           f_oughtamount: 0,
           f_oughtfee: 0,
-          f_collection:0,
-          f_stairamount1:0,
-          f_stair1fee:0,
-          f_stairamount2:0,
-          f_stair2fee:0,
-          f_stairamount3:0,
-          f_stair3fee:0
+          f_collection:0
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }

package/src/main.js

@@ -1,66 +1,72 @@
-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", //地图工具条0
-    "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 FilialeSaleManage from './filiale/qianneng/sale'
+import FilialeWebmeterManage from './filiale/qianneng/webmeterManage'
+import FilialeReportManage from './filiale/qianneng/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()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+FilialeSaleManage()
+FilialeWebmeterManage()
+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 }
+})
+