Browse Source

Merge remote-tracking branch 'origin/master'

dev_kxc
zhuyulei 1 year ago
parent
commit
86d430b17e
  1. 4
      jwtech-admin-page/src/views/project/report/index.vue
  2. 4
      jwtech-admin-page/src/views/project/special/index.vue
  3. 19
      jwtech-admin-page/src/views/project/special/options/basePage.vue
  4. 2
      jwtech-admin-page/src/views/project/special/options/documentPage.vue
  5. 3
      jwtech-admin-page/src/views/project/special/options/resultsPage.vue
  6. 7
      jwtech-admin-page/src/views/project/special/options/taskPage.vue

4
jwtech-admin-page/src/views/project/report/index.vue

@ -13,7 +13,7 @@
<el-row :gutter="20" v-show="showSearch">
<el-col :span="22">
<!-- 搜索条件 -->
<el-form :model="queryParams" :inline="true" label-width="68px">
<el-form :model="queryParams" :inline="true" label-width="80px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.data.projectName"
@ -476,7 +476,7 @@
/> -->
<el-upload
class="upload-demo"
action="http://127.0.0.1/thinking/common/upload"
action="thinking/common/upload"
:headers="headers"
:on-preview="handleAttachmentPreview"
:on-remove="handleAttachmentRemove"

4
jwtech-admin-page/src/views/project/special/index.vue

@ -480,7 +480,7 @@ export default {
openOptions() {
this.routeList.push({
path: "/project/special/options",
routeName: "专题基信息",
routeName: "专题基信息",
isEdit: false,
});
//
@ -588,7 +588,7 @@ export default {
getProjectinfo(id).then((response) => {
this.routeList.push({
path: "/project/special/options",
routeName: "专题基信息",
routeName: "专题基信息",
isEdit: true,
});

19
jwtech-admin-page/src/views/project/special/options/basePage.vue

@ -164,11 +164,11 @@
:headers="headers"
:on-preview="handlePreview"
:on-remove="(file) => handleRemove(file, 'fileList1')"
:before-remove="beforeRemove"
multiple
:on-exceed="handleExceed"
:on-success="(_, fileList) => submitUpload(fileList, 'fileList1')"
:file-list="fileList1"
:before-upload="beforeUpload"
>
<el-button size="small" type="primary" plain>
<i class="el-icon-upload el-icon--right"></i>
@ -450,9 +450,20 @@ export default {
} 个文件`
);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`);
},
//
beforeUpload(file) {
let size = Number(file.size / 1024 / 1024);
if (size > 100) {
this.$message.warning("文件大小不能超过100MB");
return false;
}
//
var type = file.name.substring(file.name.lastIndexOf(".") + 1);
if (['png', 'jpg', 'pdf', 'word', 'excel'].indexOf(type) === -1) {
this.$message.warning("请上传指定格式的文件!");
return false;
}
},
},
};
</script>

2
jwtech-admin-page/src/views/project/special/options/documentPage.vue

@ -302,7 +302,7 @@
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label"> 可行性研究报告相关附件 </template>
<template slot="label"> 规划项目验收文档附件 </template>
<template v-if="this.documentMsg.acceptDocumentAttachment">
<div
v-for="(item, index) in JSON.parse(

3
jwtech-admin-page/src/views/project/special/options/resultsPage.vue

@ -131,7 +131,8 @@
label="评价内容"
align="center"
prop="evaluationContent"
min-width="180"
min-width="300"
:show-overflow-tooltip="true"
/>
<el-table-column

7
jwtech-admin-page/src/views/project/special/options/taskPage.vue

@ -139,12 +139,12 @@
prop="projectName"
min-width="180"
/>
<el-table-column
<!-- <el-table-column
label="项目编号"
align="center"
prop="proNo"
min-width="180"
/>
/> -->
<el-table-column
label="规划上报日期"
align="center"
@ -211,7 +211,8 @@
label="批复意见"
align="center"
prop="replyOpinion"
min-width="180"
min-width="300"
:show-overflow-tooltip="true"
/>
<el-table-column
label="意见附件"

Loading…
Cancel
Save