manage-client 3.2.132 → 3.2.135

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -27,12 +27,12 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group ">
+                <div class="col-sm-2 form-group" v-show="false">
                   <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">
+                <div class="col-sm-2 form-group" v-show="false">
                   <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="客户名称">
@@ -60,13 +60,13 @@
                 </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">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group" v-show="false">
                   <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">
+                <div class="col-sm-2 form-group" v-show="false">
                   <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='客户地址'>
@@ -145,7 +145,7 @@
                             condition="f_meter_type = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
+                <div class="col-sm-2 form-group" v-show="false">
                   <label class="font_normal_body">是否免费</label>
                   <v-select :value.sync="model.f_changemeter_fee"
                             v-model="model.f_changemeter_fee"
@@ -153,7 +153,7 @@
                             condition="f_changemeter_fee {}"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
+                <div class="col-sm-2 form-group" v-show="false">
                   <label class="font_normal_body">付款方式</label>
                   <v-select id="f_payment"
                             v-model="model.f_payment"
@@ -321,8 +321,11 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              换表费合计:&emsp;{{sumsmodel.f_changemeter_fee}}
+              暂无汇总信息
             </td>
+            <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+              <!--换表费合计:&emsp;{{sumsmodel.f_changemeter_fee}}-->
+            <!--</td>-->
           </tr>
         </table>
         <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
@@ -393,7 +396,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -406,7 +409,7 @@
           user:[],
         },
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
         },
         show:false,
         rowdata:{},
@@ -423,7 +426,9 @@
           {label: '全部', value: ''},
           {label: '销售', value: '> 0'},
           {label: '免费', value: '= 0'}
-        ]
+        ],
+        showCom:['company','department','operator'],
+        orderitem:'f_operate_date desc'
       }
 
     },
@@ -578,7 +583,10 @@
       //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
       // },
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
+        }
       },
       getfield() {
         return exportConfig.changemeterConfig

package/src/filiale/WEINAN/sale.js

@@ -18,16 +18,25 @@ let specialComp = {
   'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
   // 换表查询
   'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-// 上报数据查询
+  // 上报数据查询
   'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
-
   // 上报统计分析--抄表分析
   'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
   // 用气分析明细查询
   'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
   // 用气分析图表分析
-  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)}
-
+  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
+  // 启用查询
+  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
+  // 停用查询
+  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 销户查询
+  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
+  // 汇总查询
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query':(resolve) => {require(['./NewAccountQuery'], resolve)
+  }
 }
 exports.specialComp = specialComp
 

package/src/filiale/macheng/HandplanQuery.vue

@@ -338,6 +338,9 @@
                 <th>
                   <nobr>录入日期</nobr>
                 </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
                 <th>
                   <nobr>气价名称</nobr>
                 </th>
@@ -471,6 +474,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_input_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_name}}</nobr>
               </td>

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row" v-show="!showdetail">
+  <div class="flex-row" v-if="!isShowDetailInfo" v-show="!showdetail">
     <div id='app1' class="basic-main">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
@@ -143,10 +143,10 @@
                 <nobr>组织机构</nobr>
               </th>
               <th style="text-align:center">
-                <nobr>账户余额</nobr>
+                <nobr>最后上报金额</nobr>
               </th>
               <th style="text-align:center">
-                <nobr>最后上报金额</nobr>
+                <nobr>账户余额</nobr>
               </th>
               <th style="text-align:center">
                 <nobr>分析状态</nobr>
@@ -158,7 +158,7 @@
           </template>
           <template partial='body'>
             <td style="text-align: center;">
-              <nobr>{{ row.f_userinfo_code }}</nobr>
+              <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span>
             </td>
             <td style="text-align:center">
               <nobr>{{ row.f_user_name }}</nobr>
@@ -181,10 +181,10 @@
               <nobr>{{ row.f_orgname }}</nobr>
             </td>
             <td style="text-align:center">
-              <nobr>{{ row.f_balance_amount }}</nobr>
+              <nobr>{{ row.f_jval }}</nobr>
             </td>
             <td style="text-align:center">
-              <nobr>{{ row.f_jval }}</nobr>
+              <nobr>{{ row.f_balance_amount }}</nobr>
             </td>
             <td style="text-align:center">
               <nobr>{{ row.f_state }}</nobr>
@@ -209,6 +209,9 @@
       </table>
     </div>
   </div>
+  <div v-if="isShowDetailInfo">
+    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
 </template>
 
 <script>
