From 50ceb6f5ccaef62a4c01e6fea1e653bc74658157 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 09:54:18 +0800
Subject: [PATCH 01/18] =?UTF-8?q?[bug]-=E5=90=88=E5=90=8C=E9=82=AE?=
 =?UTF-8?q?=E5=AF=84=E6=A0=B7=E5=BC=8F=E3=80=81=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=EF=BC=9B=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=B8=BA0=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue     |  2 +-
 src/views/mailManagement/ContractMail.vue | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index eef544e..f94e6ac 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -16,7 +16,7 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>应收金额：</label>
-          <span><j-ellipsis :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="`${basicInfo.receivableAmount ? basicInfo.receivableAmount : '0.00'}元`" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index 2dbf221..610ef30 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -9,12 +9,12 @@
           <a-row :gutter="24">
             <a-col :xl="5" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同编号">
-                <a-input placeholder="请输入来款项目" v-model="queryParam.contractNum" :maxLength='50'></a-input>
+                <a-input placeholder="请输入合同编号" v-model="queryParam.contractNum" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同名称">
-                <a-input placeholder="请输入来款单位" v-model="queryParam.contractName" :maxLength='50'></a-input>
+                <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="12" :md="16" :sm="24">
@@ -126,56 +126,56 @@ export default {
           align: 'center',
           width: 300,
           dataIndex: 'contractNum',
-          scopedSlots: { customRender: 'htmlSlot' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '合同名称',
           align: 'center',
           width: 300,
           dataIndex: 'contractName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '签订单位',
           align: 'center',
           width: 300,
           dataIndex: 'signedCompanyTemporaryName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '负责人',
           align: 'center',
           width: 300,
           dataIndex: 'principalName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '合同总金额',
           align: 'center',
           width: 200,
           dataIndex: 'contractAmount',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '邮寄联系人',
           align: 'center',
           width: 300,
           dataIndex: 'liaisonMan',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '联系人电话',
           align: 'center',
           width: 200,
           dataIndex: 'mobile',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '状态',
           align: 'center',
           width: 200,
           dataIndex: 'postStatus_dictText',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '打印',

From b02f65f17fd4b93076f869850dce7b7e8a56579e Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 10:10:32 +0800
Subject: [PATCH 02/18] =?UTF-8?q?[bug]-=E9=82=AE=E5=AF=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=91=E9=A2=9D=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mailManagement/BillMail.vue                     | 4 +++-
 src/views/mailManagement/ContractMail.vue                 | 4 +++-
 src/views/projectManagement/GeneralProjectManagement.vue  | 3 ++-
 .../WorkingGroupMemberUnitMaintenance.vue                 | 8 ++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index 625fce6..30a7238 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -161,7 +161,9 @@ export default {
           align: 'center',
           width: 200,
           dataIndex: 'invoiceAmount',
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.invoiceAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         },
         {
           title: '项目负责人',
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index 610ef30..c1cf270 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -154,7 +154,9 @@ export default {
           align: 'center',
           width: 200,
           dataIndex: 'contractAmount',
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.contractAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         },
         {
           title: '邮寄联系人',
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index c43f1c9..3141ab0 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -181,7 +181,8 @@ export default {
           width: 150,
           dataIndex: 'receivableAmount',
           customRender: (text, record) => (
-            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>)
+            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '实收金额',
           align: 'center',
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index fc220f9..945e6ba 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -282,13 +282,17 @@ export default {
           align: 'center',
           dataIndex: 'receivableAmount',
           width: 180,
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
           width: 180,
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '打包',
           align: 'center',

From 54cc1faf06bb9392dea7e9e76548581a28481f5b Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 11:33:26 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  |   1 +
 .../meetManage/modules/AuditModal.vue         | 124 ++++++++++--------
 2 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 526b6cf..e3de30b 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -634,6 +634,7 @@ export default {
     *  审核
     * */
     handleAudit(record) {
+      this.$refs.auditModal.title = '审核凭证'
       this.$refs.auditModal.open(record, false)
     },
     /*
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 4187dd8..44559dd 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -1,77 +1,79 @@
 <template>
   <j-modal
-      :title="title"
-      :width="width"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <section class="check">
         <h3>报名信息</h3>
         <a-row :gutter="24">
           <a-col :span="24">
             <label>参会企业：</label>
-            <span>{{model.companyName}}</span>
+            <span>{{ model.companyName }}</span>
           </a-col>
         </a-row>
 
         <a-row :gutter="24">
           <a-col :span="12">
             <label>姓名：</label>
-            <span>{{model.companyContactName}}</span></a-col>
+            <span>{{ model.companyContactName }}</span></a-col>
           <a-col :span="12">
             <label>手机号：</label>
-            <span>{{model.phone}}</span></a-col>
+            <span>{{ model.phone }}</span></a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <label>身份：</label>
-            <span>{{model.identity_dictText}}</span></a-col>
+            <span>{{ model.identity_dictText }}</span></a-col>
           <a-col :span="12" v-show="checkSignBool">
             <label>是否住酒店：</label>
-            <span>{{model.checkInHotel_dictText}}</span></a-col>
+            <span>{{ model.checkInHotel_dictText }}</span></a-col>
         </a-row>
         <a-row :gutter="24" v-show="checkSignBool">
           <a-col :span="12">
             <label>抵达时间：</label>
-            <span>{{model.arrivalTime}}</span></a-col>
+            <span>{{ model.arrivalTime }}</span></a-col>
           <a-col :span="12">
             <label>离开时间：</label>
-            <span>{{model.departureTime}}</span></a-col>
+            <span>{{ model.departureTime }}</span></a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <label>缴费方式：</label>
-            <span>{{model.payMode_dictText}}</span></a-col>
+            <span>{{ model.payMode_dictText }}</span></a-col>
           <a-col :span="12">
             <label>需要发票：</label>
-            <span>{{model.needInvoice_dictText}}</span></a-col>
+            <span>{{ model.needInvoice_dictText }}</span></a-col>
         </a-row>
       </section>
-      <a-row :gutter="24" style="margin-top: 10px">
-       <a-col :span="3">
-         <label class="color-999">缴费凭证：</label>
-       </a-col>
+      <!-- 审核报名信息不显示 -->
+      <a-row :gutter="24" style="margin-top: 10px" v-show="!checkSignBool">
+        <a-col :span="3">
+          <label class="color-999">缴费凭证：</label>
+        </a-col>
         <a-col :span="9">
           <j-image-upload disabled :return-id="true" v-model="model.paymentRecord"></j-image-upload>
         </a-col>
-<!--        缴费上方式为线上的 显示 -->
+        <!--        缴费上方式为线上的 显示 -->
         <a-col :span="12" v-if="model.payMode === 2 ">
           <label class="color-999">订单后四位：</label>
-          <span class="color-black">{{model.orderCode}}</span></a-col>
+          <span class="color-black">{{ model.orderCode }}</span></a-col>
       </a-row>
 
       <h3>审核</h3>
 
       <a-form :form="form">
         <a-row :gutter="24">
-          <a-col :xl="12" :sm="24" >
+          <a-col :xl="12" :sm="24">
             <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果" @change="changeCheck">
+              <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果"
+                             @change="changeCheck">
                 <a-radio value="1">
-                 通过
+                  通过
                 </a-radio>
                 <a-radio value='2'>
                   驳回
@@ -82,11 +84,11 @@
           <a-col :xl="24" :sm="24" v-if="checkBool">
             <a-form-item label="审核说明" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <a-textarea
-                  placeholder="请输入审核说明"
-                  :auto-size="{ minRows: 3, maxRows: 6 }"
-                  :maxLength='200'
-                  v-decorator="['checkRemark',validatorRules.checkRemark]"
-                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+                placeholder="请输入审核说明"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                :maxLength='200'
+                v-decorator="['checkRemark',validatorRules.checkRemark]"
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
             </a-form-item>
           </a-col>
           <a-col :xl="24" :sm="24" v-if="!checkBool">
@@ -157,53 +159,53 @@ export default {
         // 审核凭证
         check: '/meeting/payMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/payMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/payMeetingSituation/checkRegister'
       },
       // 其他会议url
       otherMeetingUrl: {
         // 审核凭证
         check: '/meeting/ohterMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/ohterMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/ohterMeetingSituation/checkRegister'
       },
       // 工作组会议url
       workGroupMeetingUrl: {
         // 审核凭证
         check: '/meeting/workGroupMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/workGroupMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/workGroupMeetingSituation/checkRegister'
       },
       // 分标委会议url
       committeeMeetingUrl: {
         // 审核凭证
         check: '/meeting/committeeMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/committeeMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/committeeMeetingSituation/checkRegister'
       },
       // 国际研讨会url
       internalMeetingUrl: {
         // 审核凭证
         check: '/meeting/internalMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/internalMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/internalMeetingSituation/checkRegister'
       },
       // 标协会议url
       standardsMeetingUrl: {
         // 审核凭证
         check: '/meeting/standardsMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/standardsMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/standardsMeetingSituation/checkRegister'
       },
       // 审核结果选择
-      checkBool:false,
+      checkBool: false,
       // 是否是审核报名信息
-      checkSignBool:false,
+      checkSignBool: false,
       // 参会人id
-      signUpPersonId:'',
+      signUpPersonId: '',
     }
   },
   methods: {
-    open(record,signUp) {
+    open(record, signUp) {
       this.form.resetFields()
       this.visible = true
       this.signUpPersonId = record.id
@@ -211,7 +213,7 @@ export default {
       // 控制行程信息显示 审核凭证不显示
       this.checkSignBool = signUp || false
       // 会议类型不同 url不同
-      this.url = Object.assign({},this.createUrlByMeetingType(this.$route.query.meetingType))
+      this.url = Object.assign({}, this.createUrlByMeetingType(this.$route.query.meetingType))
       console.log(record)
     },
     close() {
@@ -225,10 +227,10 @@ export default {
         if (!err) {
           that.confirmLoading = true
           let httpurl = ''
-          if(that.checkSignBool){
+          if (that.checkSignBool) {
             // 审核报名信息的接口
-           httpurl = this.url.checkSignUp
-          }else {
+            httpurl = this.url.checkSignUp
+          } else {
             // 审核凭证的接口
             httpurl = this.url.check
           }
@@ -250,9 +252,9 @@ export default {
         }
       })
     },
-    querySingUpUserInfo(){
-      getSingUpUserInfo({id:this.signUpPersonId}).then(res => {
-        if(res.success){
+    querySingUpUserInfo() {
+      getSingUpUserInfo({id: this.signUpPersonId}).then(res => {
+        if (res.success) {
           this.model = res.result
         }
       })
@@ -263,25 +265,30 @@ export default {
     /*
     * 选择审核结果
     * */
-    changeCheck(e){
+    changeCheck(e) {
       console.log(e)
       // 审核结果选择拒绝 审核说明必填
-      if(e.target.value === '1'){
+      if (e.target.value === '1') {
         this.checkBool = false
-      }else if(e.target.value === '2'){
+      } else if (e.target.value === '2') {
         this.checkBool = true
       }
     },
     /*
     * 根据会议类型不同的url
     * */
-    createUrlByMeetingType(meetingType){
-      switch (meetingType){
-        case '1': return this.workGroupMeetingUrl
-        case '2': return this.standardsMeetingUrl
-        case '3': return this.internalMeetingUrl
-        case '4': return this.otherMeetingUrl
-        case '5': return this.committeeMeetingUrl
+    createUrlByMeetingType(meetingType) {
+      switch (meetingType) {
+        case '1':
+          return this.workGroupMeetingUrl
+        case '2':
+          return this.standardsMeetingUrl
+        case '3':
+          return this.internalMeetingUrl
+        case '4':
+          return this.otherMeetingUrl
+        case '5':
+          return this.committeeMeetingUrl
       }
     }
   }
@@ -316,7 +323,8 @@ export default {
 .color-999 {
   color: #999;
 }
+
 .color-black {
-  color:black;
+  color: black;
 }
 </style>

From b97aefc4c1d7aeef53ddce715366b349e48cf29d Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 14:02:54 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=A0=B9=E6=8D=AE=E4=BC=81=E4=B8=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E6=A0=87=E5=8D=8F=E6=88=90=E5=91=98=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomeMeetingApi.js     |  6 +++++-
 src/views/signUp/SignUpPage.vue | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js
index d546f17..af2702b 100644
--- a/src/api/incomeMeetingApi.js
+++ b/src/api/incomeMeetingApi.js
@@ -14,11 +14,15 @@ const createQcCode = (params) => getAction('/meeting/payMeeting/createBase64',pa
 // 收入合同的新增会员项目的查询
 const queryContractMemberProject = (params) => getAction('/jero/memberProject/queryListByNotCompany',params)
 
+// 通过单位名称校验是否标协会员
+const validateStandard = (params) => getAction('/meeting/internalMeetingSituation/checkMember',params)
+
 export {
   getUserInfo,
   getMeetInfoById,
   getAllWorkProjects,
   getSingUpUserInfo,
   createQcCode,
-  queryContractMemberProject
+  queryContractMemberProject,
+  validateStandard
 }
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index aae1c4a..e0fe879 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -223,7 +223,7 @@
 </template>
 
 <script>
-import {getMeetInfoById} 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'
@@ -331,6 +331,8 @@ export default {
       isPackBool: false,
       // 国际研讨会身份的控制
       identityBool: false,
+      // 是否是标协成员
+      isStandardBool:false,
       // url是否有id字段  默认没有
       urlHaveIdBool: false,
       url: {
@@ -529,7 +531,18 @@ export default {
     * 选择参会企业
     * */
     changeCompany(value) {
+
       this.selectedCompany = value
+      // 通过企业名称判断当前参会人
+      if(this.currentMeetingInfo.meetingType +'' === '2' ){
+        console.log('标协会议')
+        validateStandard({companyName:this.selectedCompany.companyName}).then(res => {
+          this.isStandardBool = res.result
+          if(this.isStandardBool){
+            this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+          }
+        })
+      }
       // 选择企业清空 姓名 手机号
       this.form.resetFields(['companyContactId', 'phone'])
 

From fd52cd785cbf68f7a468145d7bef7cd29532d858 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:27:13 +0800
Subject: [PATCH 05/18] =?UTF-8?q?[bug]=20=E7=94=A8=E6=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8F=90=E7=A4=BA=E8=AF=AD?=
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 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/validateOnly.js b/src/utils/validateOnly.js
index f89e8d5..16ed013 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 b330290..bd29a79 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>

From 01bad099439fb7d37451c3ea0a26bfa17a580f4f Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 15:17:20 +0800
Subject: [PATCH 06/18] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkingGroupMemberUnitMaintenance.vue          |  1 -
 .../ProjectPaymentStatisticsList.vue               | 14 +++++++-------
 src/views/system/DictItemList.vue                  |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 945e6ba..d479f9f 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -540,7 +540,6 @@ export default {
 
     &-filename {
       cursor: pointer;
-      color: #069f99;
     }
   }
 }
diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
index f234ddb..84ff276 100644
--- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
@@ -7,27 +7,27 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入来款项目" v-model="queryParam.projectName" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
-            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-col :xxl="6" :xl="12" :lg="12" :md="12" :sm="24">
               <a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input
                   placeholder="请输入应收款项"
@@ -42,12 +42,12 @@
                   @change="checkMoney('end')"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="项目负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-principal placeholder="请选择项目负责人" v-model="queryParam.principalNameId"></select-principal>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="所属科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-tree-select
                   style="width:100%"
diff --git a/src/views/system/DictItemList.vue b/src/views/system/DictItemList.vue
index 0d3ef5c..40fa00d 100644
--- a/src/views/system/DictItemList.vue
+++ b/src/views/system/DictItemList.vue
@@ -43,7 +43,7 @@
             </a-row>
             <a-row>
               <a-col :md="2" :sm="24">
-                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd" v-has="'dic:item:add'">新增</a-button>
+                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd" v-has="'dic:item:add'" icon="plus">新增</a-button>
               </a-col>
             </a-row>
           </a-form>

From eae52a04526c1b199dbccd8fc036eafb8aa80012 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 15:18:37 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=20=E4=B8=BA=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/UserList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index fde6e9c..cfa5780 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -181,7 +181,7 @@ export default {
         //   scopedSlots: { customRender: "text" },
         // },
         {
-          title: '手机号',
+          title: '手机号码',
           align: 'center',
           width: 160,
           dataIndex: 'phone',

From 62f4699a81844f8553333054902ee08ac4739bc3 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:50:21 +0800
Subject: [PATCH 08/18] =?UTF-8?q?[bug]=20=E5=90=88=E5=90=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=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

---
 .../expenditureContract/ExpenditureContractDetail.vue       | 4 ++--
 .../revenueContract/modules/RevenueContractDetail.vue       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 7d89eee..d48c1fa 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -122,8 +122,8 @@
           <div class="part-title">
             <div class="part-title-text">存档信息</div>
           </div>
-          <div class="detail" v-if="detailData.listArchive && detailData.listArchive.length > 0">
-            <div class="detail-item" v-for="(item, index) in detailData.listArchive"
+          <div class="aduit-text" v-if="detailData.listArchive && detailData.listArchive.length > 0">
+            <div v-for="(item, index) in detailData.listArchive"
                  :key="index">
               <a-row>
                 <a-col :sm="6" :xs="24">{{ item.createBy }}</a-col>
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
index 031d5de..7349049 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
@@ -132,8 +132,8 @@
           <div class="part-title">
             <div class="part-title-text">存档信息</div>
           </div>
-          <div class="detail" v-if="detailData.listArchive && detailData.listArchive.length > 0">
-            <div class="detail-item" v-for="(item, index) in detailData.listArchive"
+          <div class="aduit-text" v-if="detailData.listArchive && detailData.listArchive.length > 0">
+            <div v-for="(item, index) in detailData.listArchive"
                  :key="index">
               <a-row>
                 <a-col :sm="6" :xs="24">{{ item.createBy }}</a-col>
@@ -152,7 +152,7 @@
             <div class="part-title-text">审核记录</div>
           </div>
           <div class="aduit-text" v-if="detailData.listAudit && detailData.listAudit.length > 0">
-            <div  v-for="(item, index) in detailData.listAudit"
+            <div v-for="(item, index) in detailData.listAudit"
                  :key="index">
               <a-row>
                 <a-col :sm="6" :xs="24">{{ item.createBy }}</a-col>

From e1b4b0cc9a16357f233f9e3fce2a4e2e6c402b2a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 17:25:40 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/message/SysMessageTemplateList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index ce5738d..d4866ac 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -36,7 +36,7 @@
 
      <!-- 操作按钮区域 -->
      <div class="table-operator">
-<!--       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>-->
+       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>
      </div>
 
      <!-- table区域-begin -->

From 6a83bed67a558c2badd739431092a68835bee564 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 18:34:10 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=9A=84=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/development_address_config.js                 | 2 +-
 public/production_address_config.js                  | 2 +-
 src/views/modules/message/SysMessageTemplateList.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/development_address_config.js b/public/development_address_config.js
index 6425b04..7ab924c 100644
--- a/public/development_address_config.js
+++ b/public/development_address_config.js
@@ -13,7 +13,7 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signUpEntrance'
+window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance'
 
 // 签到二维码url
 window._CONFIG['signInUrl'] = '/meeting/payMeetingSituation/getSignInPage'
diff --git a/public/production_address_config.js b/public/production_address_config.js
index 297de6b..8749c66 100644
--- a/public/production_address_config.js
+++ b/public/production_address_config.js
@@ -12,5 +12,5 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://10.10.10.46:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signUpEntrance'
+window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signupentrance'
 
diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index d4866ac..ce5738d 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -36,7 +36,7 @@
 
      <!-- 操作按钮区域 -->
      <div class="table-operator">
-       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>
+<!--       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>-->
      </div>
 
      <!-- table区域-begin -->

From 51e6a733890006b05813c1227d7da5a4769af91c Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Tue, 26 Oct 2021 18:37:15 +0800
Subject: [PATCH 11/18] =?UTF-8?q?[update]=20-=E4=BC=9A=E5=91=98=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=20=E5=81=9A?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E3=80=81=E5=A4=B4=E9=83=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layouts/TabLayout.vue |  9 +++++++++
 src/components/page/GlobalLayout.vue | 14 ++++++++++----
 src/permission.js                    |  4 ++++
 src/store/modules/user.js            |  7 ++++++-
 src/utils/hasPermission.js           |  2 +-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 7be1037..e9c3b2e 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -4,6 +4,7 @@
     <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
     <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
     <a-tabs
+      v-show="showMenu"
       @contextmenu.native="e => onContextmenu(e)"
       v-if="multipage"
       :active-key="activePage"
@@ -39,6 +40,7 @@
   const indexKey = '/dashboard/analysis'
   import Vue from 'vue'
   import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
+  import {mapState} from 'vuex'
 
   export default {
     name: 'TabLayout',
@@ -77,6 +79,13 @@
         } else {
           return this.$store.state.app.multipage
         }
+      },
+      ...mapState({
+        // 系统名称 目的是监听是否是会员系统，会员系统隐藏菜单
+        system: state => state.user.system
+      }),
+      showMenu() {
+        return this.system !== 'member'
       }
     },
     created() {
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 7be2bc2..dfec8f8 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -1,6 +1,5 @@
 <template>
   <a-layout class="layout" :class="[device]">
-
     <template v-if="layoutMode === 'sidemenu'">
       <a-drawer
         v-if="device === 'mobile'"
@@ -22,7 +21,7 @@
       </a-drawer>
 
       <side-menu
-        v-show="device === 'desktop'"
+        v-show="device === 'desktop' && showMenu"
         mode="inline"
         :menus="menus"
         @menuSelect="myMenuSelect"
@@ -33,6 +32,7 @@
     <!-- 下次优化这些代码 -->
     <template v-else>
       <a-drawer
+        v-show="showMenu"
         v-if="device === 'mobile'"
         :wrapClassName="'drawer-sider ' + navTheme"
         placement="left"
@@ -62,6 +62,7 @@
         :collapsed="collapsed"
         :device="device"
         @toggle="toggle"
+        v-show="showMenu"
       />
 
       <!-- layout content -->
@@ -119,8 +120,13 @@ export default {
       // 主路由
       mainRouters: state => state.permission.addRouters,
       // 后台菜单
-      permissionMenuList: state => state.user.permissionList
-    })
+      permissionMenuList: state => state.user.permissionList,
+      // 系统名称 目的是监听是否是会员系统，会员系统隐藏菜单
+      system: state => state.user.system
+    }),
+    showMenu() {
+      return this.system !== 'member'
+    }
   },
   watch: {
     sidebarOpened(val) {
diff --git a/src/permission.js b/src/permission.js
index c4798f9..f556a66 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -15,6 +15,10 @@ router.beforeEach((to, from, next) => {
   if (to.query.token) {
     Vue.ls.set(ACCESS_TOKEN, to.query.token, 7 * 24 * 60 * 60 * 1000)
     store.commit('SET_TOKEN', to.query.token)
+    // 判断是否是会员系统iframe嵌入的，如果是 不先做左侧菜单和 头部标签
+    if(to.query.system === 'member') {
+      store.commit('SET_SYSTEM', to.query.system)
+    }
   }
 
   NProgress.start() // start progress bar
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e7522bf..421ef53 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,8 @@ import { getAction } from '@/api/manage'
 
 const user = {
   state: {
+    // 使用系统的名称，只有在会员系统嵌入来款系统的时候使用 传值为 member
+    system: '',
     token: '',
     username: '',
     realname: '',
@@ -18,6 +20,9 @@ const user = {
   },
 
   mutations: {
+    SET_SYSTEM: (state, system) => {
+      state.system = system
+    },
     SET_TOKEN: (state, token) => {
       state.token = token
     },
@@ -205,4 +210,4 @@ const user = {
   }
 }
 
-export default user
\ No newline at end of file
+export default user
diff --git a/src/utils/hasPermission.js b/src/utils/hasPermission.js
index 81df262..4f4691b 100644
--- a/src/utils/hasPermission.js
+++ b/src/utils/hasPermission.js
@@ -4,7 +4,7 @@ const hasPermission = {
     install (Vue, options) {
           Vue.directive('has', {
             inserted: (el, binding, vnode)=>{
-              // console.log('binding=====',binding.value)
+              // console.log('binding=====',binding)
               if(binding.arg){
                 binding.value = binding.arg
                 // console.log(  binding.value ,'  binding.value =================')

From c75e127df0837fd6fd26ebaa5dd0439f067d3190 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 21:03:51 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=99=BD=E5=90=8D=E5=8D=95=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/permission.js b/src/permission.js
index f556a66..95e9355 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@ import { generateIndexRouter } from '@/utils/util'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signUpEntrance','/signUpPage'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signupentrance','/signUpPage'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   if (to.query.token) {

From e5ef08fcbc3ea408440f40e82e3ed21399c73371 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:26:37 +0800
Subject: [PATCH 13/18] =?UTF-8?q?[bug]=20=E5=AE=A1=E6=A0=B8=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E4=BA=86=E4=B8=8A=E4=B8=AA=E5=AE=A1=E6=A0=B8=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenueContract/modules/RevenueContractAduitModule.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
index fca0949..a5d2488 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
@@ -114,6 +114,8 @@ export default {
       this.close()
     },
     open() {
+      this.showExplainRemarks = false
+      this.form.resetFields()
       let userInfo = Vue.ls.get(USER_INFO)
       console.log(userInfo)
       this.model.userName = userInfo.realname
@@ -123,6 +125,8 @@ export default {
       })
     },
     close() {
+      this.showExplainRemarks = false
+      this.form.resetFields()
       this.visible = false
     },
     /**

From 237690c38e796a07efc32140924ff5989971a21a Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:53:54 +0800
Subject: [PATCH 14/18] =?UTF-8?q?[bug]=20=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=9C=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84<br/>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeroListMixin.js                   | 46 +++++++++++++------
 .../businessManagement/BusinessManagement.vue | 12 ++++-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 64a76bb..a458fec 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -197,7 +197,11 @@ export const JeroListMixin = {
                 that.loadData()
                 that.onClearSelected()
               } else {
-                that.$message.warning(res.message)
+                if (res.message.indexOf('<br/>') > -1) {
+                  that.messageLineFeed('删除失败', res.message)
+                } else {
+                  that.$message.warning(res.message)
+                }
               }
             }).finally(() => {
               that.loading = false
@@ -225,7 +229,11 @@ export const JeroListMixin = {
               }
               that.loadData()
             } else {
-              that.$message.warning(res.message)
+              if (res.message.indexOf('<br/>') > -1) {
+                that.messageLineFeed('删除失败', res.message)
+              } else {
+                that.$message.warning(res.message)
+              }
             }
           })
         }
@@ -322,19 +330,7 @@ export const JeroListMixin = {
           }
           this.loadData()
         } else {
-          const messageArr = info.file.response.message.split('<br/>')
-          let htmlDom = []
-          messageArr.map(tt => {
-            if (tt) {
-              htmlDom.push((<div>{tt}</div>))
-            }
-          })
-          this.$warning({
-            title: '文件导入错误',
-            content: (h) => <div>
-              {htmlDom}
-            </div>
-          })
+          this.messageLineFeed('文件导入错误', info.file.response.message)
           // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
         }
       } else if (info.file.status === 'error') {
@@ -386,6 +382,26 @@ export const JeroListMixin = {
       let url = getFileAccessHttpUrl(text)
       window.open(url)
     },
+    /**
+     * 对包含<br/>的后端错误信息进行处理
+     * @param title
+     * @param content
+     */
+    messageLineFeed(title, content) {
+      const messageArr = content.split('<br/>')
+      let htmlDom = []
+      messageArr.map(tt => {
+        if (tt) {
+          htmlDom.push((<div>{tt}</div>))
+        }
+      })
+      this.$warning({
+        title: title,
+        content: (h) => <div>
+          {htmlDom}
+        </div>
+      })
+    }
   }
 
 }
diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue
index 62cd0c7..2710066 100644
--- a/src/views/businessManagement/BusinessManagement.vue
+++ b/src/views/businessManagement/BusinessManagement.vue
@@ -220,7 +220,11 @@ export default {
                   }
                   that.loadData()
                 } else {
-                  that.$message.warning(res.message)
+                  if (res.message.indexOf('<br/>') > -1) {
+                    that.messageLineFeed('删除失败', res.message)
+                  } else {
+                    that.$message.warning(res.message)
+                  }
                 }
               })
             }
@@ -267,7 +271,11 @@ export default {
                     that.loadData()
                     that.onClearSelected()
                   } else {
-                    that.$message.warning(res.message)
+                    if (res.message.indexOf('<br/>') > -1) {
+                      that.messageLineFeed('删除失败', res.message)
+                    } else {
+                      that.$message.warning(res.message)
+                    }
                   }
                 }).finally(() => {
                   that.loading = false

From 8cb7b6ebdb39c10ca7ce3ddd5a6c2eb62c2cfd57 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 15:25:29 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=9A=84=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=20=E8=BF=94=E5=9B=9E=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/Attendance.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index e3de30b..adeba89 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -618,9 +618,9 @@ export default {
     signUpHerfUrl() {
       return `${ window._CONFIG['singUpQRCodeURL'] }?id=${ this.$route.query.id }`
     },
-    // 签到地址 只给一个会议id
+    // 签到地址 只给一个会议id 加前缀是为了区分 小程序的扫码签到是否扫描的是签到二维码
     signInUrl() {
-      return this.$route.query.id
+      return `scanSign=${this.$route.query.id}`
     }
   },
   methods: {

From db698541a789bf38163dfdb416f480cedb8faa88 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 15:58:41 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=8A=A5=E5=90=8D=E5=85=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/signUp/SignUpEntrance.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index c8dde4a..096c386 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -121,7 +121,13 @@ export default {
     }
   },
   async mounted() {
-    this.singUpQRCode = await this.generateQRCode('123')
+    this.singUpQRCode = await this.generateQRCode(this.signUpHerfUrl)
+  },
+  computed:{
+    // 报名链接
+    signUpHerfUrl() {
+      return `${ window._CONFIG['singUpQRCodeURL'] }?id=${this.meetingId}`
+    },
   },
   methods: {
     /*

From 24c08084f9a428d2da8cbc7c6acd6f2ef44eafc8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 16:19:36 +0800
Subject: [PATCH 17/18] =?UTF-8?q?[bug]=20=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index f94e6ac..6fc16fc 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -26,7 +26,7 @@
         </a-col>
       </a-row>
       <!--      来款方式为合同的显示-->
-      <a-row :gutter="24" v-if="!!basicInfo.contractNum">
+      <a-row :gutter="24" v-if="basicInfo.chargeWay === 2">
         <a-col :span="12" class="detail-item">
           <label>{{ createIncomeType(basicInfo.projectType) }}：</label>
           <span>{{ basicInfo.chargeWay_dictText }}</span>
@@ -356,8 +356,6 @@ export default {
       } else {
         return '缴费方式'
       }
-
-
     }
   }
 }

From 63e477fc6471531dcb1d28ca28c93cfa99dc5010 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 16:43:32 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=9D=83=E9=99=90=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/SignUpInfoEdit.vue             | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index a4aa967..9e4c2c9 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -204,9 +204,34 @@ export default {
       meetingType: '',
       // 会议费用是否为0
       meetingCostBool:false,
-      url:{
-        add:'/meeting/payMeetingSituation/add',
-        edit:'/meeting/payMeetingSituation/edit'
+      // url:{
+      //   add:'/meeting/payMeetingSituation/add',
+      //   edit:'/meeting/payMeetingSituation/edit'
+      // },
+      // 其他会议的url
+      otherMeetingUrl: {
+        add: '/meeting/ohterMeetingSituation/add',
+        edit:'/meeting/ohterMeetingSituation/edit'
+      },
+      // 分标委会议的url
+      committeeMeetingUrl: {
+        add: '/meeting/committeeMeetingSituation/add',
+        edit:'/meeting/committeeMeetingSituation/edit'
+      },
+      // 国际研讨会的url
+      internalMeetingUrl: {
+        add: '/meeting/internalMeetingSituation/add',
+        edit:'/meeting/internalMeetingSituation/edit'
+      },
+      // 标协会议的url
+      standardsMeetingUrl: {
+        add: '/meeting/standardsMeetingSituation/add',
+        edit:'/meeting/standardsMeetingSituation/edit'
+      },
+      // 工作组会议的url
+      workGroupMeetingUrl: {
+        add: '/meeting/workGroupMeetingSituation/add',
+        edit:'/meeting/workGroupMeetingSituation/edit'
       },
       title:'添加参会人',
     }
@@ -229,6 +254,23 @@ export default {
     }
 
   },
+  computed:{
+    // eslint-disable-next-line
+    url() {
+      switch (this.$route.query.meetingType) {
+        case '1':
+          return this.workGroupMeetingUrl
+        case '2':
+          return this.standardsMeetingUrl
+        case '3':
+          return this.internalMeetingUrl
+        case '4':
+          return this.otherMeetingUrl
+        case '5':
+          return this.committeeMeetingUrl
+      }
+    },
+  },
   methods: {
     addContactsOk() {
       this.$refs.selectContacts.getContactsList()