From 4b9b018ccfc88912944bef696da8e36a29efd5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Fri, 27 Sep 2024 18:26:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../volunteer/LifeCircleManagement/add.vue | 201 +++++++++++++++++-
.../volunteer/LifeCircleManagement/index.vue | 6 +-
.../volunteer/VoluntaryOrganization/add.vue | 3 +-
.../volunteer/VoluntaryOrganization/index.vue | 19 +-
4 files changed, 220 insertions(+), 9 deletions(-)
diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index 9527b99e8..b021f4be5 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -13,8 +13,13 @@
-->
-
+
+
+
+
@@ -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");
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index f41e825d4..0883d6bd7 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/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)
}
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/add.vue b/src/views/modules/volunteer/VoluntaryOrganization/add.vue
index 054f84b5c..78cffbfb5 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/add.vue
+++ b/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");
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/index.vue b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
index 93c482983..fe57ed24f 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/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(){
From 3f4d50549a6b9fd30aaf464fb40d7a361e893234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Sun, 29 Sep 2024 09:39:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8C=89=E9=92=AE=EF=BC=8C=E7=A4=BE=E5=8C=BA?=
=?UTF-8?q?=E5=AE=A3=E4=BC=A0=E6=9B=B4=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86?=
=?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communityParty/comPromotion/index.vue | 20 ++++-----
.../volunteer/Dynamicmanagement/add.vue | 14 ------
.../volunteer/Dynamicmanagement/index.vue | 14 +++++-
.../volunteer/SiteManagement/index.vue | 16 ++++++-
.../volunteer/Venuemanagement/index.vue | 44 ++++++++++++-------
.../VoluntaryOrganization/process.vue | 17 +++----
.../volunteer/VolunteerProjects/index.vue | 41 +++++++++++------
.../volunteer/activityArchive/index.vue | 38 +++++++++++-----
8 files changed, 127 insertions(+), 77 deletions(-)
diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
index e2c91177b..a6cc592b5 100644
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -36,31 +36,31 @@
-
-
+
+
-
+
-
+
{{ scope.row.status === 0 ? '已下线' : '已发布' }}
-
+
-
+
-
+
{{ scope.row.top === 0 ? '否' : '是' }}
-
+
-
+
@@ -80,7 +80,7 @@
+ width="950px" top="5vh" class="dialog-h" @closed="diaClose">
diff --git a/src/views/modules/volunteer/Dynamicmanagement/add.vue b/src/views/modules/volunteer/Dynamicmanagement/add.vue
index 66b018159..c4292ee03 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/add.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/add.vue
@@ -218,20 +218,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);
diff --git a/src/views/modules/volunteer/Dynamicmanagement/index.vue b/src/views/modules/volunteer/Dynamicmanagement/index.vue
index 78f80e9e5..29bd5f90c 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/index.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/index.vue
@@ -206,7 +206,12 @@ export default {
},
//删除活动
handledelete(row){
- let url=`/voluntary/newsTrends/deleteById/${row.id}`
+ this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let url=`/voluntary/newsTrends/deleteById/${row.id}`
axios({
url: window.SITE_CONFIG["apiURL"] + url,
method: "DELETE",
@@ -220,6 +225,13 @@ export default {
this.$message.error(res.msg)
}
})
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ })
+
// requestGet(url).then((res)=>{
// if(res.code==0){
// this.$message.success("删除成功")
diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index d18c7c869..c0826282f 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -331,7 +331,13 @@ export default {
return fileType && isLt1M;
},
handleDel(row) {
- console.log(row, "row");
+
+ this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ console.log(row, "row");
let url = "/voluntary/position/delete";
// let params = {
// ids: [String(row.id)] // 将 row.id 转换为字符串并放入数组中
@@ -350,6 +356,14 @@ export default {
console.error("删除失败", error);
this.$message.error("删除失败，请稍后重试");
});
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ })
+
+
},
diaClose(){
this.formShow=false
diff --git a/src/views/modules/volunteer/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index 6c4145ff2..a120a695e 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -327,23 +327,33 @@ export default {
return fileType && isLt1M;
},
handleDel(row) {
- console.log(row, "row");
- let url = "/voluntary/positionVenues/delete";
- let params = [String(row.id)];
- axios.delete(this.processUrl(url), { data: params })
- .then((res) => {
- if (res.data.code === 0) {
- this.$message.success("删除成功");
- this.getTableData();
- } else {
- this.$message.error(res.data.msg);
- }
- })
- .catch((error) => {
- console.error("删除失败", error);
- this.$message.error("删除失败，请稍后重试");
- });
-
+ this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ console.log(row, "row");
+ let url = "/voluntary/positionVenues/delete";
+ let params = [String(row.id)];
+ axios.delete(this.processUrl(url), { data: params })
+ .then((res) => {
+ if (res.data.code === 0) {
+ this.$message.success("删除成功");
+ this.getTableData();
+ } else {
+ this.$message.error(res.data.msg);
+ }
+ })
+ .catch((error) => {
+ console.error("删除失败", error);
+ this.$message.error("删除失败，请稍后重试");
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ })
},
diaClose(){
this.formShow=false
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index 4c55aee73..84b321b2f 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -1,5 +1,5 @@
-
+
@@ -34,8 +34,9 @@
{{ tableData.introduction}}
-
-
![]()
+
+
+
@@ -43,7 +44,7 @@
![]()
-
+
@@ -56,11 +57,11 @@
![]()
-
+
-
+