From 17d02b2c34d6ae9ff424061d68c87c231b38f91c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 27 Aug 2021 11:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=20jupload=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JUpload.vue               | 85 ++++++++++++-------
 .../memberManage/MemberProjectList.vue        |  6 +-
 .../memberManage/SafeguardMemberList.vue      |  4 +-
 .../modules/MemberProjectModal.vue            |  8 +-
 .../modules/SafeguardMemberModal.vue          |  1 -
 5 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue
index 3aa98e2..4b526b3 100644
--- a/src/components/jero/JUpload.vue
+++ b/src/components/jero/JUpload.vue
@@ -52,36 +52,36 @@
         uploadGoOn:true,
       }
     },
-    props:{
-      text:{
-        type:String,
-        required:false,
-        default:"点击上传"
+    props: {
+      text: {
+        type: String,
+        required: false,
+        default: "点击上传"
       },
-      fileType:{
-        type:String,
-        required:false,
-        default:FILE_TYPE_ALL
+      fileType: {
+        type: String,
+        required: false,
+        default: FILE_TYPE_ALL
       },
       /*这个属性用于控制文件上传的业务路径*/
-      bizPath:{
-        type:String,
-        required:false,
-        default:"temp"
+      bizPath: {
+        type: String,
+        required: false,
+        default: "temp"
       },
-      value:{
-        type:[String,Array],
-        required:false
+      value: {
+        type: [String, Array],
+        required: false
       },
       // update-begin- --- author:wangshuai ------ date:20190929 ---- for:Jupload组件增加是否能够点击
-      disabled:{
-        type:Boolean,
-        required:false,
+      disabled: {
+        type: Boolean,
+        required: false,
         default: false
       },
       // update-end- --- author:wangshuai ------ date:20190929 ---- for:Jupload组件增加是否能够点击
       //此属性被废弃了
-      triggerChange:{
+      triggerChange: {
         type: Boolean,
         required: false,
         default: false
@@ -91,19 +91,29 @@
        * true：仅返回url
        * false：返回fileName filePath fileSize
        */
-      returnUrl:{
-        type:Boolean,
-        required:false,
+      returnUrl: {
+        type: Boolean,
+        required: false,
         default: true
       },
-      number:{
-        type:Number,
-        required:false,
-        default: 0
-      },
-      buttonVisible:{
+      /**
+      *  仅返回文件id
+       *  true 仅返回文件id
+       *  false 返回reurl
+      * */
+      returnId:{
         type:Boolean,
         required:false,
+        default: false
+      },
+      number: {
+        type: Number,
+        required: false,
+        default: 0
+      },
+      buttonVisible: {
+        type: Boolean,
+        required: false,
         default: true
       },
     },
@@ -181,10 +191,27 @@
       handlePathChange(){
         let uploadFiles = this.fileList
         let path = ''
+        // 文件id
+        let fileIds = ''
         if(!uploadFiles || uploadFiles.length==0){
           path = ''
         }
         let arr = [];
+        // 如果returnid为true 只返回id
+        if(this.returnId){
+          for(var a=0;a<uploadFiles.length;a++){
+            if(uploadFiles[a].status === 'done' ) {
+              arr.push(uploadFiles[a].response.result.id)
+            }else{
+              return;
+            }
+          }
+          if(arr.length>0){
+            fileIds = arr.join(",")
+          }
+          this.$emit('change', fileIds);
+          return
+        }
 
         for(var a=0;a<uploadFiles.length;a++){
           if(uploadFiles[a].status === 'done' ) {
diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue
index 757b959..8a53a41 100644
--- a/src/views/incomePayments/memberManage/MemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/MemberProjectList.vue
@@ -28,7 +28,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('混淆表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('会员项目')">导出</a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
       <!--                @change="handleImportExcel">-->
@@ -107,7 +107,7 @@ export default {
         {
           title: '收费标准',
           align: "center",
-          dataIndex: 'chargStandard',
+          dataIndex: 'chargeStandard',
 
         },
         {
@@ -155,7 +155,7 @@ export default {
 <style scoped lang="less">
 @import '~@assets/less/common.less';
 .color_blue {
-  color: dodgerblue;
+  color: #069f99;
   cursor: pointer;
 }
 </style>
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 57428f4..e4e1a4b 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -14,7 +14,7 @@
             <label>负责人:</label><span>{{currentInfo.directorName}}</span>
           </a-col>
           <a-col :xl="5" :lg="4" :md="4" :sm="8">
-            <label>收费标准:</label><span>{{currentInfo.chargStandard}}</span>
+            <label>收费标准:</label><span>{{currentInfo.chargeStandard}}</span>
           </a-col>
           <a-col :xl="4" :lg="4" :md="4" :sm="8">
             <label>收费通知号:</label><span>{{currentInfo.chargeNoticeNo}}</span>
@@ -234,7 +234,7 @@ export default {
 }
 
 .color_blue {
-  color: dodgerblue;
+  color:  #069f99;
   cursor: pointer;
 }
 .btn-arrow-left {
diff --git a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
index 5c75734..2e8c2c9 100644
--- a/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
+++ b/src/views/incomePayments/memberManage/modules/MemberProjectModal.vue
@@ -38,7 +38,7 @@
             <a-form-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入收费标准"
                        :maxLength='50'
-                       v-decorator="[ 'chargStandard']"
+                       v-decorator="[ 'chargeStandard']"
                        @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
               <span class="yuan">元</span>
             </a-form-item>
@@ -55,7 +55,7 @@
         <a-row>
           <a-col :span="12">
             <a-form-item label="收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1"
+              <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1"  :return-id="true"
                         bizPath="payment" v-decorator="['chargeNoticeFileId']"
                         :trigger-change="true"></j-upload>
             </a-form-item>
@@ -147,7 +147,7 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'projectName', 'particularYear', 'chargeNoticeNo', 'chargeNoticeFileId','chargStandard','remark'))
+        this.form.setFieldsValue(pick(this.model, 'projectName', 'particularYear', 'chargeNoticeNo','directorId', 'chargeNoticeFileId','chargeStandard','remark'))
       })
     },
     close() {
@@ -166,7 +166,7 @@ export default {
             method = 'post'
           } else {
             httpurl += this.url.edit
-            method = 'put'
+            method = 'post'
           }
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 9b19de6..de6f3c5 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -307,7 +307,6 @@ export default {
     * */
     addContacts() {
       if (this.selectedCompany.id) {
-        debugger
         this.$refs.contactForm.add()
         this.$refs.contactForm.title = "新增";
         this.$refs.contactForm.disableSubmit = false;