From 9a8cc629b2f1a5f16525e9b1b5dea00ad8afe8e4 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 7 Mar 2024 10:53:34 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         |  2 +-
 .../SafeguardStardsMemberList.vue             |  4 +-
 .../modules/SafeguardStardsMemberModal.vue    | 52 +++++++++----------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index ea653e5..1296a16 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -92,7 +92,7 @@
       <a-row :gutter="24">
         <a-col :span="12" class="detail-item">
           <label>会员编号：</label>
-          <span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="basicInfo.memberNo" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 7b0091a..b0d85fc 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -54,7 +54,7 @@
             <a-form-item label="预估到账日期">
               <a-range-picker
                 style="width: 100%"
-                v-model="queryParam.estimatedArrivalDate"
+                v-model="queryParam.estimatedArrivalDateArr"
                 format="YYYY-MM-DD"
                 :placeholder="['开始时间', '结束时间']"
                 @change="onDateChange"
@@ -291,7 +291,7 @@ export default {
         {
           title: '会员联系人',
           align: 'center',
-          dataIndex: 'liaisonMan',
+          dataIndex: 'liaisonManId_dictText',
           scopedSlots: { customRender: 'text' },
         },
         {
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
index f73b3e1..bf7fca4 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue
@@ -430,14 +430,14 @@ export default {
           companyName: record.companyName
         }
         this.selectedCompany = Object.assign({}, this.model.companyId)
-        this.selectPerson = {
-          id: this.model.companyContactTemporaryId,
-          name: this.model.companyContactName
-        }
-        this.selectMailPerson = {
-          id: this.model.postContactTemporaryId,
-          name: this.model.postContactName
-        }
+        // this.selectPerson = {
+        //   id: this.model.liaisonManId,
+        //   name: this.model.liaisonManId_dictText
+        // }
+        // this.selectMailPerson = {
+        //   id: this.model.postContactId,
+        //   name: this.model.postContactId_dictText
+        // }
         // 修改来款方式 控制dom对应显示隐藏
         this.incomePaysType = record.paymentMethod
       }
@@ -449,6 +449,7 @@ export default {
             'companyId',
             'liaisonManId',
             'postContactId',
+            'memberNature',
             'amountReceivable',
             'taxRate',
             'tax',
@@ -456,7 +457,7 @@ export default {
             'estimatedArrivalDate',
             'invoiceRequirements',
             'paymentMethod',
-            'contractNum',
+            'contractNo',
             'chargeNoticeNo',
             'chargeNoticeId',
             'remark'
@@ -554,21 +555,20 @@ export default {
           const formData = Object.assign(this.model, values)
           console.log(formData)
           formData.projectId = this.projectId
+          formData.companyName = formData.companyId.companyName
           formData.companyId = formData.companyId.id
-          httpAction(httpurl, formData, 'post')
-            .then((res) => {
-              if (res.success) {
-                that.$message.success(res.message)
-                that.$emit('ok')
-                that.confirmLoading = false
-                that.close()
-              } else {
-                that.$message.warning(res.message)
-              }
-            })
-            .finally(() => {
+          httpAction(httpurl, formData, 'post').then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
               that.confirmLoading = false
-            })
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
         }
       })
     },
@@ -587,7 +587,7 @@ export default {
         return
       }
       // 清除合同号
-      this.form.setFieldsValue({ contractNum: undefined })
+      this.form.setFieldsValue({ contractNo: undefined })
       this.selectedCompany = Object.assign({}, val)
 
       // 切换企业清空两个联系人
@@ -618,9 +618,5 @@ export default {
 </script>
 
 <style scoped>
-.yuan {
-  position: absolute;
-  right: -20px;
-  top: -10px;
-}
+
 </style>
\ No newline at end of file