优化调整

src/components/page/GlobalHeader.vue

@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 湖北汉江之星科技有限公司 合作伙伴平台</span>
+      <span v-if="device === 'desktop'">欢迎进入 {{userInfo().platformName}} 合作伙伴平台</span>
       <span v-else>Jeecg-Boot</span>
 
       <user-menu :theme="theme"/>
@@ -53,6 +53,7 @@
   import SMenu from '../menu/'
   import Logo from '../tools/Logo'
   import { mixin } from '@/utils/mixin.js'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'GlobalHeader',
@@ -125,6 +126,7 @@
       //update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
     },
     methods: {
+      ...mapGetters(["userInfo"]),
       handleScroll() {
         if (this.autoHideHeader) {
           let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop

src/views/benefiting/ReconciliationDetails.vue

@@ -38,7 +38,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input v-model="model.payWay" placeholder="支付方式" />
+                <a-input v-model="model.payWayName" placeholder="支付方式" />
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -169,6 +169,13 @@ export default {
       } else if (this.model.reconciliationStatus == 4) {
         this.model.reconciliationStatusName = '对账驳回'
       }
+      if (this.model.payWay == 'payPropertyFee') {
+        this.model.payWayName = '抵扣物业费'
+      } else if (this.model.payWay == 'refundOrder') {
+        this.model.payWayName = '申请退款'
+      } else if (this.model.payWay == 'scanQrCodePay') {
+        this.model.payWayName = '扫码支付'
+      } 
     },
     toReturn() {
       this.closeCurrent()

src/views/benefiting/ReconciliationList.vue

@@ -45,6 +45,11 @@
       <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
         :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
         @change="handleTableChange">
+        <span slot="payWay" slot-scope="text, record">
+          <template v-if="record.payWay === 'payPropertyFee'">抵扣物业费</template>
+          <template v-else-if="record.payWay === 'refundOrder'">申请退款</template>
+          <template v-else-if="record.payWay === 'scanQrCodePay'">扫码支付</template>
+        </span>
         <span slot="orderSource" slot-scope="text, record">
           <template v-if="record.orderSource === 'miniapp'">小程序</template>
         </span>
@@ -128,6 +133,7 @@ const columns = [
   {
     title: '支付方式',
     dataIndex: 'payWay',
+    scopedSlots: { customRender: 'payWay' },
     key: 'payWay',
     align: 'center',
   },

src/views/dashboard/IndexChart.vue

@@ -50,7 +50,7 @@
         <div class="item" v-for="(item, index) in waitAuditList" :key="index">
           <p>商铺名称：{{ item.shopName }}</p>
           <p>所属小区：{{ item.communityName }}</p>
-          <p>关联房屋：{{ item.shopInfo.buildName + item.shopInfo.roomName }}</p>
+          <p>关联房屋：{{ item.shopInfo.buildingName + item.shopInfo.roomName }}</p>
           <p>添加时间：{{ item.createTime }}</p>
           <a-button type="primary" size="small" @click="toOperation(item)">审核</a-button>
         </div>

src/views/shops/ShopsDetails.vue

@@ -248,6 +248,8 @@ export default {
     //选择小区
     chooseCommunity() {
       this.$refs.selectCommunityModal.visible = true
+      this.model.shopName = ''
+      this.model.shopCode = ''
     },
     selectCommunityOK(data) {
       this.model.communityName = data.communityName

src/views/shops/modules/SelectShopsModal.vue

 <template>
   <div>
-    <a-modal centered :title="title" :width="1000" :visible="visible" @ok="selectShopsOK" @cancel="handleCancel"
-      cancelText="关闭">
+    <a-modal centered :title="title" :width="1000" :visible="visible" @cancel="handleCancel"
+      cancelText="关闭" :footer="null">
 
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
@@ -26,10 +26,11 @@
       <!-- table区域-begin -->
       <div>
         <a-table size="small" bordered rowKey="id" :columns="columns" :dataSource="dataSource1"
-          :pagination="ipagination" :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys,onSelect:onSelect,onChange: onSelectChange,type:'radio'}"
-          @change="handleTableChange">
-
+          :pagination="ipagination" :loading="loading" @change="handleTableChange">
+          <span slot="action" slot-scope="text, record">
+            <a href="javascript:;" @click="theSelected(record)" v-if="record.bindPartners === 'Y'">选择</a>
+            <a href="javascript:;" v-else disabled>已绑定</a>
+          </span>
         </a-table>
       </div>
       <!-- table区域-end -->
@@ -74,24 +75,14 @@ export default {
             return text.creditCode
           },
         },
-        // {
-        //   title: '联系人',
-        //   dataIndex: 'shopInfo',
-        //   key: 'shopInfo',
-        //   align: 'center',
-        //   customRender: function (text) {
-        //     return text.contactName
-        //   },
-        // },
-        // {
-        //   title: '电话',
-        //   dataIndex: 'shopInfo',
-        //   key: 'shopInfo',
-        //   align: 'center',
-        //   customRender: function (text) {
-        //     return text.contactPhone
-        //   },
-        // },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' },
+          align: 'center',
+          fixed: 'right',
+          width: 150,
+        },
       ],
 
       //数据集
@@ -133,6 +124,8 @@ export default {
     show(communityCode) {
       this.communityCode = communityCode
       this.visible = true
+      this.loading = true
+      this.dataSource1 = []
     },
     searchQuery() {
       this.loadData(1)
@@ -144,10 +137,14 @@ export default {
     handleCancel() {
       this.visible = false
     },
-    selectShopsOK() {
-      this.$emit('selectFinished', this.selectedShops)
+    theSelected(record){
+      this.$emit('selectFinished', record)
       this.visible = false
     },
+    // selectShopsOK() {
+    //   this.$emit('selectFinished', this.selectedShops)
+    //   this.visible = false
+    // },
     loadData(arg) {
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
@@ -155,11 +152,14 @@ export default {
       }
       var params = this.getQueryParams() //查询条件
       params.communityCode = this.communityCode
+      params.auditStatus = 'auditPass'
+      params.shopStatus = 'normal'
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           this.dataSource1 = res.result.records
           this.ipagination.total = res.result.total
         }
+        this.loading = false
       })
     },
     getQueryParams() {
@@ -168,15 +168,15 @@ export default {
       param.pageSize = this.ipagination.pageSize
       return filterObj(param)
     },
-    onSelect(record, selected) {
-      if (selected === true) {
-        this.selectedShops = record
-      }
-    },
-    onSelectChange(selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectionRows = selectedRows
-    },
+    // onSelect(record, selected) {
+    //   if (selected === true) {
+    //     this.selectedShops = record
+    //   }
+    // },
+    // onSelectChange(selectedRowKeys, selectedRows) {
+    //   this.selectedRowKeys = selectedRowKeys
+    //   this.selectionRows = selectedRows
+    // },
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       console.log(sorter)