From 600b4408c4df40767247b05377eb539769a556b1 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 31 Aug 2021 11:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  6 +++++
 src/store/index.js                            |  2 +-
 .../memberManage/SafeguardMemberList.vue      | 20 +++++++++++---
 .../modules/SafeguardMemberModal.vue          | 27 +++++++++++++------
 src/views/system/DepartList.vue               |  2 +-
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 27eb79e..3ea9263 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -63,3 +63,9 @@
 .ant-table-tbody .ant-table-row td .action-span-cell a + a{
   padding-left: 20px;
 }
+
+
+.primary-color{
+  color: #069f99;
+  cursor: pointer;
+}
diff --git a/src/store/index.js b/src/store/index.js
index 322186a..eee9ba5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,7 +19,7 @@ export default new Vuex.Store({
     online
   },
   state: {
-    // 当前的项目
+    // 当前的会员项目
     currentProjetcInfo:{}
   },
   mutations: {
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index f6487e4..c00d160 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -20,7 +20,7 @@
             <label>收费通知号:</label><span>{{ currentInfo.chargeNoticeNo }}</span>
           </a-col>
           <a-col :xl="5" :lg="4" :md="4" :sm="8">
-            <label>收费通知:</label><span>{{ currentInfo.chargeNoticeFileId }}</span>
+            <label>收费通知:</label><span class="color_blue">{{ currentInfo.fileName }}</span>
           </a-col>
           <a-col :xl="8" :lg="8" :md="8" :sm="24">
             <label>备注:</label><span>{{ currentInfo.remark }}</span>
@@ -109,6 +109,7 @@ import JYearDate from "@comp/jero/JYearDate";
 import SafeguardMemberModal from "@views/incomePayments/memberManage/modules/SafeguardMemberModal";
 import ProjectDetailModal from "@comp/ProjectDetailModal";
 import {getAction} from "@api/manage";
+import {getFileInfo} from "@api/api";
 
 export default {
   name: "SafeguardMemberList",
@@ -206,11 +207,10 @@ export default {
     this.currentInfo = Object.assign({}, JSON.parse(this.$route.query.record))
     console.log("=====", this.currentInfo)
     this.$store.commit('SET_CURRENTPROJECT', this.currentInfo)
-    this.filters.projectId = this.currentInfo.id
     this.loadData();
     //初始化字典配置 在自己页面定义
     this.initDictConfig();
-
+    this.getChargeNoFile()
   },
   methods: {
     /*
@@ -234,6 +234,8 @@ export default {
       if (arg === 1) {
         this.ipagination.current = 1;
       }
+      //  传入项目id 查寻该项目下的成员
+      this.filters.projectId = this.currentInfo.id
       var params = this.getQueryParams();//查询条件
       this.loading = true;
       getAction(this.url.list, params).then((res) => {
@@ -257,7 +259,17 @@ export default {
         this.loading = false
       })
     },
-
+    /*
+    *  通过文件id拿到文件信息
+    * */
+    getChargeNoFile(){
+      getFileInfo({id:this.currentInfo.chargeNoticeFileId}).then(res => {
+        if(res.success){
+          // 记录收费通知文件名称
+          this.currentInfo.fileName = res.result.fileName
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 87636ac..54b07df 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -71,7 +71,7 @@
             </a-form-item>
           </a-col>
           <!--  incomePaysType 2 是合同·-->
-          <a-col :xl="12" :sm="24" v-if="incomePaysType === '2'">
+          <a-col :xl="12" :sm="24" v-if="incomePaysType === 2">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入合同号"
                        :maxLength='50'
@@ -81,7 +81,7 @@
           </a-col>
         </a-row>
         <!--  incomePaysType 3  是收费通知·-->
-        <a-row :gutter="24" v-if="incomePaysType === '3' ">
+        <a-row :gutter="24" v-if="incomePaysType === 3 ">
           <a-col :xl="12" :sm="24">
             <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入收费通知号"
@@ -195,9 +195,11 @@ export default {
 
       },
       // 来款方式
-      incomePaysType: '',
+      incomePaysType:3,
       // 选中的会员单位
       selectedCompany: null,
+      timer:null,
+      baseInfo:this.$store.state.currentProjetcInfo,
       url: {
         add: "/jero/memberProjectSubitem/add",
         edit: "/jero/memberProjectSubitem/edit",
@@ -209,10 +211,20 @@ export default {
       this.edit({})
     },
     edit(record) {
+      // 清除定时器
+      if(this.timer){
+        clearTimeout(this.timer)
+      }
       this.form.resetFields()
+      // 如果没有id 就是新增 新增需要将上级的项目收费通知与文件回显
+      if(!record.hasOwnProperty('id')){
+        // 加定时器是因为第一次赋值不成功
+        this.timer = setTimeout( () => {
+          this.form.setFieldsValue({'chargeNoticeFileId':this.baseInfo.chargeNoticeFileId,'chargeNoticeNo':this.baseInfo.chargeNoticeNo})
+        },100)
+      }
       this.model = Object.assign({}, record)
       this.visible = true
-      // 获取初始值 用于判断显示隐藏元素
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'companyId', 'companyContactId', 'postContactId', 'amountReceivable', 'needInvoice', 'paymentMethod', 'contractNo', ' chargeNoticeNo', 'chargeNoticeFileId', 'remark'))
       })
@@ -220,6 +232,7 @@ export default {
     close() {
       this.$emit('close')
       this.visible = false
+      clearTimeout(this.timer)
     },
     handleOk() {
       const that = this
@@ -230,15 +243,13 @@ export default {
           let method = ''
           if (!this.model.id) {
             httpurl += this.url.add
-            method = 'post'
           } else {
             httpurl += this.url.edit
-            method = 'put'
           }
           const formData = Object.assign(this.model, values)
           formData.companyId = values.companyId.id
           formData.projectId = this.$store.state.currentProjetcInfo.id
-          httpAction(httpurl, formData, method).then((res) => {
+          httpAction(httpurl, formData, 'post').then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.$emit('ok')
@@ -256,7 +267,7 @@ export default {
     *  来款方式
     * */
     changePaymentMethod(e) {
-      this.incomePaysType = e.target.value + ''
+      this.incomePaysType = e.target.value
     },
     /*
     *  选择会员单位
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 83098c2..21d26c5 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -365,7 +365,7 @@ export default {
           title: '确认删除',
           content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?',
           onOk: function () {
-            deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+            getAction(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.loadTree()