From 076406809cc339f3593f8a518db82e9c202755fc Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Apr 2022 14:25:13 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8F=98=E6=9B=B4]=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E8=AE=BE=E7=BD=AE=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C=EF=BC=8C=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5=E5=BC=B9=E7=AA=97=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=B8=85=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkingGroupMemberUnitMaintenance.vue     | 35 ++++++++++---------
 .../WorkingGroupMemberSetChargeNotice.vue     | 12 ++++---
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 99def6d..793f91d 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -62,7 +62,7 @@
                 <j-dict-select-tag v-model="queryParam.pack"
                                    placeholder="请选择是否打包"
                                    dictCode="yn"
-                                    />
+                />
               </a-form-item>
             </a-col>
 
@@ -379,7 +379,7 @@ export default {
         id: this.workingGroupProjectId
       }
       getWorkingGroupById(param).then(res => {
-        if(res.success) {
+        if (res.success) {
           this.workingGroupDetail = res.result || {}
         }
       }).finally(() => {
@@ -446,21 +446,22 @@ export default {
         this.$message.warn('请先选择成员')
         return
       }
-      let param = {
-        ids: this.selectedRowKeys.join(','),
-        workingGroupId: this.workingGroupProjectId
-      }
+      // 2022-04-26 变更：不校验来款是否是收费通知
+      // let param = {
+      //   ids: this.selectedRowKeys.join(','),
+      //   workingGroupId: this.workingGroupProjectId
+      // }
       // 判断选中的成员是否存在来款方式非收费通知的
-      getChargeNotice(param).then(res => {
-        if (res.success) {
-          this.getChargeNoticeList()
-          this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList
-          this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys
-          this.$refs.setChargeNotic.handleOpen()
-        } else {
-          this.$message.warn(res.message)
-        }
-      })
+      // getChargeNotice(param).then(res => {
+      //   if (res.success) {
+      this.getChargeNoticeList()
+      this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList
+      this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys
+      this.$refs.setChargeNotic.handleOpen()
+      // } else {
+      //   this.$message.warn(res.message)
+      // }
+      // })
     },
     /**
      * 催款提醒
@@ -502,7 +503,7 @@ export default {
       if (file && file.url) {
         const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ file.id }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ file.fileName }`
         // let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }`
-        let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
+        let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
         window.open(url)
       }
     }
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
index 7451f9a..0e9fcb2 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
@@ -84,7 +84,7 @@ import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgMo
 
 export default {
   name: 'WorkingGroupMemberSetChargeNotice',
-  components: { JUpload ,EmailErrorMsgModal},
+  components: { JUpload, EmailErrorMsgModal },
   data() {
     return {
       title: '设置收费通知',
@@ -135,11 +135,11 @@ export default {
             if (res.success) {
               this.$message.success(res.message)
               // 是否有邮件发送失败 有就给出提示信息
-              if(Array.isArray(res.result) && res.result.length > 0){
+              if (Array.isArray(res.result) && res.result.length > 0) {
                 // msgWarn(this,res.result,0)
                 that.$refs.emailError.open()
                 that.$refs.emailError.msgList = res.result
-                console.log(that.$refs.emailError.msgList ,'that.$refs.emailError.msgList ')
+                console.log(that.$refs.emailError.msgList, 'that.$refs.emailError.msgList ')
 
               }
               this.$emit('ok')
@@ -159,6 +159,10 @@ export default {
     close() {
       this.visible = false
       this.model = {}
+      this.form.resetFields()
+      this.selectedRowKeys = null
+      this.chargeNoticeList = null
+      this.selectedChargeNotice = null
     },
     /**
      * 收费通知号变化, 回显本年应收款和文件
@@ -178,7 +182,7 @@ export default {
           this.model.receivableAmount = item.yearCharge
           this.model.chargeNoticeId = item.chargeNoticeId
           this.model.chargeNoticeNo = item.value
-        } else if (item.type === 'chargeNoticeB' && key === 'b'){
+        } else if (item.type === 'chargeNoticeB' && key === 'b') {
           this.selectedChargeNotice = 'B'
           this.model.receivableAmount = item.yearCharge
           this.model.chargeNoticeId = item.chargeNoticeId