diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 8b2cb620..2e2ba39b 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -1353,3 +1353,56 @@ export function delSiyigongkai(id) {
method: 'get'
})
}
+
+// 查询四议两公开列表
+export function specialPublicityList(query) {
+ return request({
+ url: '/open/villageAffairs/public/specialPublicityList',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询四议两公开列表
+export function specialPublicityDetail(query) {
+ return request({
+ url: '/open/villageAffairs/public/specialPublicityDetail',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询四议两公开列表
+export function specialPublicityEdit(data) {
+ return request({
+ url: '/subcontract/publicity/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 查询四议两公开列表
+export function specialPublicityAdd(data) {
+ return request({
+ url: '/subcontract/publicity/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除四议两公开
+export function specialPublicityRemove(id) {
+ return request({
+ url: '/subcontract/publicity/remove/' + id,
+ method: 'get'
+ })
+}
+
+// 查询四议两公开列表
+export function updateSpecialPublicityCount(query) {
+ return request({
+ url: '/open/villageAffairs/public/updateSpecialPublicityCount',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/assets/images/sunVillage_info/index_block_31.png b/src/assets/images/sunVillage_info/index_block_31.png
new file mode 100644
index 00000000..49a573a0
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_31.png differ
diff --git a/src/assets/images/sunVillage_info/index_code_btn_18.png b/src/assets/images/sunVillage_info/index_code_btn_18.png
new file mode 100644
index 00000000..a286ad9f
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_18.png differ
diff --git a/src/assets/images/sunVillage_info/index_code_btn_19.png b/src/assets/images/sunVillage_info/index_code_btn_19.png
new file mode 100644
index 00000000..5f18713d
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_19.png differ
diff --git a/src/permission.js b/src/permission.js
index 665cd9c4..2a6263fb 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -150,6 +150,11 @@ const whiteList = [
'/sunVillage_info/list_process_detail',
'/sunVillage_info/list_issues_zy',
'/sunVillage_info/list_issues_zy_detail',
+ '/sunVillage_info/list_special',
+ '/sunVillage_info/list_special_detail',
+ '/sunVillage_info/list_special_detail_vote',
+ '/sunVillage_info/list_finance_new',
+ '/sunVillage_info/list_finance_new_detail',
// 新型经营主体
'newBusinessEntity/newsBulletin', //新闻公告
diff --git a/src/router/index.js b/src/router/index.js
index 272478a1..c1db91bc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3479,6 +3479,51 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/sunVillage_info/list_discussions_new_add'], resolve)
},
+ { ////阳光村务(新)-- 四议两公开
+ path: '/sunVillage_info/list_special',
+ name: 'sunVillageInfoListSpecial',
+ meta: {
+ title: '专项公示',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_special'], resolve)
+ },
+ { ////阳光村务(新)-- 四议两公开
+ path: '/sunVillage_info/list_special_add',
+ name: 'sunVillageInfoListSpecialAdd',
+ meta: {
+ title: '专项公示',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_special_add'], resolve)
+ },
+ { ////阳光村务(新)-- 四议两公开
+ path: '/sunVillage_info/list_special_detail',
+ name: 'sunVillageInfoListSpecialDetail',
+ meta: {
+ title: '专项公示',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_special_detail'], resolve)
+ },
+ { ////阳光村务(新)-- 四议两公开
+ path: '/sunVillage_info/list_special_detail_vote',
+ name: 'sunVillageInfoListSpecialDetailVote',
+ meta: {
+ title: '专项公示',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_special_detail_vote'], resolve)
+ },
+ { ////阳光村务(新)-- 四议两公开
+ path: '/sunVillage_info/list_special_edit',
+ name: 'sunVillageInfoListSpecialEdit',
+ meta: {
+ title: '专项公示',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_special_edit'], resolve)
+ },
{ ////阳光村务(新)-- 一张图公开
path: '/sunVillage_info/list_contract_detail',
name: 'sunVillageInfoListContractDetail',
diff --git a/src/views/sunVillage_info/list_contract_ranking.vue b/src/views/sunVillage_info/list_contract_ranking.vue
index 081560fa..15c8d770 100644
--- a/src/views/sunVillage_info/list_contract_ranking.vue
+++ b/src/views/sunVillage_info/list_contract_ranking.vue
@@ -49,18 +49,28 @@
{{item.buildingTime}}
{{item.startTime}}
{{item.endTime}}
- {{item.endTime}}
+ 点击查看附件
+
+
+
+
+ 附件
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_discussions_new_detail.vue b/src/views/sunVillage_info/list_discussions_new_detail.vue
index 2b5c04ab..b2189d7c 100644
--- a/src/views/sunVillage_info/list_discussions_new_detail.vue
+++ b/src/views/sunVillage_info/list_discussions_new_detail.vue
@@ -12,7 +12,7 @@
-
+
-
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_discussions_new_edit.vue b/src/views/sunVillage_info/list_discussions_new_edit.vue
index 7bae33f4..905613df 100644
--- a/src/views/sunVillage_info/list_discussions_new_edit.vue
+++ b/src/views/sunVillage_info/list_discussions_new_edit.vue
@@ -53,6 +53,42 @@
+
+
+
+ 实施过程公开日期
+
+
+
+
+
+
+
+
+
+ 实施过程公开图片
+
+
+
+
+
+
{
+ this.shishiguochengPic[i] = {url:'/api'+rrr}
+ })
+ }
this.form = res.data;
})
},
@@ -176,6 +223,7 @@
var that = this;
that.form.shishiPic = that.shishiPic2.join(',')
that.form.jueyiPic = that.jueyiPic2.join(',')
+ that.form.shishiguochengPic = that.shishiguochengPic2.join(',')
this.form.deptName = Cookies.get('deptName');
updateSiyigongkai(that.form).then((r1) => {
if (r1.code == 200){
@@ -196,6 +244,11 @@
this.openNy2 = data;
this.showBuildTime2 = false;
},
+ onConfirmOpenNy3(data){
+ this.form.shishiguochengAt = this.format(data,'yyyy-MM-dd');
+ this.openNy3 = data;
+ this.showBuildTime3 = false;
+ },
deleteFile1(file,detail){
console.log(detail)
this.jueyiPic2.splice(detail.index,1)
@@ -204,6 +257,10 @@
console.log(detail)
this.shishiPic2.splice(detail.index,1)
},
+ deleteFile3(file,detail){
+ console.log(detail)
+ this.shishiguochengPic2.splice(detail.index,1)
+ },
afterRead(file) {
this.$toast.loading({
message: "上传中...",
@@ -250,6 +307,29 @@
})
}
},
+ afterRead3(file) {
+ this.$toast.loading({
+ message: "上传中...",
+ forbidClick: true,
+ duration: 0,
+ });
+ // 此时可以自行将文件上传至服务器
+ if (file instanceof Array){//判断是否为数组,单张图片为array,多张为数组,数组返回true否则为false
+ file.map(res=>{
+ let params1 = new FormData();
+ params1.append("file", res.file);
+ commonUpload(params1).then((r1) => {
+ this.shishiguochengPic2.push(r1.fileName);
+ })
+ })
+ }else{
+ let params1 = new FormData();
+ params1.append("file", file.file);
+ commonUpload(params1).then((r1) => {
+ this.shishiguochengPic2.push(r1.fileName);
+ })
+ }
+ },
},
}
diff --git a/src/views/sunVillage_info/list_finance_new_add.vue b/src/views/sunVillage_info/list_finance_new_add.vue
index 384760bb..df53873e 100644
--- a/src/views/sunVillage_info/list_finance_new_add.vue
+++ b/src/views/sunVillage_info/list_finance_new_add.vue
@@ -121,7 +121,7 @@
- 附件
+ 公开文件
diff --git a/src/views/sunVillage_info/list_finance_new_detail.vue b/src/views/sunVillage_info/list_finance_new_detail.vue
index 439837f3..200e4d21 100644
--- a/src/views/sunVillage_info/list_finance_new_detail.vue
+++ b/src/views/sunVillage_info/list_finance_new_detail.vue
@@ -79,7 +79,7 @@
- 附件
+ 公开文件
diff --git a/src/views/sunVillage_info/list_finance_new_edit.vue b/src/views/sunVillage_info/list_finance_new_edit.vue
index 64ed849c..3ac3fbc0 100644
--- a/src/views/sunVillage_info/list_finance_new_edit.vue
+++ b/src/views/sunVillage_info/list_finance_new_edit.vue
@@ -121,7 +121,7 @@
- 附件
+ 公开文件
diff --git a/src/views/sunVillage_info/list_issues_zy_add.vue b/src/views/sunVillage_info/list_issues_zy_add.vue
index ebfee0f7..6b44c39f 100644
--- a/src/views/sunVillage_info/list_issues_zy_add.vue
+++ b/src/views/sunVillage_info/list_issues_zy_add.vue
@@ -87,7 +87,7 @@

-
{{item.name}}
+
{{item.name}}
diff --git a/src/views/sunVillage_info/list_issues_zy_detail.vue b/src/views/sunVillage_info/list_issues_zy_detail.vue
index b4ddbca7..3e6671a3 100644
--- a/src/views/sunVillage_info/list_issues_zy_detail.vue
+++ b/src/views/sunVillage_info/list_issues_zy_detail.vue
@@ -56,7 +56,7 @@
@@ -112,15 +112,15 @@
};
},
created() {
- this.getDicts("important_type").then((response) => {
- this.importantTypeOptions = response.data;
- });
this.type = this.$route.query.type;
this.queryParams.bookId = Cookies.get('bookId');
this.queryParams.deptId = Cookies.get('deptId');
this.queryParams.id = this.$route.query.id;
this.showBtn = this.$route.query.showBtn=='false'?false:true;
- this.getDetail();
+ this.getDicts("important_type").then((response) => {
+ this.importantTypeOptions = response.data;
+ this.getDetail();
+ });
},
methods: {
getDetail(id){
@@ -154,6 +154,13 @@
diff --git a/src/views/sunVillage_info/list_special_add.vue b/src/views/sunVillage_info/list_special_add.vue
new file mode 100644
index 00000000..0a770dd8
--- /dev/null
+++ b/src/views/sunVillage_info/list_special_add.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+ 公示标题
+
+
+
+
+
+ 公示年月
+
+
+
+
+
+
+
+
+
+ 公示类型
+
+
+
+
+
+
+
+
+
+ 公示图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_special_detail.vue b/src/views/sunVillage_info/list_special_detail.vue
new file mode 100644
index 00000000..fa0d512b
--- /dev/null
+++ b/src/views/sunVillage_info/list_special_detail.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_special_detail_vote.vue b/src/views/sunVillage_info/list_special_detail_vote.vue
new file mode 100644
index 00000000..5ddb3a9c
--- /dev/null
+++ b/src/views/sunVillage_info/list_special_detail_vote.vue
@@ -0,0 +1,185 @@
+
+
+
+ 专项公示
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 有异议
+ 无异议
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_special_edit.vue b/src/views/sunVillage_info/list_special_edit.vue
new file mode 100644
index 00000000..08423c2d
--- /dev/null
+++ b/src/views/sunVillage_info/list_special_edit.vue
@@ -0,0 +1,366 @@
+
+
+
+
+
+
+
+
+ 公示标题
+
+
+
+
+
+ 公示年月
+
+
+
+
+
+
+
+
+
+ 公示类型
+
+
+
+
+
+
+
+
+
+ 公示图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/three.vue b/src/views/sunVillage_info/three.vue
index 994bf74d..9fb7d45a 100644
--- a/src/views/sunVillage_info/three.vue
+++ b/src/views/sunVillage_info/three.vue
@@ -333,7 +333,6 @@
padding:20px 23px;
display: flex;
.search_block{
- height: 59px;
width: 535px;
border-radius: 59px;
background: #fff;