@@ -230,8 +233,8 @@ export default {
         'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
         'f_meternumber': '表号',
         'f_meter_brand': '气表品牌', 'f_meter_style': '气表型号', 'f_orgname': '组织机构',
-        'f_balance_amount': '表上余额', 'f_jval': '表上余额',
-        'f_state': '状态', 'exception_val': '结算异常金额'
+        'f_jval': '最后上报余额','f_balance_amount': '账户余额',
+        'f_state': '分析状态', 'exception_val': '结算异常金额'
       },
       showdetail: false,
       rowdata: {},
@@ -239,6 +242,8 @@ export default {
       endDate: '',
       criteriaShow: false,
       outlets: [],
+      isShowDetailInfo: false,
+      rowData: {},
       gasproperties: [{label: '全部', value: ''}],
       operator: [],
       sumsmodel: {},
@@ -257,6 +262,22 @@ export default {
   },
   methods: {
 
+    /**
+     * 退出用户详细信息页面
+     */
+    cancel () {
+      this.isShowDetailInfo = false
+    },
+    /**
+     * 展示用户详细信息
+     * @param obj 传递的row
+     */
+    dealmsg (obj) {
+      console.log('==================>', obj)
+      debugger
+      this.isShowDetailInfo = true
+      this.rowData = obj
+    },
     userTypeChange() {
       this.gasproperties = [{label: '全部', value: ''}]
       if (this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -296,10 +317,10 @@ export default {
 
       })
       this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      this.states = [{label: '全部', value: ''}, {label: '上报大于余额', value: '上报大于余额'}, {
-        label: '余额大于上报',
-        value: '余额大于上报'
-      }, {label: '上报与余额相等', value: '上报与余额相等'}]
+      this.states = [{label: '全部', value: ''}, {label: '上报金额大于余额', value: '上报金额大于余额'}, {
+        label: '上报金额小于余额',
+        value: '上报金额小于余额'
+      }, {label: '上报金额与余额相等', value: '上报金额与余额相等'}]
     },
     search(args) {
       this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`

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

@@ -38,7 +38,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户手机', 'f_meternumber': '表号','ym_data': '数据年月',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount1': '用气量', 'f_oughtfee': '用气金额', 'f_debt_money': '预存扣费','f_balance': '上期余额','f_curbalance': '本期余额',
     'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
-    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量','f_gasproperties': '用气性质',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月'

package/src/filiale/macheng/webmeterManage.js

@@ -0,0 +1,9 @@
+// 分公司特殊组件页面注册
+let specialComp = {
+  'webmeter-settlement-analysis': (resolve) => { require(['./WebmeterSettlementAnalysis'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tongchuan/MeterQuery.vue

@@ -98,7 +98,7 @@
                               condition="f_user_type = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2 form-group" v-if="false">
                     <label for="f_usetype" class="font_normal_body">二次挂表</label>
                     <v-select :value.sync="model.issecondtype" v-model="model.issecondtype"
                               condition="f_usetype {}"

package/src/main.js

@@ -1,6 +1,7 @@
 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'
@@ -15,7 +16,7 @@ import AMap from 'vue-amap'
 Vue.config.silent = true
 // Vue.mmType = 'AES'
 
-Vue.use(AMap)
+Vue.use(AMap);
 
 // 初始化vue-amap
 AMap.initAMapApiLoader({
@@ -23,18 +24,18 @@ AMap.initAMapApiLoader({
   key: '3cec9ae8e2349207f7ac29279e3f4abe',
   // 插件集合 （插件按需引入）
   plugin: [
-    'AMap.Autocomplete', // 输入提示插件
-    'AMap.PlaceSearch', // POI搜索插件
-    'AMap.Scale', // 右下角缩略图插件 比例尺
-    'AMap.OverView', // 地图鹰眼插件
-    'AMap.ToolBar', // 地图工具条0
-    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    'AMap.PolyEditor', // 编辑 折线多，边形
-    'AMap.CircleEditor', // 圆形编辑器插件
-    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
   ],
-  uiVersion: '1.0'
-})
+  uiVersion: "1.0"
+});
 /** **************************通用组件******************************/
 
 Vue.prototype.$echarts = echarts
@@ -42,19 +43,18 @@ all()
 // sale()
 ldap()
 system(false)
-// 新打包写法
-Vue.use(saleManage, {filiale: null})
-Vue.use(webmeterManage, {filiale: null})
-Vue.use(reportManage, {filiale: null})
-Vue.use(newmanage, {filiale: null})
-Vue.use(ManageHome, {filiale: null})
 
+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')