manage-client 3.2.133 → 3.2.134

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -1,12 +1,12 @@
 <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>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
             <div class="row">
               <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户   11编号</label>
+                <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 like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
@@ -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>
@@ -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,7 +233,7 @@ 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_jval': '最后上报余额','f_balance_amount': '账户余额',
         'f_state': '分析状态', 'exception_val': '结算异常金额'
       },
       showdetail: false,
@@ -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: '上报大于余额'}, {
+      this.states = [{label: '全部', value: ''}, {label: '上报金额大于余额', value: '上报金额大于余额'}, {
         label: '上报金额小于余额',
-        value: '余额大于上报'
-      }, {label: '上报金额与余额相等', value: '上报与余额相等'}]
+        value: '上报金额小于余额'
+      }, {label: '上报金额与余额相等', value: '上报金额与余额相等'}]
     },
     search(args) {
       this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`

package/src/main.js

@@ -43,13 +43,12 @@ all()
 // sale()
 ldap()
 system(false)
-// 新打包写法
-Vue.use(saleManage, {filiale: 'macheng'})
-Vue.use(webmeterManage, {filiale: 'macheng'})
-Vue.use(reportManage, {filiale: 'macheng'})
-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')