|
@@ -133,6 +133,11 @@
|
|
|
<span class="">{{ scope.row.titleBg }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="文件名称">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span class="">{{ scope.row.fileName }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="createTime"
|
|
|
show-overflow-tooltip
|
|
@@ -178,6 +183,7 @@
|
|
|
title="新增目录"
|
|
|
:append-to-body="true"
|
|
|
:visible.sync="addDialogStatus"
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
<el-form
|
|
|
:model="formData"
|
|
@@ -193,13 +199,15 @@
|
|
|
placeholder="请输入标题"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
+ <!-- 目录不设置权限
|
|
|
<el-form-item label="查看权限:" prop="text">
|
|
|
<el-radio-group v-model="formData.auth">
|
|
|
- <el-radio label="1">二级经理可见</el-radio>
|
|
|
+ <el-radio label="3">二级经理可见</el-radio>
|
|
|
<el-radio label="2">三级经理可见</el-radio>
|
|
|
- <el-radio label="3">普通员工可见</el-radio>
|
|
|
+ <el-radio label="1">普通员工可见</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
+ -->
|
|
|
<el-form-item
|
|
|
prop="parentId"
|
|
|
v-if="actionName != 'add'"
|
|
@@ -254,6 +262,7 @@
|
|
|
:append-to-body="true"
|
|
|
:before-close="closedia"
|
|
|
:visible.sync="dialogStatus"
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
<div v-loading="loadinged">
|
|
|
<el-form
|
|
@@ -270,9 +279,9 @@
|
|
|
<el-form-item class="info-line online radviv" prop="text">
|
|
|
<span>查看权限:</span>
|
|
|
<el-radio-group v-model="infolist.auth">
|
|
|
- <el-radio label="1">二级经理可见</el-radio>
|
|
|
- <el-radio label="2">三级经理可见</el-radio>
|
|
|
- <el-radio label="3">普通员工可见</el-radio>
|
|
|
+ <el-radio label="2">二级经理可见</el-radio>
|
|
|
+ <el-radio label="3">三级经理可见</el-radio>
|
|
|
+ <el-radio label="1">普通员工可见</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="meeting" class="info-line online">
|
|
@@ -446,14 +455,14 @@ export default {
|
|
|
let blob = new Blob([response.data], {
|
|
|
type: "application/vnd.ms-excel",
|
|
|
});
|
|
|
- window.navigator.msSaveOrOpenBlob(blob, "batch.zip");
|
|
|
+ window.navigator.msSaveOrOpenBlob(blob, new Date().getTime()+".zip");
|
|
|
} else {
|
|
|
/* 火狐谷歌的文件下载方式 */
|
|
|
var blob = new Blob([response.data]);
|
|
|
var downloadElement = document.createElement("a");
|
|
|
var href = window.URL.createObjectURL(blob);
|
|
|
downloadElement.href = href;
|
|
|
- downloadElement.download = "batch.zip";
|
|
|
+ downloadElement.download = new Date().getTime()+".zip";
|
|
|
document.body.appendChild(downloadElement);
|
|
|
downloadElement.click();
|
|
|
document.body.removeChild(downloadElement);
|
|
@@ -670,6 +679,8 @@ export default {
|
|
|
data: {
|
|
|
id: val.id,
|
|
|
isFile: "1",
|
|
|
+ createId: val.createId,
|
|
|
+ createName: val.createName,
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
if (res.data.result == 0) {
|
|
@@ -679,6 +690,12 @@ export default {
|
|
|
type: "success",
|
|
|
});
|
|
|
this.getList(this.params, this.pageSize);
|
|
|
+ }else if(res.data.result == 1) {
|
|
|
+ this.$notify({
|
|
|
+ title: "失败",
|
|
|
+ message: res.data.desc,
|
|
|
+ type: "error",
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
})
|
|
@@ -704,6 +721,8 @@ export default {
|
|
|
data: {
|
|
|
id: this.formData.id,
|
|
|
isFile: "0",
|
|
|
+ createId: this.formData.createId,
|
|
|
+ createName: this.formData.createName,
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
if (res.data.result == 0) {
|
|
@@ -714,7 +733,13 @@ export default {
|
|
|
});
|
|
|
this.actionName = "";
|
|
|
this.getData();
|
|
|
- }
|
|
|
+ }else if(res.data.result == 1) {
|
|
|
+ this.$notify({
|
|
|
+ title: "失败",
|
|
|
+ message: res.data.desc,
|
|
|
+ type: "error",
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
})
|
|
|
.catch(() => {});
|