diff --git a/src/assets/images/sunVillage_info/delete.png b/src/assets/images/sunVillage_info/delete.png
new file mode 100644
index 00000000..ae6a4315
Binary files /dev/null and b/src/assets/images/sunVillage_info/delete.png differ
diff --git a/src/views/sunVillage_info/list_contract_add.vue b/src/views/sunVillage_info/list_contract_add.vue
index 97ce1035..711ea3bd 100644
--- a/src/views/sunVillage_info/list_contract_add.vue
+++ b/src/views/sunVillage_info/list_contract_add.vue
@@ -86,6 +86,7 @@
{{item.name}}
+ 
@@ -169,10 +170,14 @@
this.openNy = data;
this.showBuildTime = false;
},
- deleteFile1(file){
- console.log(file)
+ deleteFile1(detail){
+ this.openPic2.splice(detail.index,1)
// this.form.openPic.splice(index,1);
},
+ deleteWord(index){
+ this.openFileList.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
diff --git a/src/views/sunVillage_info/list_contract_edit.vue b/src/views/sunVillage_info/list_contract_edit.vue
index 93be8952..a97fb22e 100644
--- a/src/views/sunVillage_info/list_contract_edit.vue
+++ b/src/views/sunVillage_info/list_contract_edit.vue
@@ -86,6 +86,7 @@
{{item.name}}
+
@@ -154,7 +155,6 @@
getDetail(id){
otherPublicDetail(this.queryParams).then((res) => {
var that = this ;
- res.data.otherTypeText = this.selectDictLabel(this.otherGkTypeOptions, res.data.otherType);
if (res.data.openFile!='' && res.data.openFile != null && res.data.openFile != undefined){
this.openFile = res.data.openFile.split(',')
@@ -177,7 +177,8 @@
this.openPic[i] = {url:'/api'+rrr}
})
}
- that.form = res.data;
+ res.data.otherTypeText = this.selectDictLabel(this.otherGkTypeOptions, res.data.otherType);
+ this.form = res.data;
})
},
onSubmit(){
@@ -203,6 +204,10 @@
console.log(detail)
this.openPic2.splice(detail.index,1)
},
+ deleteWord(index){
+ this.openFile.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
// this.openPic.push(file.file);
@@ -225,8 +230,8 @@
}else if(name.indexOf('.xls') > -1){
type = 'excel';
}
- this.openFileList.push({name:file.file.name,type:type})
- this.openFile.push(file.file);
+ this.openFile.push({name:file.file.name,type:type})
+ this.openFileList.push(file.file);
},
onConfirmPictureType(data){
this.form.otherTypeText = data.dictLabel;
diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue
index 50b0770b..a7a60c80 100644
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -131,7 +132,7 @@
this.type = this.$route.query.type;
this.queryParams.bookId = Cookies.get('bookId');
this.queryParams.deptId = Cookies.get('deptId');
- this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开';
+ this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')) + '月财务公开';
},
methods: {
onSubmit(){
@@ -154,10 +155,14 @@
this.openNy = data;
this.showBuildTime = false;
},
- deleteFile1(file){
- console.log(file)
+ deleteFile1(detail){
+ this.openPic2.splice(detail.index,1)
// this.form.openPic.splice(index,1);
},
+ deleteWord(index){
+ this.openFileList.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
diff --git a/src/views/sunVillage_info/list_finance_edit.vue b/src/views/sunVillage_info/list_finance_edit.vue
index dc1d9bbf..47eac1ae 100644
--- a/src/views/sunVillage_info/list_finance_edit.vue
+++ b/src/views/sunVillage_info/list_finance_edit.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -150,7 +151,7 @@
}else if(name.indexOf('.xls') > -1){
type = 'excel';
}
- this.openFile[i] = {name:name,type:type}
+ this.openFile[i] = {name:name,type:type,url:rr}
})
}
if (res.data.openPic!='' && res.data.openPic != null && res.data.openPic != undefined){
@@ -185,6 +186,10 @@
console.log(detail)
this.openPic2.splice(detail.index,1)
},
+ deleteWord(index){
+ this.openFile.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPicList.push(file.file);
diff --git a/src/views/sunVillage_info/list_issues_add.vue b/src/views/sunVillage_info/list_issues_add.vue
index 3daaf2cf..270a7eab 100644
--- a/src/views/sunVillage_info/list_issues_add.vue
+++ b/src/views/sunVillage_info/list_issues_add.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -159,10 +160,14 @@
this.openNy = data;
this.showBuildTime = false;
},
- deleteFile1(file){
- console.log(file)
+ deleteFile1(detail){
+ this.openPic2.splice(detail.index,1)
// this.form.openPic.splice(index,1);
},
+ deleteWord(index){
+ this.openFileList.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
diff --git a/src/views/sunVillage_info/list_issues_edit.vue b/src/views/sunVillage_info/list_issues_edit.vue
index b468e1d2..0bf3020f 100644
--- a/src/views/sunVillage_info/list_issues_edit.vue
+++ b/src/views/sunVillage_info/list_issues_edit.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -193,6 +194,10 @@
console.log(detail)
this.openPic2.splice(detail.index,1)
},
+ deleteWord(index){
+ this.openFile.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPicList.push(file.file);
diff --git a/src/views/sunVillage_info/list_photo_add.vue b/src/views/sunVillage_info/list_photo_add.vue
index 0a85485f..7b3f32b7 100644
--- a/src/views/sunVillage_info/list_photo_add.vue
+++ b/src/views/sunVillage_info/list_photo_add.vue
@@ -86,6 +86,7 @@
{{item.name}}
+
@@ -178,10 +179,14 @@
this.openNy = data;
this.showBuildTime = false;
},
- deleteFile1(file){
- console.log(file)
+ deleteFile1(detail){
+ this.openPic2.splice(detail.index,1)
// this.form.openPic.splice(index,1);
},
+ deleteWord(index){
+ this.openFileList.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
diff --git a/src/views/sunVillage_info/list_photo_detail.vue b/src/views/sunVillage_info/list_photo_detail.vue
index 6617a70b..984de9ac 100644
--- a/src/views/sunVillage_info/list_photo_detail.vue
+++ b/src/views/sunVillage_info/list_photo_detail.vue
@@ -134,15 +134,6 @@
};
},
created() {
- this.houseGetDicts("asset_status").then((response) => {
- this.assetStatusOptions = response.data;
- });
- this.houseGetDicts("asset_type").then((response) => {
- this.assetTypeOptions = response.data;
- });
- this.houseGetDicts("use_type").then((response) => {
- this.useTypeOptions = response.data;
- });
this.houseGetDicts("picture_type").then((response) => {
this.pictureTypeOptions = response.data;
});
diff --git a/src/views/sunVillage_info/list_photo_edit.vue b/src/views/sunVillage_info/list_photo_edit.vue
index 0160d920..c64579d5 100644
--- a/src/views/sunVillage_info/list_photo_edit.vue
+++ b/src/views/sunVillage_info/list_photo_edit.vue
@@ -86,6 +86,7 @@
{{item.name}}
+
@@ -141,15 +142,6 @@
};
},
created() {
- this.houseGetDicts("asset_status").then((response) => {
- this.assetStatusOptions = response.data;
- });
- this.houseGetDicts("asset_type").then((response) => {
- this.assetTypeOptions = response.data;
- });
- this.houseGetDicts("use_type").then((response) => {
- this.useTypeOptions = response.data;
- });
this.houseGetDicts("picture_type").then((response) => {
this.pictureTypeOptions = response.data;
});
@@ -164,7 +156,6 @@
pictureGet(this.queryParams).then((res) => {
var that = this ;
res.data.pictureTypeText = this.selectDictLabel(this.pictureTypeOptions, res.data.pictureType);
-
if (res.data.openFile!='' && res.data.openFile != null && res.data.openFile != undefined){
this.openFile = res.data.openFile.split(',')
this.openFile2 = res.data.openFile.split(',')
@@ -212,6 +203,10 @@
console.log(detail)
this.openPic2.splice(detail.index,1)
},
+ deleteWord(index){
+ this.openFile.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
// this.openPic.push(file.file);
@@ -234,8 +229,8 @@
}else if(name.indexOf('.xls') > -1){
type = 'excel';
}
- this.openFileList.push({name:file.file.name,type:type})
- this.openFile.push(file.file);
+ this.openFile.push({name:file.file.name,type:type})
+ this.openFileList.push(file.file);
},
onConfirmPictureType(data){
this.form.pictureTypeText = data.dictLabel;
diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 1c499e4a..29af3b11 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -152,10 +153,14 @@
this.openNy = data;
this.showBuildTime = false;
},
- deleteFile1(file){
- console.log(file)
+ deleteFile1(detail){
+ this.openPic2.splice(detail.index,1)
// this.form.openPic.splice(index,1);
},
+ deleteWord(index){
+ this.openFileList.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index b0ca2a8d..c4137ba7 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -65,6 +65,7 @@
{{item.name}}
+
@@ -150,7 +151,7 @@
}else if(name.indexOf('.xls') > -1){
type = 'excel';
}
- this.openFile[i] = {name:name,type:type}
+ this.openFile[i] = {name:name,type:type,url:rr}
})
}
if (res.data.openPic!='' && res.data.openPic != null && res.data.openPic != undefined){
@@ -185,6 +186,10 @@
console.log(detail)
this.openPic2.splice(detail.index,1)
},
+ deleteWord(index){
+ this.openFile.splice(index,1);
+ this.openFile2.splice(index,1);
+ },
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPicList.push(file.file);