审核，附件大屏展示，查看添加一个字段

11 months ago · 79c5dde26d
4 changed files with 158 additions and 141 deletions
--- a/src/views/modules/volunteer/VoluntaryOrganization/add.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/add.vue
@ -3,13 +3,12 @@

        <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">
@ -24,23 +23,29 @@
                   <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 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-cascader v-model="value" :options="OrganizationaltypeList" @change="handleChange"  :props="props"></el-cascader>
+                            <!-- <el-select 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-select> -->
                        </el-form-item>
                    </el-col>
                    <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"
-                      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" 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>
@ -75,14 +80,16 @@
                    </el-col>
                    <el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
                        <div class="item_width_1">
-                             <el-input type="textarea" autosize placeholder="请填写组织介绍" v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}" >
+                            <el-input 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 type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand" :autosize="{ minRows:4., maxRows: 10}" >
+                            <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
+                                :autosize="{ minRows:4., maxRows: 10}">
                            </el-input>
                        </div>
                    </el-form-item>
@ -123,6 +130,7 @@
 export default {
    data() {
        return {
+            volunteerOrgId:"0",
            fileList:[],
            fileList1:[],
            searchValue:"",
@ -263,20 +271,6 @@
     //    },
 
        async activityType() {
-            const url = "/actual/base/activityType/page"
-            let params = {
-                // agencyId: this.agencyId
-                pageSize: 20,
-                pageNo: 1,
-                typeName: "",
-                enabled: 1
-            }
-            const { data, code, msg } = await requestPost(url, params)
-            if (code === 0) {
-                this.typeList = data.list
-            } else {
-                this.$message.error(msg)
-            }
            this.$nextTick(() => {
                if (!map) {
                    this.initMap(this.formData.latitude, this.formData.longitude);
@ -369,7 +363,12 @@
        //     }
        // },
 
-        handleChange(value) {},
+        handleChange(value) {
+            console.log(value);
+            this.volunteerOrgId=value.toString()
+            this.volunteertype1()
+
+        },
        handleTimeChange(time) {
            if (time) {
                const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
@ -381,8 +380,7 @@
                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
            } else {
-                this.formData.startTime = ''
-                this.formData.endTime = ''
+   
            }
 
        },
@ -487,21 +485,31 @@
        },
   // 获取志愿组织类型
   async volunteertype () {
-       const url = "/sys/dict/data/dictlist"
- 
+       const url = "/voluntary/volunteerInfo/getOrgTypeList"
       let params = {
-         dictType: 'volunteer_org_type',
-         parentValue:"0"
+           volunteerOrgId:this.volunteerOrgId
       }
-       console.log("vol123234");
-       
       const { data, code, msg } = await requestPost(url, params)
- 
       if (code === 0) {
         this.OrganizationaltypeList = data;
       } else {
         this.$message.error(msg)
       }
+     },
+        // 获取志愿组织类型
+   async volunteertype1 () {
+       const url = "/voluntary/volunteerInfo/getOrgTypeList"
+       let params = {
+           volunteerOrgId:this.volunteerOrgId
+       }
+       const { data, code, msg } = await requestPost(url, params)
+       if (code === 0) {
+         this.OrganizationaltypeList.childList=data;
+         console.log(this.OrganizationaltypeList,"sdlkjclsdc");
+         
+       } else {
+         this.$message.error(msg)
+       }
     },
   // 获取志愿组织服务类型
   async volunteerservicetype () {
@ -817,6 +825,22 @@
 
    },
    props: {
+        lazy: true,
+        lazyLoad (node, resolve) {
+            const { level } = node;
+            console.log(node, resolve,"node, resolve");
+            
+            setTimeout(() => {
+              const nodes = Array.from({ length: level + 1 })
+                .map(item => ({
+                  value: ++id,
+                  label: `选项${id}`,
+                  leaf: level >= 2
+                }));
+              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+              resolve(nodes);
+            }, 1000);
+          }
        

 
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
@ -78,7 +78,7 @@
                            @click="handleshowMember(scope.row)">成员管理</el-button>
                        <el-button type="text" style="color:#1C6AFD;" size="small"
                            @click="handleDel(scope.row)">删除</el-button>
-                        <el-button v-if="scope.row.status == 'processing'" type="text" style="color:#1C6AFD;" size="small"
+                        <el-button v-if="scope.row.status == 'processing'&&scope.row.ischeck==1" type="text" style="color:#1C6AFD;" size="small"
                            @click="handleprocessl(scope.row)">审核</el-button>
                    </template>
                </el-table-column>
@ -90,7 +90,7 @@
                </el-pagination>
            </div>
            <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
-                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+                width="950px" top="10vh" class="dialog-h" @closed="showAddClose">
                <add v-if="showAdd" @showAddClose="showAddClose" />
            </el-dialog>
            <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
@ -132,6 +132,7 @@ export default {

    data() {
        return {
+          ids:"",
            formData: {
                orgName: "",
                serviceType: "",
@ -170,6 +171,9 @@ export default {
    
      },
      mounted() {
+        this.ids=this.$store.state.user.agencyId
+        console.log(this.ids,"this.ids");
+        
        this.getTableData();
      },
      methods: {
--- a/src/views/modules/volunteer/VoluntaryOrganization/info.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/info.vue
@ -280,20 +280,7 @@
    //    },

       async activityType() {
-           const url = "/actual/base/activityType/page"
-           let params = {
-               // agencyId: this.agencyId
-               pageSize: 20,
-               pageNo: 1,
-               typeName: "",
-               enabled: 1
-           }
-           const { data, code, msg } = await requestPost(url, params)
-           if (code === 0) {
-               this.typeList = data.list
-           } else {
-               this.$message.error(msg)
-           }
+    
           this.$nextTick(() => {
               if (!map) {
                   this.initMap(this.formData.latitude, this.formData.longitude);
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@ -43,7 +43,9 @@
        </el-form-item>
        <el-form-item label="组织介绍图" v-if="tableData.orgImage">
          <div class="demo-image__preview">
-            <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="tableData.orgImage">
+            <el-image style="width: 100px; height: 100px" :src="tableData.orgImage" :preview-src-list="[tableData.orgImage]">
+            </el-image>
+            <!-- <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="[tableData.orgImage]"> -->
            </img>
          </div>
          <!-- {{ tableData.address}} -->