@@ -1,7 +1,6 @@ | |||||
import HttpRequest from '@/libs/axios' | import HttpRequest from '@/libs/axios' | ||||
import config from '@/config' | import config from '@/config' | ||||
// const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro | |||||
const baseUrl = '/api' | |||||
const baseUrl = process.env.NODE_ENV === 'development' ? '/api' : config.baseUrl.pro | |||||
const axios = new HttpRequest(baseUrl) | const axios = new HttpRequest(baseUrl) | ||||
export default axios | export default axios |
@@ -75,7 +75,7 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
this.total = res.data.total | |||||
this.total = Number(res.data.total) | |||||
this.dataList.map((item) => { | this.dataList.map((item) => { | ||||
item.publishTime = this.$moment().format("YYYY-MM-DD") | item.publishTime = this.$moment().format("YYYY-MM-DD") | ||||
}) | }) | ||||
@@ -42,7 +42,8 @@ export default { | |||||
return { | return { | ||||
titleList: [], | titleList: [], | ||||
activeIndex: 0, | activeIndex: 0, | ||||
dataList: [] | |||||
dataList: [], | |||||
total: 0 | |||||
} | } | ||||
}, | }, | ||||
methods: { | methods: { | ||||
@@ -62,7 +63,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -73,7 +74,10 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
console.log("this.dataList:"+JSON.stringify(this.dataList)) | |||||
this.total = Number(res.data.total) | |||||
this.dataList.map((item,index) => { | |||||
item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD") | |||||
}) | |||||
} | } | ||||
}, | }, | ||||
@@ -48,7 +48,7 @@ | |||||
<script> | <script> | ||||
import {getChannelInformationsRequest, getChannelsRequest, | import {getChannelInformationsRequest, getChannelsRequest, | ||||
getDetailRequest} from "../api/data"; | |||||
getChannelSecond} from "../api/data"; | |||||
export default { | export default { | ||||
data () { | data () { | ||||
@@ -86,7 +86,7 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
this.total = res.data.total | |||||
this.total = Number(res.data.total) | |||||
} | } | ||||
}, | }, | ||||
@@ -66,7 +66,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.titleList = res.data | this.titleList = res.data | ||||
console.log("this.titleList:"+JSON.stringify(res.data)) | console.log("this.titleList:"+JSON.stringify(res.data)) | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -77,7 +77,7 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
this.total = res.data.total | |||||
this.total = Number(res.data.total) | |||||
} | } | ||||
}, | }, | ||||
@@ -120,7 +120,7 @@ export default { | |||||
'handleLogin' | 'handleLogin' | ||||
]), | ]), | ||||
clickItem(index){ | clickItem(index){ | ||||
this.activeIndex = index + 1 | |||||
this.activeIndex = index + 1 + "" | |||||
this.$router.push(this.menuList[index].path) | this.$router.push(this.menuList[index].path) | ||||
this.$forceUpdate() | this.$forceUpdate() | ||||
}, | }, | ||||
@@ -168,10 +168,10 @@ export default { | |||||
}, | }, | ||||
watch: { | watch: { | ||||
'$route' (newRoute) { | '$route' (newRoute) { | ||||
console.log(newRoute) | |||||
// console.log(newRoute) | |||||
this.menuLists.map((item, index) => { | this.menuLists.map((item, index) => { | ||||
if(newRoute.path.indexOf(item.path) > -1){ | if(newRoute.path.indexOf(item.path) > -1){ | ||||
this.activeIndex = index+1 | |||||
this.activeIndex = index+1+"" | |||||
} | } | ||||
}) | }) | ||||
@@ -226,7 +226,6 @@ export default { | |||||
if(path.indexOf('data')>=0){ | if(path.indexOf('data')>=0){ | ||||
this.activeIndex = '12'; | this.activeIndex = '12'; | ||||
} | } | ||||
} | } | ||||
} | } | ||||
</script> | </script> | ||||
@@ -42,7 +42,8 @@ export default { | |||||
return { | return { | ||||
titleList: [], | titleList: [], | ||||
activeIndex: 0, | activeIndex: 0, | ||||
dataList: [] | |||||
dataList: [], | |||||
total: 0 | |||||
} | } | ||||
}, | }, | ||||
methods: { | methods: { | ||||
@@ -62,7 +63,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -73,7 +74,10 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
console.log("this.dataList:"+JSON.stringify(this.dataList)) | |||||
this.total = Number(res.data.total) | |||||
this.dataList.map((item,index) => { | |||||
item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD") | |||||
}) | |||||
} | } | ||||
}, | }, | ||||
@@ -64,7 +64,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -42,7 +42,8 @@ export default { | |||||
return { | return { | ||||
titleList: [], | titleList: [], | ||||
activeIndex: 0, | activeIndex: 0, | ||||
dataList: [] | |||||
dataList: [], | |||||
total: 0 | |||||
} | } | ||||
}, | }, | ||||
methods: { | methods: { | ||||
@@ -62,7 +63,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -73,7 +74,10 @@ export default { | |||||
let res = await getChannelInformationsRequest({channelId: id}) | let res = await getChannelInformationsRequest({channelId: id}) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
console.log("this.dataList:"+JSON.stringify(this.dataList)) | |||||
this.total = Number(res.data.total) | |||||
this.dataList.map((item,index) => { | |||||
item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD") | |||||
}) | |||||
} | } | ||||
}, | }, | ||||
@@ -64,7 +64,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -64,7 +64,7 @@ export default { | |||||
if(res.code == 200){ | if(res.code == 200){ | ||||
// console.log(JSON.stringify(res.data)) | // console.log(JSON.stringify(res.data)) | ||||
this.titleList = res.data | this.titleList = res.data | ||||
if(this.titleList){ | |||||
if(this.titleList && this.titleList[0]){ | |||||
this.getChannelInformationsRequest(this.titleList[0].id) | this.getChannelInformationsRequest(this.titleList[0].id) | ||||
} | } | ||||
@@ -498,7 +498,7 @@ import { ChartBar } from '_c/charts'; | |||||
<tr class="el-table__row"> | <tr class="el-table__row"> | ||||
<td colspan="12" class="el-table__cell" | <td colspan="12" class="el-table__cell" | ||||
style="text-align: left;padding: 5px 10px; "> | style="text-align: left;padding: 5px 10px; "> | ||||
附件1:入会申请表(敲章版) | |||||
附件1:入会申请表(敲章版){{fileName1}} | |||||
<!-- <el-button plain class="text-linear" @click="upload(0)">上传附件</el-button> --> | <!-- <el-button plain class="text-linear" @click="upload(0)">上传附件</el-button> --> | ||||
<el-form :model="form" style="display: inline-block; width: 50px;"> | <el-form :model="form" style="display: inline-block; width: 50px;"> | ||||
@@ -528,7 +528,7 @@ import { ChartBar } from '_c/charts'; | |||||
</tr> | </tr> | ||||
<tr class="el-table__row"> | <tr class="el-table__row"> | ||||
<td colspan="12" class="el-table__cell" style="text-align: left;padding: 5px 10px; "> | <td colspan="12" class="el-table__cell" style="text-align: left;padding: 5px 10px; "> | ||||
附件2:公司营业执照(正或副本)复印件 | |||||
附件2:公司营业执照(正或副本)复印件 {{fileName2}} | |||||
<el-form :model="form" style="display: inline-block; width: 50px;"> | <el-form :model="form" style="display: inline-block; width: 50px;"> | ||||
<!-- <el-form-item label="上传文件" :label-width="formLabelWidth"> --> | <!-- <el-form-item label="上传文件" :label-width="formLabelWidth"> --> | ||||
@@ -537,7 +537,7 @@ import { ChartBar } from '_c/charts'; | |||||
accept="image/png,image/gif,image/jpg,image/jpeg" | accept="image/png,image/gif,image/jpg,image/jpeg" | ||||
:limit=limitNum | :limit=limitNum | ||||
:auto-upload="false" | :auto-upload="false" | ||||
:on-change="fileChange" | |||||
:on-change="fileChange2" | |||||
:on-exceed="exceedFile" | :on-exceed="exceedFile" | ||||
:on-success="handleSuccess" | :on-success="handleSuccess" | ||||
:on-error="handleError" | :on-error="handleError" | ||||
@@ -717,6 +717,9 @@ export default { | |||||
file: '' | file: '' | ||||
}, | }, | ||||
fileList: [], | fileList: [], | ||||
fileName1: '', | |||||
fileName2: '', | |||||
fileType: 1 | |||||
} | } | ||||
}, | }, | ||||
@@ -789,10 +792,14 @@ export default { | |||||
} | } | ||||
}, | }, | ||||
async uploadFileAction(file){ | |||||
async uploadFileAction(file, type){ | |||||
let res = await uploadFileAction(file) | let res = await uploadFileAction(file) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
console.log(JSON.stringify(res)) | |||||
if(type == 1){ | |||||
this.fileName1 = res.data | |||||
}else{ | |||||
this.fileName2 = res.data | |||||
} | |||||
} | } | ||||
}, | }, | ||||
@@ -806,7 +813,15 @@ export default { | |||||
this.form.file = file.raw | this.form.file = file.raw | ||||
console.log(this.form.file) | console.log(this.form.file) | ||||
this.uploadFileAction(this.form.file) | |||||
this.uploadFileAction(this.form.file, 1) | |||||
}, | |||||
fileChange2(file) { | |||||
console.log('change') | |||||
console.log(file) | |||||
this.form.file = file.raw | |||||
console.log(this.form.file) | |||||
this.uploadFileAction(this.form.file, 2) | |||||
}, | }, | ||||
// 文件上传成功时的钩子 | // 文件上传成功时的钩子 | ||||
handleSuccess(res, file, fileList) { | handleSuccess(res, file, fileList) { | ||||
@@ -839,7 +854,7 @@ export default { | |||||
// this.getChannelInformationsRequest(item.id) | // this.getChannelInformationsRequest(item.id) | ||||
}else if(item.channelName == '文件下载'){ | }else if(item.channelName == '文件下载'){ | ||||
this.getChannelInformationsRequest(item.id) | this.getChannelInformationsRequest(item.id) | ||||
}else if(item.channelName == '协会章程'){ | |||||
}else if(item.channelName == '会员介绍'){ | |||||
this.infoId= item.id | this.infoId= item.id | ||||
} | } | ||||
}) | }) | ||||
@@ -852,8 +867,8 @@ export default { | |||||
if(this.activeIndex == 1){ | if(this.activeIndex == 1){ | ||||
this.dataList = res.data.records | this.dataList = res.data.records | ||||
this.InfoObj = {...this.dataList[0]} | this.InfoObj = {...this.dataList[0]} | ||||
console.log(this.InfoObj.publishTime) | |||||
this.InfoObj.publishTime = this.$moment(Number(this.InfoObj.publishTime)).format("YYYY年MM月DD") | |||||
console.log("this.InfoObj"+JSON.stringify(this.InfoObj)) | |||||
this.InfoObj.publishTime = this.$moment(Number(this.InfoObj.publishTime)).format("YYYY年MM月DD日") | |||||
}else if(this.activeIndex == 0){ | }else if(this.activeIndex == 0){ | ||||
this.titleList = res.data.records | this.titleList = res.data.records | ||||
if(this.titleList){ | if(this.titleList){ | ||||
@@ -1127,6 +1142,14 @@ export default { | |||||
p.CUSTOMER_HUIYUANRUHUI_CL_SX = p.CUSTOMER_HUIYUANRUHUI_CL_SX.join(',') | p.CUSTOMER_HUIYUANRUHUI_CL_SX = p.CUSTOMER_HUIYUANRUHUI_CL_SX.join(',') | ||||
} | } | ||||
if(this.fileName1){ | |||||
p.CUSTOMER_HUIYUANRUHUI_FUJIAN1 = this.fileName1 | |||||
} | |||||
if(this.fileName2){ | |||||
p.CUSTOMER_HUIYUANRUHUI_FUJIAN2 = this.fileName2 | |||||
} | |||||
let res = await getProcess(p) | let res = await getProcess(p) | ||||
if(res.code == 200){ | if(res.code == 200){ | ||||
if(res.data.flowNodeVos){ | if(res.data.flowNodeVos){ | ||||