新增等bug

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

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

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

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

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

@@ -105,7 +105,8 @@
     },
     components: { Tinymce, UploadImage },
     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");
         this.formData = this.infoList
         // this.formData.agencyName=this.$store.state.user.agencyName

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div  style="height: 600px; overflow-y: scroll;">
   <div style="display: flex;white-space: nowrap;  padding: 30px;" >
       <el-form  style="padding-left: 50px;" :label-position="labelPosition" :model="tableData">
           <el-form-item label="申请单位">
@@ -30,7 +30,7 @@
             {{ tableData.serviceTimeFrom }}至{{ tableData.serviceTimeTo }}
           </el-form-item>
             <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 label="审核">
   
@@ -54,6 +54,23 @@
            @click="handleComfirm">确 定</el-button>
 
   </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>
 </template>
 <script>
@@ -62,6 +79,8 @@ export default {
  name: "see",
   data() {
   return {
+    selVoiceUrl: "",
+    showVoice: false,
       radio:1,
       auditRemark:"",
       labelPosition: 'right',
@@ -81,8 +100,11 @@ created() {
   // this.awardId=this.list.id
   this.getTableData()
 },
-methods: {
-  //取消审查
+methods: {      //显示附件
+      handleShowVoice(url) {
+        this.selVoiceUrl = url;
+        this.showVoice = true;
+      },  //取消审查
   handleCancle(){
     this.$emit('handleprocesslClose')
   },

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

@@ -2,21 +2,15 @@
   <div>
   <div style="display: flex;white-space: nowrap;  padding: 30px ;" >
     <el-form :rules="rules"  :model="formData" >   
-      <el-row><el-col :span="12">
-       <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-row>
+        
           <el-col :span="12">
-            <el-form-item label="活动积分" prop="points">
-              <el-input-number v-model="formData.points" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
+            <el-form-item label="积分变更数量" prop="points">
+              <el-input-number v-model="formData.points" label="描述文字"  :step="1" :precision="1" ></el-input-number>
             </el-form-item>
           </el-col>
           <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"
                 maxlength="200" show-word-limit style="width: 555px;">
               </el-input>

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

@@ -78,6 +78,8 @@
         </el-table-column>
         <el-table-column prop="description" header-align="center" align="center" label="备注">
         </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>

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

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

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

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

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

@@ -1,7 +1,7 @@
 <template>
-    <div>
+  <div  style="height: 600px; overflow-y: scroll;"  >
     <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="组织名称">
           <div> {{ tableData.orgName }}</div>
         </el-form-item>
@@ -34,31 +34,66 @@
           {{ tableData.introduction}}
         </el-form-item>
         <el-form-item label="附件">
-               {{ tableData.address}}
+          <div class="demo-image__preview">
+            <el-image style="width: 100px; height: 100px" :src="tableData.qualification">
+            </el-image>
+          </div>
+          <!-- {{ tableData.address}} -->
         </el-form-item>
         <el-form-item label="申请时间">
           {{tableData.updatedTime}}
         </el-form-item>
+        <el-form-item label="审核结果" >
+          <!-- <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;"> 
+      <!-- <div style="display: flex;  margin-bottom: 20px;     margin-left: 75px;"> 
             <h4>审核结果：</h4>   
             <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">
-                  <el-radio v-model="status" label="notPass" style="margin-right: 10px;">不通过</el-radio>
-                  <el-input v-if="status == 'notPass'" type="number" v-model="reason" style="width: 200px;"
+                  <el-radio v-model="status1" label="notPass" style="margin-right: 10px;">不通过</el-radio>
+                  <el-input v-if="status1 == 'notPass'" type="number" v-model="reason" style="width: 200px;"
                      placeholder="请说明原因"></el-input>
                </div>
          
               </div>
+        </div> -->
+      <!-- <div style="display: flex; justify-items:center; align-items: center;">
+              <el-radio v-model="radio" :label="pass" style="margin-right:20px">通过</el-radio>
+             <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" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
-             @click="handleComfirm">确 定</el-button>
+      <el-button size="small" type="primary" @click="handleComfirm">确 定</el-button>
 
     </div>
   </div>
@@ -69,10 +104,21 @@ export default {
    name: "see",
     data() {
     return {
-      status:'pass',
+      options:[
+        {
+          value: 'pass',
+          label: '通过'
+        },
+        {
+          value: 'notPass',
+          label: '不通过'
+        },
+      ],
+      // status1:'pass',
+      findingsofaudit:"pass",
       reason:"",
         // labelPosition: 'right',
-        // tableData: [],
+        tableData: {},
         // awardId:""
     };
   },
@@ -84,7 +130,7 @@ export default {
   },
   created() {
     console.log(this.VolunteerList,"list");
-    this.tableData=this.VolunteerList
+    // this.tableData=this.VolunteerList
     // this.awardId=this.list.id
     this.getTableData()
   },
@@ -99,7 +145,7 @@ export default {
         const url = "/voluntary/volunteerOrg/checkup";
         let params = {
           id:this.VolunteerList.id,
-          status:this.status,
+          status:this.findingsofaudit,
           reason:this.reason
       }
       requestPost(url, params).then((res) =>{
@@ -133,21 +179,11 @@ export default {
         console.log(res,"res");
         if(res.code===0){
           console.log("列表请求成功！！！！！！！！！！！！！！");
-          this.tableData = res.data
+          this.tableData = res.data[0]
           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 {
-        // }
       },
 
   },

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

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

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

@@ -756,9 +756,19 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
+            console.log("dk.sjfl");
             this.orgOptions = [];
             this.orgOptions.push(res.data);
             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 () {
       console.log(    "kdsljk");
   

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"
           :show-overflow-tooltip="true">
           <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>
             <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 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>
             <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'"  type="text" style="color:#1C6AFD;"
               size="small" @click="handleupOnline(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)">
               <el-button type="text">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
@@ -268,7 +268,8 @@
           pageSize:this.pageSize,
           statusType:this.formData.statusType,
           endTime:this.formData.endTime,
-          online:this.formData.online
+          online:this.formData.online,
+          // district: this.$store.state.user.agencyId,
       }
       requestPost(url, params).then((res) => {
         if (res.code == 0) {

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

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