[update] 标协会员的基本信息的交互；标协会员模块上传组件的修改；

src/api/standardsAssociationApi.js

@@ -9,7 +9,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 const TokenKey = 'X-Access-Token'
 // 标协会员-基本信息-调用来款系统的接口
-const queryCommonProjectById = (param) => incomeGetAction('/project/payCommonProject/queryCompanyById', param)
+const getMemberBaseInfo = (param) => incomeGetAction('/company/payContactsManagement/baseInfo', param)
 
 // pdf预览网址
 const previewPdf = (file) => {
@@ -60,8 +60,9 @@ const getCertificateById = (params) => getAction('/vinCertificate/vinCertificate
 
 /****证书缴费 列表页所用接口-结束 ****/
 
+
 export {
-  queryCommonProjectById,
+  getMemberBaseInfo,
   queryApprovalNo,
   previewPdf,
   getEncryptedString,
@@ -78,5 +79,6 @@ export {
   getByMemberTime,
   downNewestNotice,
 
-  getCertificateById
+  getCertificateById,
+
 }

src/components/standardsAssociation/JUpload.vue

@@ -52,8 +52,8 @@
 
 import Vue from 'vue'
 import {ACCESS_TOKEN} from '@/store/mutation-types'
-import {getFileAccessHttpUrl, downloadFile} from '@/api/manage'
-import {getFileInfo} from '@/api/api'
+import {getFileAccessHttpUrl, downloadFile} from '@/api/memberManage'
+import {getFilesByIds} from '@/api/standardsAssociationApi'
 
 // eslint-disable-next-line no-undef
 // const Base64 = require('js-base64').Base64
@@ -260,7 +260,7 @@ export default {
       if (this.returnId) {
         for (let a = 0; a < uploadFiles.length; a++) {
           if (uploadFiles[a].status === 'done') {
-            arr.push(uploadFiles[a].response.result.id)
+            arr.push((uploadFiles[a].response || {}).message)
           } else {
             return
           }
@@ -332,7 +332,8 @@ export default {
           fileList = fileList.map((file) => {
             if (file.response) {
               // let reUrl = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`;
-              file.url = getFileAccessHttpUrl(file.response.result.id)
+              file.url = getFileAccessHttpUrl(file.response.message)
+              file.fileName = file.name
             }
             return file
           })
@@ -399,9 +400,9 @@ export default {
     getFileInfo(id) {
       return new Promise(resolve => {
         let result = {}
-        getFileInfo({id: id}).then(res => {
+        getFilesByIds({ids: id}).then(res => {
           if (res.success) {
-            result = res.result
+            result = res.result[0]
           }
         }).finally(() => {
           resolve(result)
@@ -429,7 +430,8 @@ export default {
      * @param file
      */
     myDownload(file) {
-      downloadFile(`sys/common/download/${file.response.result.id}`, file.name)
+      console.log('file--------', file)
+      downloadFile(`sys/common/static/${file.response.result.id}`, file.name)
     },
     /**
      * 单个文件的预览功能
@@ -437,7 +439,7 @@ export default {
      */
     myPreview(file) {
       if (file && file.url) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/static/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
         let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)

src/views/standardsAssociation/BasicInfo.vue

@@ -1,59 +1,65 @@
 <template>
-  <div class="main-box member-basic-info">
-    <div class="panel-cell">
-      <div class="title">秘书处信息</div>
-      <div class="content">
-        <div class="info-row">
-          <span class="label-span">地址：</span>
-          <span class="value-span">{{ secretariatInfo.address }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">联系人：</span>
-          <span class="value-span">{{ secretariatInfo.contactPerson }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">联系人电话：</span>
-          <span class="value-span">{{ secretariatInfo.contactPhone }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">联系人邮箱：</span>
-          <span class="value-span">{{ secretariatInfo.contactMail }}</span>
-        </div>
-      </div>
+
+    <div class="main-box member-basic-info">
+     <a-spin :spinning="isLoading">
+       <div class="panel-cell">
+         <div class="title">秘书处信息</div>
+         <div class="content">
+           <div class="info-row">
+             <span class="label-span">地址：</span>
+             <span class="value-span">{{ secretariatInfo.address }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">联系人：</span>
+             <span class="value-span">{{ secretariatInfo.contactPerson }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">联系人电话：</span>
+             <span class="value-span">{{ secretariatInfo.contactPhone }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">联系人邮箱：</span>
+             <span class="value-span">{{ secretariatInfo.contactMail }}</span>
+           </div>
+         </div>
+       </div>
+       <div class="panel-cell">
+         <div class="title">本企业信息</div>
+         <div class="content">
+           <div class="info-row">
+             <span class="label-span">企业名称：</span>
+             <span class="value-span">{{ memberInfo.companyName }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">企业管理员：</span>
+             <span class="value-span">{{ memberInfo.contactPerson }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">管理员电话：</span>
+             <span class="value-span">{{ memberInfo.contactPhone }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">管理员邮箱：</span>
+             <span class="value-span">{{ memberInfo.contactMail }}</span>
+           </div>
+           <div class="info-row">
+             <span class="label-span">会员有效期：</span>
+             <span class="value-span">{{ memberInfo.validDate }}</span>
+           </div>
+         </div>
+       </div>
+     </a-spin>
     </div>
-    <div class="panel-cell">
-      <div class="title">本企业信息</div>
-      <div class="content">
-        <div class="info-row">
-          <span class="label-span">企业名称：</span>
-          <span class="value-span">{{ memberInfo.companyName }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">企业管理员：</span>
-          <span class="value-span">{{ memberInfo.contactPerson }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">管理员电话：</span>
-          <span class="value-span">{{ memberInfo.contactPhone }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">管理员邮箱：</span>
-          <span class="value-span">{{ memberInfo.contactMail }}</span>
-        </div>
-        <div class="info-row">
-          <span class="label-span">会员有效期：</span>
-          <span class="value-span">{{ memberInfo.memberTerm }}</span>
-        </div>
-      </div>
-    </div>
-  </div>
 </template>
 
 <script>
+import { getMemberBaseInfo } from '../../api/standardsAssociationApi'
+
 export default {
   name: 'BasicInfo',
   data() {
     return {
+      isLoading: false,
       // 秘书处信息
       secretariatInfo: {
         address: '东丽区', // 地址
@@ -67,15 +73,35 @@ export default {
         contactPerson: '', //  企业管理员
         contactPhone: '', //  管理员电话
         contactMail: '', //  管理员邮箱
-        memberTerm: 'xxxx年xx月xx日到xxxx年xx月xx日' //  会员有效期
+        validDate: 'xxxx年xx月xx日到xxxx年xx月xx日' //  会员有效期
       }
     }
   },
   methods: {
     // 获得会员相关数据的字段
     getBasicInfo() {
-
+      this.isLoading = true
+      getMemberBaseInfo({}).then(res => {
+        if(res.success) {
+          const secretariatInfo = res.result.tbContacts || {}
+          this.secretariatInfo.address = secretariatInfo.address || '天津市东丽开发区先锋东路68号'
+          this.secretariatInfo.contactPerson = res.result.secretariat.realname || '郭琳'
+          this.secretariatInfo.contactPhone = secretariatInfo.telephone
+          this.secretariatInfo.contactMail = secretariatInfo.email
+          const memberInfo = res.result.memberInfo || {}
+          this.memberInfo.companyName = memberInfo.companyName
+          this.memberInfo.contactPerson = memberInfo.liaisonMan
+          this.memberInfo.contactPhone = memberInfo.mobile
+          this.memberInfo.contactMail = memberInfo.email
+          this.memberInfo.validDate = memberInfo.validDate
+        }
+      }).finally(() => {
+        this.isLoading = false
+      })
     }
+  },
+  created() {
+    this.getBasicInfo()
   }
 }
 </script>
@@ -84,14 +110,16 @@ export default {
 @import '~@assets/less/common.less';
 
 .member-basic-info {
-  position: relative;
   margin-bottom: 20px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
   font-size: 14px;
   color: #999;
   opacity: 1;
+  /deep/.ant-spin-container{
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
 
   .panel-cell {
     flex: 1;

src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue

@@ -146,6 +146,7 @@
                   :number="1"
                   :disabled="checkFlag||detailFlag"
                   bizPath="payment"
+                  :return-id="true"
                   v-decorator="['paymentRecord',{ rules: validatorRules.paymentRecord1.rules, initialValue:paymentRecord}]"
                   :trigger-change="true">
                 </j-upload>

src/views/standardsAssociation/memberInfo/CertificateInfo.vue

@@ -136,6 +136,7 @@ export default {
           align: 'center',
           dataIndex: 'certificateStatus',
           customRender: function(text) {
+            text = Number(text)
             if (text === 1) {
               return '已绑定'
             } else if (text === 2) {

src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue

@@ -920,7 +920,7 @@ import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
 // import { RangeDateMixin } from '@/mixins/RangeDateMixin'
 // import ChangeCompanyModal from '@views/member/memberInfo/modules/ChangeCompanyModal'
 // import PreViewImgModal from '@views/member/paymentInfo/modules/PreViewImgModal'
-import { downApproveFile } from '@api/api'
+import { downApproveFile } from '@/api/api'
 
 export default {
   name: 'MemberInfoModal',

src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue

@@ -3540,6 +3540,7 @@ export default {
                   that.$emit('ok')
                   that.close()
                 } else {
+                  that.$message.warning(res.message)
                   that.loadData()
                 }
               })