From 6051f667e3e10edfebc22f41395ef3f07cce63b7 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 16 Jan 2024 18:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91-=20=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E7=BB=84=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProgressBar.vue                              | 6 +++---
 src/components/company/CompanySelect.vue                    | 3 ++-
 .../draftingGroup/modules/DraftingGroupMemberUnitModule.vue | 1 -
 src/views/incomePayments/meetManage/AddOrDetailMeet.vue     | 2 +-
 src/views/incomePayments/meetManage/Attendance.vue          | 3 ++-
 .../meetManage/modules/UploadMeetFileModal.vue              | 6 +++---
 .../modules/WorkingGroupMemberUnitModule.vue                | 1 -
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/ProgressBar.vue b/src/components/ProgressBar.vue
index 973a550..95cdfda 100644
--- a/src/components/ProgressBar.vue
+++ b/src/components/ProgressBar.vue
@@ -5,19 +5,19 @@
     <div class="progress" v-if="(data.allPayment + data.partPayment + data.notPayment) !== 0">
       <!--    将全部付款和部分付款放入一个div中-->
       <div class="full-and-partial"
-           :style="{width: (data.allPayment + data.partPayment)/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}">
+           :style="{width: (data.allPayment + data.partPayment)/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%', minWidth: 'fit-content'}">
         <!--        全部付款-->
         <div :style="{width: data.allPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
              class="progress-item pay-in-full" v-if="data.allPayment !== 0">
           {{ data.allPayment }}
         </div>
         <!--        部分付款-->
-        <div :style="{width: data.partPayment/(data.allPayment + data.partPayment) * 100 + '%'}"
+        <div :style="{width: data.partPayment/(data.allPayment + data.partPayment) * 100 + '%', minWidth: 'fit-content'}"
              class="progress-item partial-payment" v-if="data.partPayment !== 0">
           {{ data.partPayment }}
         </div>
       </div>
-      <div :style="{width: data.notPayment/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%'}"
+      <div :style="{width: data.notPayment/(data.allPayment + data.partPayment + data.notPayment) * 100 + '%', minWidth: 'fit-content'}"
            class="progress-item non-payment" v-if="data.notPayment !== 0">
         {{ data.notPayment }}
       </div>
diff --git a/src/components/company/CompanySelect.vue b/src/components/company/CompanySelect.vue
index 2a10ec8..a36764a 100644
--- a/src/components/company/CompanySelect.vue
+++ b/src/components/company/CompanySelect.vue
@@ -77,6 +77,7 @@ export default {
       this.$refs.businessSelect.visible = true
       if (!this.isMultiple) {
         this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
+        this.$refs.businessSelect.selectedCompany = this.value
       } else {
         // 很重要 内部的删除像没有作用一样
         if(this.value.id) {
@@ -93,7 +94,7 @@ export default {
      * @param value
      */
     handleOk(value) {
-      console.log('--------value---------', 'value')
+      console.log('--------value---------', value)
       let company = {id: undefined, companyName: undefined}
       // 多选的时候 全部放在一起，以逗号分隔
       if (this.isMultiple) {
diff --git a/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue b/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
index 9d8f7b9..41821cb 100644
--- a/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
@@ -45,7 +45,6 @@
             <a-col :xl="12" :sm="24">
               <a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-contacts :selected-company="selectedCompany"
-                                 :init-contacts="model.payDraftingGroupSubItemContactsList[index]"
                                  :placeholder="`请选择企业联系人${index + 1}`"
                                  v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
                                  :maxLength='50'
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index c57e9e9..b5c0477 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -135,7 +135,7 @@
 <!--                  @change="changeConvoke"-->
 <!--                  v-decorator="['convokeLocale',validatorRules.convokeLocale]"-->
 <!--                ></j-area-linkage>-->
-                <a-input  placeholder="请输入召开地点/腾讯会议" v-decorator="['venue',validatorRules.venue]"></a-input>
+                <a-input  placeholder="请输入召开地点/腾讯会议" :maxLength='50' v-decorator="['venue',validatorRules.venue]"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xxl='8' :xl="12" :sm="24">
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index ffc15a6..afe0acc 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -249,7 +249,8 @@
                   dictCode="invoice_project"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+            <!-- 国际研讨会 且为 WASIC时显示 -->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero" v-if="currentMeetingInfo.meetingType === '3' && currentMeetingInfo.isWasic">
               <a-form-item label="会议名称">
                 <j-multi-select-tag
                   v-model="queryParam.choiceTopic_regexp"
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 808ef49..4996b27 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -412,7 +412,7 @@ export default {
       }
       return true
     },
-    handleChange(info) {
+    async handleChange(info) {
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList)
       }
@@ -436,8 +436,8 @@ export default {
           } else {
             this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
           }
-
-          this.fileList.push(info.file.response.result)
+          let newFile = await this.getFileInfoArr(info.file.response.result.id)
+          this.fileList.push(newFile[0])
         } else {
           this.messageLineFeed('文件导入错误', info.file.response.message)
         }
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 6d0f271..862630d 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -45,7 +45,6 @@
             <a-col :xl="12" :sm="24">
               <a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-contacts :selected-company="selectedCompany"
-                                 :init-contacts="model.payWorkingGroupSubItemContactsList[index]"
                                  :placeholder="`请选择企业联系人${index + 1}`"
                                  v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
                                  :maxLength='50'