From 627a6ef454a413341d065a8c1aeae2eaf11b3c80 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 10:21:13 +0800
Subject: [PATCH 01/11] =?UTF-8?q?[bug]=20=E6=94=B6=E5=85=A5=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SelectMeetingProjectModule.vue                | 8 ++++----
 src/views/mailManagement/BillMail.vue                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
index 877a1c2..edd6e34 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
@@ -142,14 +142,14 @@ export default {
           title: '会议名称',
           align: 'center',
           dataIndex: 'meetingName',
-          width: 160,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         },
         {
           title: '参会单位',
           align: 'center',
           dataIndex: 'companyName',
-          width: 260,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         },
         // 合同里来款用途固定为会务费
@@ -166,7 +166,7 @@ export default {
           title: '参会人员',
           align: 'center',
           dataIndex: 'companyContactName',
-          width: 260,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -194,7 +194,7 @@ export default {
           title: '负责人',
           align: 'center',
           dataIndex: 'directorName',
-          width: 200,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         },
         {
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index 30a7238..fb036c0 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -87,7 +87,7 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === 1 ? false : true">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === 2">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record)" v-if="record.postStatus === 0" v-has="'billMail:mail'">邮寄</a>

From f8fdade998d503e5629794e61ffd6980dde1472e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 11:20:39 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=20=E6=B8=85=E9=99=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=20=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/company/SelectContacts.vue     |  3 ++-
 .../incomePayments/meetManage/Attendance.vue  |  3 ++-
 .../meetManage/OtherMeetingForm.vue           |  8 +++++---
 src/views/signUp/SignUpPage.vue               | 20 ++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index 369f319..4cdaaf1 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -160,7 +160,8 @@ export default {
         this.$refs.contactForm.disableSubmit = false
         return
       }
-      this.$message.warn('请先选择来款企业再为该企业新建联系人')
+     // 调用无权限的提示语修改
+      this.$message.warn('请先选择企业再为该企业新建联系人')
     },
     addContactsOk(id) {
       this.getContactsList().then(() => {
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index adeba89..6cc4e64 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -95,7 +95,8 @@
           <label>签到二维码：</label><img class="qr-code" :src="signInQRCode" alt="签到二维码"/>
           <!--          <i class="copy primary-color"  @click="copy(signUpHerfUrl)">复制</i>-->
         </a-col>
-        <a-col :xxl="8" :xl="12" :sm="24" style="display:flex;">
+<!--        会议费用为0 不显示 -->
+        <a-col :xxl="8" :xl="12" :sm="24" style="display:flex;" v-if="currentMeetingInfo.meetingCosts !== '0.00' ">
           <label>收款二维码：</label>
           <j-image-upload :return-id="true" v-if="currentMeetingInfo.paymentQrCode"
                           v-model="currentMeetingInfo.paymentQrCode" disabled></j-image-upload>
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index e8eb932..b1b57a9 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -91,8 +91,8 @@
         </a-col>
         <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
         <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool ">
-          <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input placeholder="请输入地址"
+          <a-form-item label="邮寄地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入邮寄地址"
                      :maxLength='50'
                      :disabled="isEditBool"
                      v-decorator="[ 'postContactAddress']"></a-input>
@@ -233,7 +233,6 @@ export default {
     *  清空邮寄联系人 地址 邮编
     * */
     clearFormItem(){
-      // 选择企业清空 姓名 手机号
       this.form.resetFields(['postContactId','postContactAddress','postCode'])
     },
 
@@ -250,6 +249,9 @@ export default {
     * 选择联系人之后地址邮编复制
     * */
     changePost(val){
+      if(val === undefined){
+        this.clearFormItem()
+      }
       getContactsById({id:val}).then(res => {
         if(res.success){
           this.setAddressVal(res.result)
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index e0fe879..b7b8fcf 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -74,7 +74,7 @@
                             v-if="currentMeetingInfo.meetingFiles"></preview-file>
             </a-col>
           </a-row>
-          <a-row type="flex">
+          <a-row type="flex" v-if="currentMeetingInfo.meetingCosts !== '0.00' ">
             <label>收费二维码：</label>
             <j-image-upload :return-id="true" v-if="currentMeetingInfo.paymentQrCode"
                             v-model="currentMeetingInfo.paymentQrCode" disabled></j-image-upload>
@@ -223,7 +223,7 @@
 </template>
 
 <script>
-import {getMeetInfoById,validateStandard} from '@api/incomeMeetingApi'
+import {getMeetInfoById, validateStandard} from '@api/incomeMeetingApi'
 import SelectContacts from '@comp/company/SelectContacts'
 import OtherMeetingForm from '@views/incomePayments/meetManage/OtherMeetingForm'
 import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipForm'
@@ -332,7 +332,7 @@ export default {
       // 国际研讨会身份的控制
       identityBool: false,
       // 是否是标协成员
-      isStandardBool:false,
+      isStandardBool: false,
       // url是否有id字段  默认没有
       urlHaveIdBool: false,
       url: {
@@ -531,26 +531,32 @@ export default {
     * 选择参会企业
     * */
     changeCompany(value) {
-
       this.selectedCompany = value
       // 通过企业名称判断当前参会人
-      if(this.currentMeetingInfo.meetingType +'' === '2' ){
+      if (this.currentMeetingInfo.meetingType + '' === '2') {
         console.log('标协会议')
-        validateStandard({companyName:this.selectedCompany.companyName}).then(res => {
+        validateStandard({companyName: this.selectedCompany.companyName}).then(res => {
           this.isStandardBool = res.result
-          if(this.isStandardBool){
+          if (this.isStandardBool) {
             this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
           }
         })
       }
       // 选择企业清空 姓名 手机号
       this.form.resetFields(['companyContactId', 'phone'])
+      if (this.$refs.formother) {
+        this.$refs.formother.clearFormItem()
+      }
 
     },
     /*
     * 选择联系人获取信息
     * */
     changeContact(val) {
+      // 监听删除联系人的时候 清除对应的表单赋值
+      if(val === undefined){
+        this.form.resetFields(['phone'])
+      }
       const that = this
       getContactsById({id: val}).then(res => {
         const model = Object.assign({}, res.result)

From 0d03b8dd084ec6071b18bfe7e1b7b68309d437f1 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 11:25:55 +0800
Subject: [PATCH 03/11] =?UTF-8?q?[bug]=20=E8=A1=A8=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=B8=A6=E5=87=BA=E4=BF=A1=E6=81=AF=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ExpenditureContractModule.vue     | 24 ++++++++-----
 .../modules/RevenueContractModule.vue         | 30 +++++++++-------
 .../modules/BatchInvoicingModule.vue          | 34 ++++++++++++-------
 3 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 968dd8b..b1e5283 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -309,7 +309,7 @@ export default {
         },
         principalId: {
           rules: [{ required: true, message: '请选择负责人' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         contractAmount: {
           rules: [{ required: true, validator: this.checkMoney }],
@@ -527,15 +527,21 @@ export default {
      * @param value
      */
     principalChange(value) {
-      let param = {
-        id: value
-      }
-      getAllUserList(param).then(res => {
-        this.model.departmentName = res.result[0].orgCodeTxt
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'departmentName'))
+      // value不为undefined
+      if (value) {
+        let param = {
+          id: value
+        }
+        getAllUserList(param).then(res => {
+          this.model.departmentName = res.result[0].orgCodeTxt
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(this.model, 'departmentName'))
+          })
         })
-      })
+        return
+      }
+      // value为undefined时清除部门名称
+      this.form.setFieldsValue({departmentName: undefined})
     },
     /**
      * 总签订金额修改
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index 1cc827f..2076aa8 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -589,19 +589,25 @@ export default {
      * @param value
      */
     principalChange(value) {
-      let param = {
-        id: value
-      }
-      getAllUserList(param).then(res => {
-        if (res.success) {
-          this.model.departmentName = res.result[0].orgCodeTxt
-          this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model, 'departmentName'))
-          })
-        } else {
-          this.$message.warn(res.message)
+      // value不为undefined
+      if (value) {
+        let param = {
+          id: value
         }
-      })
+        getAllUserList(param).then(res => {
+          if (res.success) {
+            this.model.departmentName = res.result[0].orgCodeTxt
+            this.$nextTick(() => {
+              this.form.setFieldsValue(pick(this.model, 'departmentName'))
+            })
+          } else {
+            this.$message.warn(res.message)
+          }
+        })
+        return
+      }
+      // value为undefined时清除部门名称
+      this.form.setFieldsValue({departmentName: undefined})
     },
     /**
      * 打包状态修改
diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue
index 3984ca6..e2905b1 100644
--- a/src/views/packManagement/modules/BatchInvoicingModule.vue
+++ b/src/views/packManagement/modules/BatchInvoicingModule.vue
@@ -283,18 +283,28 @@ export default {
      */
     postContactChange(value) {
       console.log(value)
-      getContactsById({ id: value }).then(res => {
-        let obj = {
-          postalCode: res.result.postalCode,
-          contactAddress: res.result.contactAddress
-        }
-        if (this.packContactId) {
-          this.packContact = obj
-          this.packContact.contactId = value
-        } else {
-          this.form.setFieldsValue(pick(obj, 'postalCode', 'contactAddress'))
-        }
-      })
+      // value不为undefined
+      if (value) {
+        getContactsById({ id: value }).then(res => {
+          let obj = {
+            postalCode: res.result.postalCode,
+            contactAddress: res.result.contactAddress
+          }
+          if (this.packContactId) {
+            this.packContact = obj
+            this.packContact.contactId = value
+          } else {
+            this.form.setFieldsValue(pick(obj, 'postalCode', 'contactAddress'))
+          }
+        })
+        return
+      }
+      // value为undefined，清除邮政编码和通讯地址
+      const obj = {
+        postalCode: undefined,
+        contactAddress: undefined
+      }
+      this.form.setFieldsValue(pick(obj, 'postalCode', 'contactAddress'))
     },
     /**
      * 清空本次开票金额

From 962c0390dd89c6ed38afd9570469a1f4422c3b17 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 13:39:46 +0800
Subject: [PATCH 04/11] =?UTF-8?q?[bug]=20=E6=94=B6=E5=85=A5=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?-=E7=A7=91=E5=AE=A4=E5=8F=98=E5=8C=96=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                                     | 1 -
 .../revenueContract/modules/SelectProjectModule.vue             | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index bb0a332..7e34e80 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,7 +23,6 @@ window.addEventListener('message', function (event) {
 document.onkeydown = keyDown
 
 function keyDown(e) {
-  console.log(navigator.userAgent)
   // 拦截backspace按钮，谷歌浏览器不需要拦截
   // 拦截仍然存在的问题：当input、textarea失去焦点后，仍然会后退页面
   if (e.keyCode === 8 && navigator.userAgent.indexOf('AppleWebKit') === -1 ) {
diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
index b9b86fc..16901ed 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
@@ -369,6 +369,8 @@ export default {
       let param = {
         departId: value
       }
+      this.queryParam.principalId = undefined
+      this.lastQueryParam.principalId = undefined
       queryUserByDepartId(param).then(res => {
         if (res.success) {
           this.userList = res.result

From 57e0b71aab1176326f8d58a86927e25043b55a29 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 13:44:50 +0800
Subject: [PATCH 05/11] =?UTF-8?q?[bug]=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E--=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=88=E6=94=B9=E6=88=90=E4=BA=86=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validateOnly.js              | 4 ++--
 src/views/system/modules/UserModal.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/validateOnly.js b/src/utils/validateOnly.js
index 16ed013..f89e8d5 100644
--- a/src/utils/validateOnly.js
+++ b/src/utils/validateOnly.js
@@ -3,8 +3,8 @@ import {phoneReg, isEmail, chineseReg} from '@/utils/validate'
 
 // 手机校验的错误信息提示
 const phoneErrMsg = {
-  err1: '请输入手机号',
-  err2: '请输入正确格式的手机号'
+  err1: '请输入手机号码',
+  err2: '请输入正确格式的手机号码'
 }
 // 邮箱校验错误提示信息
 const emailErrMsg = {
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index bd29a79..fb6aab9 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -155,8 +155,8 @@
                             v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
         </a-form-item>
 
-        <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号" @change="event => event.target.value = event.target.value.trim()"
+        <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入手机号码" @change="event => event.target.value = event.target.value.trim()"
                    :disabled="isDisabledAuth('user:form:phone') || disableSubmit"
                    v-decorator="[ 'phone', validatorRules.phone]" :maxLength="11"/>
         </a-form-item>
@@ -619,7 +619,7 @@ export default {
         if (res.success) {
           callback()
         } else {
-          callback(res.code === 500 ? '手机号已存在' : res)
+          callback(res.code === 500 ? '手机号码已存在' : res)
         }
       })
     },

From 4890c69cae42bb97c49d8955367c853ab5aabbce Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 13:55:52 +0800
Subject: [PATCH 06/11] =?UTF-8?q?[bug]=20=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E6=88=90=E5=91=98-=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=BB=91=E8=89=B2=E5=AD=97=E4=BD=93=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=BC=A0=E6=A0=87=E6=89=8B=E7=9A=84=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/WorkingGroupMemberUnitMaintenance.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index d479f9f..999b388 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -539,7 +539,7 @@ export default {
     }
 
     &-filename {
-      cursor: pointer;
+      //cursor: pointer;
     }
   }
 }

From b42432af21f22d8cc21b3871a045c7a7f65f74e1 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 15:27:48 +0800
Subject: [PATCH 07/11] =?UTF-8?q?[bug]=20=E9=80=9A=E8=BF=87=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BAid=E8=8E=B7=E5=8F=96=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/api.js b/src/api/api.js
index e7e640a..052a94a 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -113,7 +113,7 @@ const getContactsByCompany = (params) => getAction('/company/payContactsManageme
 // 通过企业名称获取该企业下的联系人无权限接口
 const getContactsByCompanyNoLimit = (params) => getAction('/company/payContactsManagement/queryByCompanyMeeting', params)
 // 通过联系人id获取联系人信息
-const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdGetContract', param)
+const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param)
 
 // 加密获取key 与 iv
 const getKeyIv = (param) => getAction('/sys/getEncryptedString',param)

From 600f5e650300beb4a3fb4fa8e28a02cba31ddc30 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 15:37:52 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=BA=E8=B4=B9=E7=94=A80=20=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=9A=84=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            |  6 ++
 .../incomePayments/meetManage/Attendance.vue  |  6 +-
 .../meetManage/SignUpInfoDetail.vue           | 19 ++---
 .../meetManage/modules/SeminarVipForm.vue     |  2 +-
 src/views/signUp/SignUpEntrance.vue           |  4 +-
 src/views/signUp/SignUpPage.vue               | 81 ++++++++++++-------
 src/views/system/DepartList.vue               |  2 +-
 7 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index a9b8ab6..0c1bf4c 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -498,6 +498,12 @@ export default {
         this.meetingType = record.meetingType + ''
         // 编辑根据接口返回的会议类型获取不同的会议url
         this.url = this.createUrlByMeetingType(this.meetingType)
+        // 判断会议费用是否为 0 缴费二维码显示
+        if(this.model.meetingCosts === '0.00' ){
+          this.QRcodeBool = false
+        }else {
+          this.QRcodeBool = true
+        }
       } else {
         this.title = '新增会议'
         // 如果是标协会会议需要显示酒店联系人
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 6cc4e64..a586ecd 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -58,13 +58,13 @@
           <label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>演讲嘉宾邀请码：</label><span>{{ currentMeetingInfo.speakerInvitationCode }}</span>
+          <label style="min-width: 116px">演讲嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.speakerInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>特邀嘉宾邀请码：</label><span>{{ currentMeetingInfo.guestInvitationCode }}</span>
+          <label style="min-width: 116px">特邀嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.guestInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>合作伙伴邀请码：</label><span>{{ currentMeetingInfo.cooperativeInvitationCode }}</span>
+          <label style="min-width: 116px">合作伙伴邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.cooperativeInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row class="flex-col">
diff --git a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
index 3f2558d..a9a8e72 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
@@ -5,12 +5,12 @@
       <!--个人信息begin-->
       <template>
         <div class="item-title">个人信息</div>
-        <a-row :gutter="24">
-          <a-col :xxl="8" :xl="12" :sm="24">
+        <a-row :gutter="24" class="flex-col">
+          <a-col :xxl="24" :xl="24" :sm="24">
             <label class="label">参会企业：</label><span>{{ model.companyName }}</span>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :xxl="8" :xl="12" :sm="24">
             <label class="label">姓名：</label><span>{{ model.companyContactName }}</span>
           </a-col>
@@ -32,7 +32,7 @@
         <!--行程信息begin-->
         <template>
           <div class="item-title">行程信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">是否住酒店：</label><span>{{ model.checkInHotel_dictText }}</span>
             </a-col>
@@ -51,7 +51,7 @@
         <!--缴费信息begin-->
         <template v-if="model.identity === 2">
           <div class="item-title">缴费信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">缴费方式：</label><span>{{ model.payMode_dictText }}</span>
             </a-col>
@@ -69,7 +69,7 @@
         <!--邮寄信息begin-->
         <template v-if="model.identity === 2 && model.needInvoice !== 0 ">
           <div class="item-title">邮寄信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">邮寄联系人：</label><span>{{ model.postContactName }}</span>
             </a-col>
@@ -88,7 +88,7 @@
         <!--行程信息begin-->
         <template>
           <div class="item-title">行程信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">是否住酒店：</label><span>{{ model.checkInHotel_dictText }}</span>
             </a-col>
@@ -106,7 +106,7 @@
 <!--       内部企业显示 -->
         <template v-if="model.identity !== 3  ">
           <div class="item-title">缴费信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">缴费方式：</label><span>{{ model.payMode_dictText }}</span>
             </a-col>
@@ -125,7 +125,7 @@
         <!--        参会人不需要发票不显示 -->
         <template v-if="model.needInvoice !== 0">
           <div class="item-title">邮寄信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">邮寄联系人：</label><span>{{ model.postContactName }}</span>
             </a-col>
@@ -351,6 +351,7 @@ export default {
   .ant-col {
     label {
       color: #999;
+      min-width: 45px;
     }
 
     span {
diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
index f922643..f5d6406 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
@@ -199,7 +199,7 @@
 
     </a-row>
     <!--特邀嘉宾没有备注-->
-    <a-row v-if="guestType!== 3">
+    <a-row v-if="guestType!== 3" :gutter="24" style="transform: translateX(-4px)">
       <a-col>
         <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
           <a-textarea
diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index 096c386..4ddde5e 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -59,7 +59,7 @@
               <span>{{ currentMeetingInfo.registerDeadline }}</span>
             </a-col>
             <a-col :span="12" style="display: flex">
-              <label>附件：</label>
+              <label>会议通知：</label>
               <preview-file :file-id="currentMeetingInfo.meetingFiles"
                             v-if="currentMeetingInfo.meetingFiles"></preview-file>
             </a-col>
@@ -177,7 +177,7 @@ export default {
           if (this.currentMeetingInfo.meetingCostsVip) {
             this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
           } else {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+            this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
           }
           // 初始化召开时间
           if (this.currentMeetingInfo.startTime) {
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index b7b8fcf..a1e2763 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -359,13 +359,13 @@ export default {
         if (res.success) {
           this.currentMeetingInfo = res.result
           this.meetingType = this.currentMeetingInfo.meetingType
-          // 初始化会议费用  这里的判断有问题 应该根据单位是否是标协会员单位 显示不同的会议费用
+          // 初始化会议费用
           if (this.currentMeetingInfo.meetingCostsVip) {
             this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
             // 费用合计
             this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           } else {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+            this.meetingMoney = `${this.currentMeetingInfo.meetingCosts}/人`
             // 费用合计
             this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           }
@@ -520,6 +520,24 @@ export default {
       if (e.target.value !== 1) {
         this.guestType = null
       }
+      // 当前会议是国际研讨会 并且选择身份是内部企业的会议费用为0
+      if(e.target.value === 3 && this.currentMeetingInfo.meetingType === '3' ){
+        this.meetingCostSum = '0.00'
+      }else {
+        this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
+      }
+      // 当前会议不是国际研讨会议 身份选择嘉宾和 内部企业的会议费用为0
+      if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
+        this.meetingCostSum = '0.00'
+      }else {
+        // 会议是标协会议的话 需要判断企业是否是标准协会
+        if(this.currentMeetingInfo.meetingType === '2' && this.isStandardBool){
+          this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+        }else {
+          this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
+        }
+
+      }
     },
     /*
     * 选择嘉宾类型
@@ -601,32 +619,39 @@ export default {
     * 下一步
     * */
     nextSetp() {
-      // 获取邀请码
-      let code = this.form.getFieldValue('code')
-      switch (code) {
-        // 合作伙伴
-        case this.currentMeetingInfo.cooperativeInvitationCode:
-          this.identifyType = 1
-          this.guestType = 4
-          break
-        // 演讲嘉宾
-        case this.currentMeetingInfo.speakerInvitationCode:
-          this.identifyType = 1
-          this.guestType = 2
-          break
-        // 特邀嘉宾
-        case this.currentMeetingInfo.guestInvitationCode:
-          this.identifyType = 1
-          this.guestType = 3
-          break
-        // vip
-        case this.currentMeetingInfo.vipInvitationCode:
-          this.identifyType = 1
-          this.guestType = 1
-          break
-        default :
-          this.guestType = null
-      }
+      this.form.validateFields(['code'],(err) => {
+        if(!err){
+          // 获取邀请码
+          let code = this.form.getFieldValue('code')
+          switch (code) {
+            // 合作伙伴
+            case this.currentMeetingInfo.cooperativeInvitationCode:
+              this.identifyType = 1
+              this.guestType = 4
+              break
+            // 演讲嘉宾
+            case this.currentMeetingInfo.speakerInvitationCode:
+              this.identifyType = 1
+              this.guestType = 2
+              break
+            // 特邀嘉宾
+            case this.currentMeetingInfo.guestInvitationCode:
+              this.identifyType = 1
+              this.guestType = 3
+              break
+            // vip
+            case this.currentMeetingInfo.vipInvitationCode:
+              this.identifyType = 1
+              this.guestType = 1
+              break
+            default :
+              this.guestType = null
+          }
+        }
+      })
+
+
+
     },
     /*
     * 校验邀请码是否正确 给出提示
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 19c292b..e99ef7b 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -595,7 +595,7 @@ export default {
                 that.onClearSelected()
               }
             } else {
-              that.$message.warning('删除失败!')
+              that.$message.warning(resp.message)
             }
           })
         }

From c71adca94eb662c214375b67c22f62dd875cb556 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 15:45:27 +0800
Subject: [PATCH 09/11] =?UTF-8?q?[bug]=20=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=9B=9E=E6=98=BE0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessManagement/modules/ContactManagementModule.vue  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue
index d0cdda1..5f80632 100644
--- a/src/views/businessManagement/modules/ContactManagementModule.vue
+++ b/src/views/businessManagement/modules/ContactManagementModule.vue
@@ -33,7 +33,7 @@
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['gender', {}]" :triggerChange="true" placeholder="请选择性别"
+              <j-dict-select-tag v-decorator="['gender']" :triggerChange="true" placeholder="请选择性别"
                                  dictCode="sex"/>
             </a-form-item>
           </a-col>
@@ -244,7 +244,9 @@ export default {
           // 处理企业名称和id等信息
           values.companyName = values.company.companyName
           values.companyId = values.company.id
-          values.gender = Number(values.gender)
+          if (values.gender === undefined) {
+            values.gender = null
+          }
           // values.dataSource = this.dataForm
           // values.signingUp = this.applyAdd
           let httpurl = ''

From 6acb841a2e82982a8bc17a99f3f43bc32a2622ee Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 15:46:39 +0800
Subject: [PATCH 10/11] =?UTF-8?q?[bug]=20=E5=8E=BB=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=8F=9C=E5=8D=95=E6=B2=A1=E6=9C=89=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/UserMenu.vue | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index acf1ab9..88c0981 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -7,34 +7,34 @@
         <span v-if="isDesktop()"><j-ellipsis :value="`欢迎您，${nickname()}`" :length="10"></j-ellipsis></span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
-          <router-link :to="{ name: 'account-center' }">
-            <a-icon type="user"/>
-            <span>个人中心</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="3" @click="systemSetting">
-          <a-icon type="tool"/>
-          <span>系统设置</span>
-        </a-menu-item>
+<!--        <a-menu-item key="0">-->
+<!--          <router-link :to="{ name: 'account-center' }">-->
+<!--            <a-icon type="user"/>-->
+<!--            <span>个人中心</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="1">-->
+<!--          <router-link :to="{ name: 'account-settings-base' }">-->
+<!--            <a-icon type="setting"/>-->
+<!--            <span>账户设置</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="3" @click="systemSetting">-->
+<!--          <a-icon type="tool"/>-->
+<!--          <span>系统设置</span>-->
+<!--        </a-menu-item>-->
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
-          <a-icon type="cluster"/>
-          <span>切换部门</span>
-        </a-menu-item>
-        <a-menu-item key="6" @click="clearCache">
-          <a-icon type="sync"/>
-          <span>清理缓存</span>
-        </a-menu-item>
+<!--        <a-menu-item key="5" @click="updateCurrentDepart">-->
+<!--          <a-icon type="cluster"/>-->
+<!--          <span>切换部门</span>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="6" @click="clearCache">-->
+<!--          <a-icon type="sync"/>-->
+<!--          <span>清理缓存</span>-->
+<!--        </a-menu-item>-->
         <!-- <a-menu-item key="2" disabled>
            <a-icon type="setting"/>
            <span>测试</span>

From 2468bc40cc11f2ea5c602e3b6c661029984e0e8e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 15:54:08 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=9A=84=E8=B4=B9=E7=94=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/signUp/SignUpPage.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index a1e2763..b8b0e2f 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -557,6 +557,8 @@ export default {
           this.isStandardBool = res.result
           if (this.isStandardBool) {
             this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+          }else {
+            this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           }
         })
       }