From 7152309db0bfc50a0e38f0b558ab95577024c761 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 14 Sep 2021 18:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=8F=90=E4=BA=A4=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue                       | 5 ++++-
 .../memberManage/modules/MemberProjectModal.vue             | 6 ++++++
 .../memberManage/modules/SafeguardMemberModal.vue           | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 68a7d66..10bb928 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -44,7 +44,7 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>来款企业：</label>
-          <span>{{basicInfo.companyName}}<j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人：</label>
@@ -126,6 +126,9 @@
         <span slot="action" class="action-span-cell">
           <a @click="lookLogistics()">查看物流</a>
         </span>
+<!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
+<!--            {{ record.sendDate }}-->
+<!--          </p>-->
         </a-table>
       </div>
     </section>
diff --git a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
index 5946d3b..6eb3f1a 100644
--- a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
+++ b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
@@ -75,6 +75,10 @@
         </a-row>
       </a-form>
     </a-spin>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-preventclick>确定</a-button>
+    </template>
   </j-modal>
 </template>
 
@@ -159,6 +163,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           let httpurl = ''
           let method = ''
           if (!this.model.id) {
@@ -174,6 +179,7 @@ export default {
             if (res.success) {
               that.$message.success(res.message)
               that.$emit('ok')
+              that.confirmLoading = false
               that.close()
             } else {
               that.$message.warning(res.message)
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 2a95eb8..fbff875 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -373,6 +373,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           let httpurl = ''
           if (!this.model.id) {
             httpurl += this.url.add
@@ -387,6 +388,7 @@ export default {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
+                that.confirmLoading = false
                 that.close()
               } else {
                 that.$message.warning(res.message)