Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/sale/peerManagement.vue

@@ -31,7 +31,6 @@
         </q-tabs>
         <div>
           <q-btn color="accent" size="sm" class="q-mr-md" icon="add" @click="EditCustom(null)" label="新增客户" />
-          <q-btn color="accent" size="sm" class="q-mr-md" icon="add" @click="EditRight(null)" label="右侧" />
         </div>
       </div>
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
@@ -42,16 +41,17 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props" style="width:200px;">
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="EditCustom(props.row)" />
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批" @click="AuditCustomer(props.row)" />
- 
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+              @click="EditCustom(props.row)" />
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批"
+              @click="AuditCustomer(props.row)" />
           </q-td>
         </template>
       </q-table>
       <perCustomer-form v-if="isShowCustomForm" :customerObj="customerObj" @close="closeCustomForm"
         @success="refreshQuestion">
       </perCustomer-form>
-      <customRight-form v-if="isShowRightForm" @close="closeRightForm"></customRight-form>
+      <customRight-form v-if="isShowRightForm" :customerObj="customerObj" @close="closeCustomForm"></customRight-form>
     </div>
   </div>
 </template>
@@ -137,10 +137,11 @@
       //关闭弹窗
       closeCustomForm() {
         this.isShowCustomForm = false;
+        this.isShowRightForm = false;
       },
       //新增或者修改
       EditCustom(obj) {
-        console.log("Edit",obj)
+
         if (obj) {
           this.customerObj = obj
         } else {
@@ -149,20 +150,17 @@
         this.isShowCustomForm = true
       },
       //客户审核
-      AuditCustomer(obj)
-      {
-
+      AuditCustomer(obj) {
+        if (obj) {
+          this.customerObj = obj
+        } else {
+          this.customerObj = null
+        }
+        this.isShowRightForm = true
       },
       refreshQuestion() {
         this.getList() 
       },
-      EditRight(obj) {
-        this.isShowRightForm = true;
-      },
-      //关闭弹窗
-      closeRightForm() {
-        this.isShowRightForm = false;
-      },
       //获取分页数据
       getList() {
         GetCustomerPage(this.msg).then(res => {