Merge branch 'xiaowang-social' into test

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

@@ -13,8 +13,13 @@
           </el-col> -->
           <el-col :span="12">
             <el-form-item label="类型" prop="type" label-width="100px">
-              <el-cascader v-model="formData.type" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
+              <!-- <el-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
+              <el-form-item label="类型" prop="type" label-width="100px"> -->
+              <el-cascader  v-model="this.formData.type"     @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{emitPath: false,
+                multiple: false, }"></el-cascader>
             </el-form-item>
+           
+        
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" label-width="100px" prop="name">
@@ -149,10 +154,193 @@
  export default {
     data() {
         return {
+            orgOptionProps: {
+                value: 'value',
+                label: 'label',
+                children: 'subAgencyList',
+                emitPath: false,
+                multiple: false,
+                checkStrictly: true
+            },
           showdisabled:false,
           searchOptions:[],
-          options: [{
-          }],
+          options:[
+        {
+
+            "children": [
+                {
+                    "pv":"1",
+                    "value": "11",
+                    "label": "托儿所"
+                },
+                {
+                    "pv":"1",
+                    "value": "12",
+                    "label": "幼儿园"
+                },
+                {
+                    "pv":"1",
+                    "value": "13",
+                    "label": "小学"
+                },
+                {
+                    "pv":"1",
+                    "value": "14",
+                    "label": "中学"
+                },
+                {
+                    "pv":"1",
+                    "value": "15",
+                    "label": "培训机构"
+                },
+                {
+                    "pv":"1",
+                    "value": "16",
+                    "label": "其它"
+                }
+            ],
+            "value": "1",
+            "label": "教育培训"
+        },
+        {
+            "children": [
+                {
+                    "pv":"2",
+                    "value": "21",
+                    "label": "门诊"
+                },
+                {
+                    "pv":"2",
+                    "value": "22",
+                    "label": "社区医院"
+                },
+                {
+                    "pv":"2",
+                    "value": "23",
+                    "label": "医院"
+                },
+                {
+                    "pv":"2",
+                    "value": "24",
+                    "label": "其它"
+                }
+            ],
+            "value": "2",
+            "label": "医疗卫生"
+        },
+        {
+            "children": [
+                {
+                    "pv":"3",
+                    "value": "31",
+                    "label": "餐饮"
+                },
+                {
+                    "pv":"3",
+                    "value": "32",
+                    "label": "超市"
+                },
+                {
+                    "pv":"3",
+                    "value": "33",
+                    "label": "理发"
+                },
+                {
+                    "pv":"3",
+                    "value": "34",
+                    "label": "书店"
+                },
+                {
+                    "pv":"3",
+                    "value": "35",
+                    "label": "便利店"
+                },
+                {
+                    "pv":"3",
+                    "value": "36",
+                    "label": "市场"
+                },
+                {
+                    "pv":"3",
+                    "value": "37",
+                    "label": "五金"
+                },
+                {
+                    "pv":"3",
+                    "value": "38",
+                    "label": "照相"
+                },
+                {
+                    "pv":"3",
+                    "value": "39",
+                    "label": "综合修理"
+                },
+                {
+                    "pv":"3",
+                    "value": "30",
+                    "label": "服务站"
+                },
+                {
+                    "pv":"3",
+                    "value": "330",
+                    "label": "农贸市场"
+                },
+                {
+                    "pv":"3",
+                    "value": "331",
+                    "label": "其它"
+                }
+            ],
+            "value": "3",
+            "label": "商业服务"
+        },
+        {
+            "children": [
+                 {
+                    "pv":"4",
+                    "value": "41",
+                    "label": "电影院"
+                },
+                {
+                    "pv":"4",
+                    "value": "42",
+                    "label": "歌剧院"
+                },
+                {
+                    "pv":"4",
+                    "value": "43",
+                    "label": "图书馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "44",
+                    "label": "游泳馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "45",
+                    "label": "活动中心"
+                },
+                {
+                    "pv":"4",
+                    "value": "46",
+                    "label": "体育馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "47",
+                    "label": "其它"
+                }
+            ],
+            "value": "4",
+            "label": "文化体育"
+        },
+        {
+            "children": [],
+            "value": "5",
+            "label": "其它"
+        }
+    ],
             fileList:[],
             searchValue:"",
             OrganizationaltypeList:[],
@@ -169,7 +357,7 @@
               linkman: "",
               linkPhone: "",
               workTime: "",
-              type: "1",
+              type: "",
               tags: "",//标签
               agencyId: this.$store.state.user.agencyId,
               address: "",//地址
@@ -230,6 +418,11 @@
 
       // this.endLoading();
     },
+    //获取类型
+    handleChangeAgency(val) {
+            console.log(val);
+            this.formData.type = val
+       },
           //获取详情
           getTableDetail(id) {
           console.log(id,"dskljfksdljf");

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

@@ -142,7 +142,7 @@ export default {
                 ],
             showprocess:false,
             EditList:{},
-
+            OrganizationaltypeList:[],
             showAdd: false,
             showMember: false,
             showEdit: false,
@@ -178,11 +178,13 @@ export default {
    async getLifeType () {
        const url = "/sys/dict/data/dictlist"
        let params = {
-         dictType: 'voluntary_sphereLife_type'
+         dictType: 'voluntary_sphereLife_type',
        }
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
          this.OrganizationaltypeList = data;
+         console.log(this.OrganizationaltypeList,"his.Organizationaltype");
+         
        } else {
          this.$message.error(msg)
        }

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

@@ -490,7 +490,8 @@
        const url = "/sys/dict/data/dictlist"
  
        let params = {
-         dictType: 'volunteer_org_type'
+         dictType: 'volunteer_org_type',
+         parentValue:"0"
        }
        console.log("vol123234");
        

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

@@ -338,8 +338,13 @@ export default {
               debugger
               return fileType && isLt1M;
           },
-          handleDel(row){
-        console.log(row,"row");
+        handleDel(row) {
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            console.log(row,"row");
         let url="/voluntary/volunteerOrg/delete";
         let params={
           id:row.id
@@ -360,6 +365,16 @@ export default {
             this.$message.error(data.msg)
           }
         })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
+
+
          
         },
         diaClose(){