Browse Source

新增等bug

xiaowang-social
是小王呀\24601 1 year ago
parent
commit
fbf6026b25
  1. 3
      src/views/modules/volunteer/Dynamicmanagement/add.vue
  2. 1
      src/views/modules/volunteer/Dynamicmanagement/edit.vue
  3. 3
      src/views/modules/volunteer/Dynamicmanagement/info.vue
  4. 30
      src/views/modules/volunteer/Projectreview/process.vue
  5. 16
      src/views/modules/volunteer/VolManage/enclosure.vue
  6. 2
      src/views/modules/volunteer/VolManage/integral.vue
  7. 5
      src/views/modules/volunteer/VoluntaryOrganization/index.vue
  8. 205
      src/views/modules/volunteer/VoluntaryOrganization/info.vue
  9. 174
      src/views/modules/volunteer/VoluntaryOrganization/process.vue
  10. 2
      src/views/modules/volunteer/VolunteerProjects/index.vue
  11. 25
      src/views/modules/volunteer/activityArchive/add.vue
  12. 11
      src/views/modules/volunteer/activityArchive/index.vue
  13. 10
      src/views/modules/volunteer/activityArchive/process.vue

3
src/views/modules/volunteer/Dynamicmanagement/add.vue

@ -454,8 +454,7 @@
}, },
async handleComfirm() { async handleComfirm() {
if (this.formData.columnId!==0&&this.formData.columnId!==1) {
if (this.formData.columnId!=='0'||this.formData.columnId!=='1') {
this.$message.error('请输入所属项目'); this.$message.error('请输入所属项目');
return; return;
} }

1
src/views/modules/volunteer/Dynamicmanagement/edit.vue

@ -104,7 +104,6 @@
}, },
components: { Tinymce, UploadImage }, components: { Tinymce, UploadImage },
mounted() { mounted() {
this.fileList.push({url:this.formData.coverImg})
console.log(this.$store.state.user,this.EditList,"this.$store.state.user"); console.log(this.$store.state.user,this.EditList,"this.$store.state.user");
this.formData = this.EditList this.formData = this.EditList
this.fileList.push({fileUrl:this.formData.coverImg}) this.fileList.push({fileUrl:this.formData.coverImg})

3
src/views/modules/volunteer/Dynamicmanagement/info.vue

@ -105,7 +105,8 @@
}, },
components: { Tinymce, UploadImage }, components: { Tinymce, UploadImage },
mounted() { mounted() {
this.fileList.push({url:this.formData.coverImg}) this.fileList.push({fileUrl:this.infoList.coverImg})
console.log(this.$store.state.user,this.infoList,"this.$store.state.user"); console.log(this.$store.state.user,this.infoList,"this.$store.state.user");
this.formData = this.infoList this.formData = this.infoList
// this.formData.agencyName=this.$store.state.user.agencyName // this.formData.agencyName=this.$store.state.user.agencyName

30
src/views/modules/volunteer/Projectreview/process.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="height: 600px; overflow-y: scroll;">
<div style="display: flex;white-space: nowrap; padding: 30px;" > <div style="display: flex;white-space: nowrap; padding: 30px;" >
<el-form style="padding-left: 50px;" :label-position="labelPosition" :model="tableData"> <el-form style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
<el-form-item label="申请单位"> <el-form-item label="申请单位">
@ -30,7 +30,7 @@
{{ tableData.serviceTimeFrom }}{{ tableData.serviceTimeTo }} {{ tableData.serviceTimeFrom }}{{ tableData.serviceTimeTo }}
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
<el-button type="text" @click="download()">{{ tableData.datumAttachments[0].name }}</el-button> <el-button type="text" @click="handleShowVoice( tableData.datumAttachments[0].url)">{{ tableData.datumAttachments[0].name }}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="审核"> <el-form-item label="审核">
@ -54,6 +54,23 @@
@click="handleComfirm"> </el-button> @click="handleComfirm"> </el-button>
</div> </div>
<el-dialog :title="'附件'" :visible.sync="showVoice" width="40%" top="5vh" append-to-body class="dialog-h"
:close-on-click-modal="false">
<div class="dialog-h-content scroll-h">
<div style="display: flex; justify-content: center; margin: 50px">
<!-- <video controls>
<source :src="selVideoUrl" type="video/mp4" />
</video> -->
<el-image v-if="selVoiceUrl"
:src="selVoiceUrl" :preview-src-list="[selVoiceUrl]">
</el-image>
</div>
</div>
<div class="resi-btns">
<el-button size="small" @click="showVoice = false">取消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -62,6 +79,8 @@ export default {
name: "see", name: "see",
data() { data() {
return { return {
selVoiceUrl: "",
showVoice: false,
radio:1, radio:1,
auditRemark:"", auditRemark:"",
labelPosition: 'right', labelPosition: 'right',
@ -81,8 +100,11 @@ created() {
// this.awardId=this.list.id // this.awardId=this.list.id
this.getTableData() this.getTableData()
}, },
methods: { methods: { //
// handleShowVoice(url) {
this.selVoiceUrl = url;
this.showVoice = true;
}, //
handleCancle(){ handleCancle(){
this.$emit('handleprocesslClose') this.$emit('handleprocesslClose')
}, },

16
src/views/modules/volunteer/VolManage/enclosure.vue

@ -2,21 +2,15 @@
<div> <div>
<div style="display: flex;white-space: nowrap; padding: 30px ;" > <div style="display: flex;white-space: nowrap; padding: 30px ;" >
<el-form :rules="rules" :model="formData" > <el-form :rules="rules" :model="formData" >
<el-row><el-col :span="12"> <el-row>
<el-form-item label="调整类型" prop="type" >
<el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 200px">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="活动积分" prop="points"> <el-form-item label="积分变更数量" prop="points">
<el-input-number v-model="formData.points" label="描述文字" :step="0.1" :precision="1" ></el-input-number> <el-input-number v-model="formData.points" label="描述文字" :step="1" :precision="1" ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="调整原因" prop="description"> <el-form-item label="备注" prop="description">
<el-input type="textarea" placeholder="请输入活动标题,不超过50子" :height="150" v-model="formData.description" <el-input type="textarea" placeholder="请输入活动标题,不超过50子" :height="150" v-model="formData.description"
maxlength="200" show-word-limit style="width: 555px;"> maxlength="200" show-word-limit style="width: 555px;">
</el-input> </el-input>

2
src/views/modules/volunteer/VolManage/integral.vue

@ -78,6 +78,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="description" header-align="center" align="center" label="备注"> <el-table-column prop="description" header-align="center" align="center" label="备注">
</el-table-column> </el-table-column>
<el-table-column prop="pointsLeft" header-align="center" align="center" label="剩余积分">
</el-table-column>
<!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间"> <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
</el-table-column> </el-table-column>

5
src/views/modules/volunteer/VoluntaryOrganization/index.vue

@ -183,6 +183,7 @@ export default {
handleprocesslClose(){ handleprocesslClose(){
this.showprocess=false this.showprocess=false
this.getTableData()
}, },
// //
handleshowMember(row){ handleshowMember(row){
@ -194,6 +195,7 @@ export default {
// //
MemberManagementClose(){ MemberManagementClose(){
this.showMember=false this.showMember=false
this.getTableData()
}, },
// //
handleEdit(row){ handleEdit(row){
@ -204,6 +206,7 @@ export default {
// //
showEditClose(){ showEditClose(){
this.showEdit=false this.showEdit=false
this.getTableData()
}, },
// //
handleAdd(){ handleAdd(){
@ -350,9 +353,9 @@ export default {
type: 'success', type: 'success',
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.getTableData()
} }
}) })
this.getTableData()
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }

205
src/views/modules/volunteer/VoluntaryOrganization/info.vue

@ -1,107 +1,122 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
class="form"> <el-row>
<el-row> <el-col :span="12">
<el-col :span="12"> <el-form-item label="所属组织" prop="agencyName" label-width="150px">
<el-form-item label="所属组织" prop="agencyName" label-width="150px"> <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true" :disabled="true" class="u-item-width-normal"></el-input>
class="u-item-width-normal"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="组织名称" prop="orgName" label-width="150px">
<el-form-item label="组织名称" prop="orgName" label-width="150px"> <el-input v-model.trim="formData.orgName" size="small" clearable placeholder="请输入活动名称"
<el-input v-model.trim="formData.orgName" size="small" clearable placeholder="请输入活动名称" :disabled="true" :disabled="true" class="u-item-width-normal"></el-input>
class="u-item-width-normal"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="服务类型" label-width="150px" prop="serviceTypeList">
<el-form-item label="服务类型" label-width="150px" prop="serviceTypeList" > <el-select :disabled="true" multiple-limit='4' class="u-item-width-normal"
<el-select :disabled="true" multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.serviceTypeList" placeholder="请选择" clearable multiple> v-model.trim="formData.serviceTypeList" placeholder="请选择" clearable multiple>
<el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" > <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label"
</el-option> :value="item.value">
</el-select> </el-option>
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="组织类型" label-width="150px" prop="orgType" > <el-col :span="12">
<el-select :disabled="true" class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择" clearable > <el-form-item label="组织类型" label-width="150px" prop="orgType">
<el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label" :value="item.value"> <el-select :disabled="true" class="u-item-width-normal" v-model.trim="formData.orgType"
</el-option> placeholder="请选择" clearable>
</el-select> <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
</el-form-item> :value="item.value">
</el-col> </el-option>
<el-col :span="24"> </el-select>
<el-form-item label="活动地点" prop="address" label-width="150px" style="display: block" > </el-form-item>
<div style="width: 634px"> </el-col>
<el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="true" <el-col :span="24">
placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"> <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" <div style="width: 634px">
:key="item.value || index" :label="item.label" :value="item.value"> <el-select v-model.trim="searchValue" filterable style="width: 634px" remote
</el-option> :reserve-keyword="true" :disabled="true" placeholder="请输入关键词"
</el-select> :remote-method="remoteMethod" :loading="loading">
<div id="app_activity" class="div_map"></div> <el-option v-for="(item, index) in searchOptions"
</div> @click.native="handleClickKey(index)" :key="item.value || index"
</el-form-item> :label="item.label" :value="item.value">
</el-col> </el-option>
<el-col :span="12"> </el-select>
<el-form-item label="管理员姓名" prop="operator" label-width="150px"> <div id="app_activity" class="div_map"></div>
<el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名" :disabled="true" </div>
class="u-item-width-normal"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="管理员姓名" prop="operator" label-width="150px">
<el-form-item label="手机号" prop="mobile" label-width="150px"> <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="true" :disabled="true" class="u-item-width-normal"></el-input>
class="u-item-width-normal"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="手机号" prop="mobile" label-width="150px">
<el-form-item label="身份证号" prop="idCard" label-width="150px"> <el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号"
<el-input v-model.trim="formData.idCard" size="small" clearable placeholder="请输入身份证号" :disabled="true" :disabled="true" class="u-item-width-normal"></el-input>
class="u-item-width-normal"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-form-item label="身份证号" prop="idCard" label-width="150px">
<el-form-item label="组织封面图" label-width="150px" prop="fileList"> <el-input v-model.trim="formData.idCard" size="small" clearable placeholder="请输入身份证号"
<template> :disabled="true" class="u-item-width-normal"></el-input>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" :file-list="formData.fileList" </el-form-item>
@file-removed="removedImg"></upload-image> </el-col>
</template> <el-col :span="12">
</el-form-item> <el-form-item label="组织封面图" label-width="150px" prop="fileList">
</el-col> <template>
<el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block"> <!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" :file-list="formData.fileList"
<div class="item_width_1"> @file-removed="removedImg"></upload-image> -->
<el-input :disabled="true" type="textarea" autosize placeholder="请填写组织介绍" v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}" > <div class="demo-image__preview">
</el-input> <el-image style="width: 100px; height: 100px" :src="formData.qualification"
</div> :preview-src-list="srcList">
</el-form-item> </el-image>
</div>
<el-form-item label="志愿品牌" prop="brand" label-width="150px" style="display: block"> </template>
<div class="item_width_1">
<el-input :disabled="true" type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand" :autosize="{ minRows:4., maxRows: 10}" >
</el-input>
</div>
</el-form-item> </el-form-item>
<el-form-item label="品牌展示图" label-width="150px" prop="VolunteerPic"> </el-col>
<template> <el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
<upload-image :defaultFileList="fileList1" :limit="1" @change="onChangeFileList1" <div class="item_width_1">
@file-removed="removedImg"></upload-image> <el-input :disabled="true" type="textarea" autosize placeholder="请填写组织介绍"
</template> v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
</el-form-item> </el-input>
</el-row></el-form> </div>
</div> </el-form-item>
<!-- <div class="div_btn">
<el-form-item label="志愿品牌" prop="brand" label-width="150px" style="display: block">
<div class="item_width_1">
<el-input :disabled="true" type="textarea" autosize placeholder="请输入内容"
v-model.trim="formData.brand" :autosize="{ minRows:4., maxRows: 10}">
</el-input>
</div>
</el-form-item>
<el-form-item label="品牌展示图" label-width="150px" prop="VolunteerPic">
<template>
<div class="demo-image__preview">
<el-image style="width: 100px; height: 100px" :src="formData.brandImg"
:preview-src-list="srcList">
</el-image>
</div>
</template>
</el-form-item>
</el-row></el-form>
</div>
<!-- <div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button> <el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
@click="handleComfirm"> </el-button> @click="handleComfirm"> </el-button>
</div> --> </div> -->
</div> </div>
</template> </template>
<script> <script>

174
src/views/modules/volunteer/VoluntaryOrganization/process.vue

@ -1,67 +1,102 @@
<template> <template>
<div> <div style="height: 600px; overflow-y: scroll;" >
<div style="display: flex;white-space: nowrap; padding: 30px;" > <div style="display: flex;white-space: nowrap; padding: 30px;">
<el-form style="padding-left: 50px;" :label-position="labelPosition" :model="tableData"> <el-form style="padding-left: 150px;">
<el-form-item label="组织名称"> <el-form-item label="组织名称">
<div> {{ tableData.orgName }}</div> <div> {{ tableData.orgName }}</div>
</el-form-item> </el-form-item>
<el-form-item label="服务类型"> <el-form-item label="服务类型">
{{ tableData.serviceTypeName }} {{ tableData.serviceTypeName }}
</el-form-item> </el-form-item>
<el-form-item label="组织类型"> <el-form-item label="组织类型">
{{ tableData.Organizationaltype}} {{ tableData.Organizationaltype}}
</el-form-item> </el-form-item>
<el-form-item label="管理员姓名"> <el-form-item label="管理员姓名">
{{ tableData.operator}} {{ tableData.operator}}
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> <el-form-item label="身份证号">
{{ tableData.idCard }} {{ tableData.idCard }}
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号">
{{ tableData.mobile }} {{ tableData.mobile }}
</el-form-item> </el-form-item>
<el-form-item label="所属组织"> <el-form-item label="所属组织">
{{ tableData.agencyName }} {{ tableData.agencyName }}
</el-form-item> </el-form-item>
<el-form-item label="详细地址"> <el-form-item label="详细地址">
{{ tableData.address }} {{ tableData.address }}
</el-form-item> </el-form-item>
<el-form-item label="组织介绍"> <el-form-item label="组织介绍">
{{ tableData.introduction}} {{ tableData.introduction}}
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
{{ tableData.address}} <div class="demo-image__preview">
</el-form-item> <el-image style="width: 100px; height: 100px" :src="tableData.qualification">
<el-form-item label="申请时间"> </el-image>
{{tableData.updatedTime}} </div>
</el-form-item> <!-- {{ tableData.address}} -->
</el-form-item>
</el-form> <el-form-item label="申请时间">
{{tableData.updatedTime}}
</div> </el-form-item>
<div class="div_btn"> <el-form-item label="审核结果" >
<div style="display: flex; margin-bottom: 20px; margin-left: 75px;"> <!-- <div style="display: flex; justify-items:center; align-items: center;">
<el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
<div class="flex flex-x flex-center2">
<el-radio v-model="status1" label="notPass" style="margin-right: 10px;">不通过</el-radio>
<el-input aria-hidden="true" v-if="status1 == 'notPass'" type="number" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input>
</div>
</div> -->
<template>
<el-select v-model="findingsofaudit" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
:disabled="item.disabled">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="原因" v-if="findingsofaudit == 'notPass'">
<el-input v-if="findingsofaudit == 'notPass'" type="number" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<!-- <div style="display: flex; margin-bottom: 20px; margin-left: 75px;">
<h4>审核结果</h4> <h4>审核结果</h4>
<div style="display: flex; justify-items:center; align-items: center;"> <div style="display: flex; justify-items:center; align-items: center;">
<el-radio v-model="status" label="pass" style="margin-right:20px">通过</el-radio> <el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
<div class="flex flex-x flex-center2"> <div class="flex flex-x flex-center2">
<el-radio v-model="status" label="notPass" style="margin-right: 10px;">不通过</el-radio> <el-radio v-model="status1" label="notPass" style="margin-right: 10px;">不通过</el-radio>
<el-input v-if="status == 'notPass'" type="number" v-model="reason" style="width: 200px;" <el-input v-if="status1 == 'notPass'" type="number" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input> placeholder="请说明原因"></el-input>
</div> </div>
</div> </div>
</div> </div> -->
<el-button size="small" @click="handleCancle"> </el-button> <!-- <div style="display: flex; justify-items:center; align-items: center;">
<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" <el-radio v-model="radio" :label="pass" style="margin-right:20px">通过</el-radio>
@click="handleComfirm"> </el-button> <div class="flex flex-x flex-center2">
<el-radio v-model="radio" :label="notPass" style="margin-right: 10px;">不通过</el-radio>
<el-input v-if="radio == 0" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input>
</div>
</div> -->
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" type="primary" @click="handleComfirm"> </el-button>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { requestPost,requestGet } from "@/js/dai/request"; import { requestPost,requestGet } from "@/js/dai/request";
@ -69,10 +104,21 @@ export default {
name: "see", name: "see",
data() { data() {
return { return {
status:'pass', options:[
{
value: 'pass',
label: '通过'
},
{
value: 'notPass',
label: '不通过'
},
],
// status1:'pass',
findingsofaudit:"pass",
reason:"", reason:"",
// labelPosition: 'right', // labelPosition: 'right',
// tableData: [], tableData: {},
// awardId:"" // awardId:""
}; };
}, },
@ -84,7 +130,7 @@ export default {
}, },
created() { created() {
console.log(this.VolunteerList,"list"); console.log(this.VolunteerList,"list");
this.tableData=this.VolunteerList // this.tableData=this.VolunteerList
// this.awardId=this.list.id // this.awardId=this.list.id
this.getTableData() this.getTableData()
}, },
@ -99,7 +145,7 @@ export default {
const url = "/voluntary/volunteerOrg/checkup"; const url = "/voluntary/volunteerOrg/checkup";
let params = { let params = {
id:this.VolunteerList.id, id:this.VolunteerList.id,
status:this.status, status:this.findingsofaudit,
reason:this.reason reason:this.reason
} }
requestPost(url, params).then((res) =>{ requestPost(url, params).then((res) =>{
@ -133,21 +179,11 @@ export default {
console.log(res,"res"); console.log(res,"res");
if(res.code===0){ if(res.code===0){
console.log("列表请求成功!!!!!!!!!!!!!!"); console.log("列表请求成功!!!!!!!!!!!!!!");
this.tableData = res.data this.tableData = res.data[0]
console.log(this.tableData, "this.tableData"); console.log(this.tableData, "this.tableData");
} }
}) })
// const { data, code, msg } = requestGet(url, params)
// console.log(data,"data");
// if (code === 0) {
// console.log("");
// console.log(data,"data");
// this.tableData = data
// console.log(this.tableData,"this.tableData");
// } else {
// }
}, },
}, },

2
src/views/modules/volunteer/VolunteerProjects/index.vue

@ -63,7 +63,7 @@
<el-table-column prop="serviceClassNameStr" header-align="center" align="center" label="服务类型" <el-table-column prop="serviceClassNameStr" header-align="center" align="center" label="服务类型"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="projectLevel" header-align="center" align="center" label="级别" <el-table-column prop="projectLevelName" header-align="center" align="center" label="级别"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="contractorName" header-align="center" align="center" label="承接单位" <el-table-column prop="contractorName" header-align="center" align="center" label="承接单位"

25
src/views/modules/volunteer/activityArchive/add.vue

@ -756,9 +756,19 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
console.log("dk.sjfl");
this.orgOptions = []; this.orgOptions = [];
this.orgOptions.push(res.data); this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions"); console.log(this.orgOptions,"this.orgOptions");
// this.orgOptions = [];
// // this.funOrgTreeData(res.data, 'community')
// this.orgOptions.push(res.data)
// const filteredData = this.funOrgTreeData(res.data, 'community')
// console.log("filteredData",filteredData);
// this.orgOptions.push(funOrgTreeData(data, 'community'));
// this.funOrgTreeData(res.data);
// console.log(this.orgOptions,"this.orgOptions");
} }
}) })
@ -777,6 +787,21 @@ export default {
} }
}) })
}, },
//
funOrgTreeData(data,level) {
console.log(data,"lksdjflsjl");
const arr= data.forEach(item => {
console.log(item,"skaclakj");
if (item.level === level) {
item.subAgencyList = []; // children
} else if (item.subAgencyList) {
clearChildren(item.subAgencyList); //
}
});
console.log("arr",arr);
},
handleCancle () { handleCancle () {
console.log( "kdsljk"); console.log( "kdsljk");

11
src/views/modules/volunteer/activityArchive/index.vue

@ -81,16 +81,16 @@
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate" <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small" <el-button type="text" v-if="scope.row.statusType=='未发布'&&scope.row.client !== 1" style="color:#1C6AFD;" size="small"
@click="handleDetail(scope.row)">修改</el-button> @click="handleDetail(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button> <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
<el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button> <el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
<el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.statusType!='进行中'" <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'"
type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button> type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
<el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;" <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;"
size="small" @click="handleupOnline(scope.row)">上线</el-button> size="small" @click="handleupOnline(scope.row)">上线</el-button>
<!-- <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleintegral(scope.row)">更多</el-button> --> <!-- <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleintegral(scope.row)">更多</el-button> -->
<el-dropdown trigger="click" style="margin-left: 10px" <el-dropdown trigger="click" style="margin-left: 10px" v-if="scope.row.client !== 1||scope.row.auditStatus==1"
@command="(command) => handelRegister(command, scope.row)"> @command="(command) => handelRegister(command, scope.row)">
<el-button type="text"> <el-button type="text">
更多<i class="el-icon-arrow-down el-icon--right"></i> 更多<i class="el-icon-arrow-down el-icon--right"></i>
@ -268,7 +268,8 @@
pageSize:this.pageSize, pageSize:this.pageSize,
statusType:this.formData.statusType, statusType:this.formData.statusType,
endTime:this.formData.endTime, endTime:this.formData.endTime,
online:this.formData.online online:this.formData.online,
// district: this.$store.state.user.agencyId,
} }
requestPost(url, params).then((res) => { requestPost(url, params).then((res) => {
if (res.code == 0) { if (res.code == 0) {

10
src/views/modules/volunteer/activityArchive/process.vue

@ -10,9 +10,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-col :span="24"> <el-col :span="24" v-if="formData.auditStatus == 2">
<el-form-item label="报名条件" prop="auditReason"> <el-form-item label="不通过原因" prop="auditReason" v-if="formData.auditStatus == 2">
<el-input type="textarea" placeholder="请输入活动标题,不超过50子" :height="150" v-model="formData.auditReason" <el-input type="textarea" placeholder="请输入不通过原因,不超过50子" :height="150" v-model="formData.auditReason"
maxlength="200" show-word-limit style="width: 500px;"> maxlength="200" show-word-limit style="width: 500px;">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -35,10 +35,6 @@ export default {
data() { data() {
return { return {
auditStatusList:[ auditStatusList:[
{
id: 0,
typeName: "待审核",
},
{ {
id: 1, id: 1,
typeName: "通过", typeName: "通过",

Loading…
Cancel
Save