Merge branch 'feature/12月迭代' into dev

src/views/recharge/account-detail.vue

@@ -35,7 +35,7 @@
       </div>
     </div>
     <add-depart :visible.sync="addDepartDialog.visible" @saved="getTableData" />
-    <view-store :visible.sync="viewStoreDialog.visible" :depart-id="viewStoreDialog.departId" />
+    <view-store :visible.sync="viewStoreDialog.visible" :depart-id="viewStoreDialog.departId" :depart-list="viewStoreDialog.departList" />
   </div>
 </template>
 
@@ -69,7 +69,8 @@ export default {
       },
       viewStoreDialog: {
         visible: false,
-        departId: ''
+        departId: '',
+        departList: []
       },
       statusList: [
         { label: '启用', value: 1 },
@@ -191,6 +192,7 @@ export default {
       }
     },
     showStore(row) {
+      this.viewStoreDialog.departList = row.accountEnterpriseDpartmentList;
       this.viewStoreDialog.departId = row.departmemtId;
       this.viewStoreDialog.visible = true;
     },

src/views/recharge/components/view-store.vue

@@ -25,7 +25,8 @@ export default {
   components: {},
   props: {
     visible: Boolean,
-    departId: String
+    departId: String,
+    departList: Array
   },
   data() {
     return {
@@ -54,7 +55,8 @@ export default {
         search: this.search,
         pageSize: this.tableData.pageSize,
         pageNum: this.tableData.currentPage,
-        departId: this.departId
+        departId: this.departId,
+        accountEnterpriseDpartmentList: JSON.stringify(this.departList || [])
       };
       const { result } = await getStoreList(para);
       this.tableData.data = result.result || [];