-
-
- 上传附件
-
+ }" :data="{}">
+ 单个附件限制100M
-
+ 上传附件
+
单个附件限制100M
+
-
+
- ![]()
- ![]()
- ![]()
+ ![]()
+ ![]()
+ ![]()
{{ item.fileName }}
×
@@ -518,6 +360,7 @@ export default {
filePng,
zipPng,
imagePng,
+ delFileArr: []
};
},
watch: {
@@ -591,7 +434,7 @@ export default {
this.editData.projectName = this.projectName;
},
handleEdit(row) {
- this.editData = row;
+ this.editData = Object.assign({}, row);
this.editData.projectId = this.projectId;
this.editData.projectName = this.projectName;
this.dialogVisibleAdd = true;
@@ -621,7 +464,7 @@ export default {
this.resetList("del");
});
})
- .catch(() => {});
+ .catch(() => { });
},
handleBatchDelete() {
if (!this.selectedRows.length) {
@@ -724,30 +567,6 @@ export default {
this.userSelectDialogVisible = false;
},
eidtDemandRow(row, label, old) {
- // if (this.checkedRow.demandStatus == 4) {
- // this.$confirm("需求关闭后将无法操作和使用, 是否继续?", "提示", {
- // confirmButtonText: "确定",
- // cancelButtonText: "取消",
- // type: "warning",
- // })
- // .then(() => {
- // demandApi
- // .eidtDemand(this.checkedRow)
- // .then((res) => {
- // this.$message({
- // message: "修改成功",
- // type: "success",
- // });
- // this.getDemandList();
- // })
- // .catch((res) => {
- // row[label] = old;
- // });
- // })
- // .catch(() => {
- // row[label] = old;
- // });
- // } else {
demandApi
.eidtDemand(this.checkedRow)
.then((res) => {
@@ -808,11 +627,17 @@ export default {
this.resetList("add", res.data);
});
}
+
+
}
// }
});
},
- resetList(type, data) {
+ async resetList(type, data) {
+ if (this.delFileArr.length) {
+ await systemApi.delFileBatch(this.delFileArr.join(','))
+ this.delFileArr = []
+ }
let refreshId = "";
if (type == "edit") {
if (this.editData.versionId) {
@@ -894,6 +719,7 @@ export default {
res1.data.projectLeader,
...res2.data?.map((ele) => ele.userId),
];
+
},
setRowClass({ row }) {
if (row.demandStatus == 4) {
@@ -903,7 +729,7 @@ export default {
beforeUpload(file) {
this.fileLoading = true;
if (file.size > 1024 * 1024 * 100) {
- this.fileLoading = false;
+ this.fileLoading = false;
this.$message({
type: "warning",
@@ -912,8 +738,8 @@ export default {
return false;
}
},
- successUpload(res,file,fileList) {
- if(!fileList.filter((ele)=>ele.percentage!=100).length){
+ successUpload(res, file, fileList) {
+ if (!fileList.filter((ele) => ele.percentage != 100).length) {
this.fileLoading = false;
}
if (res.code == 200) {
@@ -924,6 +750,8 @@ export default {
fileUrl: res.url,
});
} else {
+ this.fileLoading = false;
+
this.$message({
type: "error",
message: res.msg,
@@ -937,48 +765,48 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- systemApi.delFile(row.id).then((res) => {
- this.editData.fileList = this.editData.fileList.filter(
- (ele) => ele.fileNewName != row.fileNewName
- );
- this.$message({
- type:'success',
- message: "删除成功!"
- })
- });
+ this.editData.fileList = this.editData.fileList.filter(
+ (ele) => ele.fileNewName != row.fileNewName
+ );
+ this.delFileArr.push(row.id)
+ this.$message({
+ type: 'success',
+ message: "删除成功!"
+ })
+
});
} else {
this.editData.fileList = this.editData.fileList.filter(
(ele) => ele.fileNewName != row.fileNewName
);
this.$message({
- type:'success',
- message: "删除成功!"
- })
+ type: 'success',
+ message: "删除成功!"
+ })
}
},
- getFileType(name){
- var data={
- jpg: 'image',
- jpeg: 'image',
- png: 'image',
- gif: 'image',
- bmp: 'image',
- tiff: 'image',
- svg: 'image',
- pdf: 'file',
- doc: 'file',
- docx: 'file',
- xls: 'file',
- xlsx: 'file',
- txt: 'file',
- ppt: 'file',
- zip: 'zip',
- rar: 'zip',
- tar: 'zip',
- targz: 'zip',
- }
- return data[name.split('.')[1]]||'file'
+ getFileType(name) {
+ var data = {
+ jpg: 'image',
+ jpeg: 'image',
+ png: 'image',
+ gif: 'image',
+ bmp: 'image',
+ tiff: 'image',
+ svg: 'image',
+ pdf: 'file',
+ doc: 'file',
+ docx: 'file',
+ xls: 'file',
+ xlsx: 'file',
+ txt: 'file',
+ ppt: 'file',
+ zip: 'zip',
+ rar: 'zip',
+ tar: 'zip',
+ targz: 'zip',
+ }
+ return data[name.split('.')[1]] || 'file'
}
},
created() {
@@ -1023,6 +851,7 @@ export default {
padding-left: 5px !important;
}
}
+
::v-deep .status-tag .el-radio__inner {
height: 18px !important;
width: 18px !important;
@@ -1030,41 +859,53 @@ export default {
text-align: center;
margin-bottom: 1px;
background: #fff !important;
+
&::after {
height: 10px;
width: 10px;
}
}
+
::v-deep .status-tag.pending .el-radio__inner {
border-color: #ff7d00;
+
&::after {
background-color: #ff7d00 !important;
}
}
+
::v-deep .status-tag.in-progress .el-radio__inner {
border-color: #4096ff !important;
+
&::after {
background-color: #4096ff !important;
}
}
+
::v-deep .status-tag.completed .el-radio__inner {
border-color: #50b6aa !important;
+
&::after {
background-color: #50b6aa !important;
}
}
+
::v-deep .status-tag.closed .el-radio__inner {
border-color: #ccc !important;
+
&::after {
background-color: #ccc !important;
}
}
+
::v-deep .status-tag.wait .el-radio__inner {
border-color: #999 !important;
+
&::after {
background-color: #999 !important;
}
}
+
::v-deep .status-tag.pending .el-radio__label {
color: #ff7d00 !important;
// background-color: #fff7e6;
@@ -1084,9 +925,11 @@ export default {
color: #999 !important;
// background-color: #f5f5f5;
}
+
::v-deep .status-tag.closed .el-radio__label {
color: #ccc !important;
}
+
.pagination {
margin-top: 20px;
display: flex;
@@ -1099,8 +942,10 @@ export default {
font-size: 16px;
font-weight: 600;
}
+
::v-deep .disabled.el-table__cell {
color: #ccc;
+
.el-dropdown-link {
color: #ccc;
}
@@ -1131,12 +976,15 @@ export default {
padding-left: 10px !important;
font-weight: 600;
}
+
.search-filters ::v-deep .el-input__inner {
padding-left: 80px !important;
+
::placeholder {
color: #bbb;
}
}
+
::v-deep .el-button--primary {
background-color: #4096ff;
}
@@ -1145,35 +993,44 @@ export default {
border-color: #4096ff;
background-color: #4096ff;
}
+
::v-deep .addForm {
.el-input__inner {
// width: 100%;
width: 200px;
}
+
.el-form-item {
width: 48%;
}
+
.el-input--prefix .el-input__inner {
padding-left: 40px;
}
}
+
::v-deep .longItem {
width: 100% !important;
+
.el-form-item__content {
width: 82.2%;
+
.el-input__inner {
width: 100%;
}
}
}
+
.tableSelect1 {
width: 150px;
text-align: left !important;
}
+
.tableSelect2 {
width: 100px;
text-align: left !important;
}
+
.selectedItem1 {
&::after {
content: "✔";
@@ -1184,9 +1041,11 @@ export default {
color: #4096ff;
}
}
+
.selectedItem2 {
color: #4096ff;
position: relative;
+
&::after {
content: "✔";
width: 10px;
@@ -1196,17 +1055,20 @@ export default {
color: #4096ff;
}
}
+
.tableBox {
.el-radio {
margin-left: 0;
}
}
+
.topTitle {
padding: 0 20px 20px;
font-size: 18px;
font-weight: 600;
color: #333;
}
+
.fileRow {
height: 38px;
padding: 0 10px;
@@ -1218,15 +1080,18 @@ export default {
font-size: 16px;
cursor: pointer;
}
- img{
+
+ img {
height: 18px;
}
}
-.fileItem{
+
+.fileItem {
gap: 10px;
-cursor: pointer;
+ cursor: pointer;
}
-.fileBox{
+
+.fileBox {
max-height: 200px;
overflow: auto;
padding-right: 10px;
diff --git a/src/views/project/demandManage/components/SidebarTree.vue b/src/views/project/demandManage/components/SidebarTree.vue
index 6f89c10..f598068 100644
--- a/src/views/project/demandManage/components/SidebarTree.vue
+++ b/src/views/project/demandManage/components/SidebarTree.vue
@@ -65,11 +65,22 @@
class="nodeIcon"
/>
-
- {{ data.title }}
-
+
+ {{ data.title }}
+
+
{
if (!res.data.length) {
- this.treeData=[]
+ this.treeData = [];
return;
}
res.data = res.data.map((ele) => {
@@ -221,6 +232,13 @@ export default {
});
return;
}
+ if (this.demandData.name.length > 10) {
+ this.$message({
+ message: "版本号限制10个字符",
+ type: "warning",
+ });
+ return;
+ }
let param = {
projectId: this.projectId,
versionNumber: this.demandData.name,
@@ -348,6 +366,11 @@ export default {
font-weight: 600;
line-height: 36px;
color: #333;
+ max-width: 160px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-right: 20px;
}
.nodeLabel.selected {
diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue
index d0afa8a..5acffc5 100644
--- a/src/views/project/detail.vue
+++ b/src/views/project/detail.vue
@@ -1,119 +1,61 @@
-
-
+
+
-
-
-
+
+
-
-
+
-
-
-
@@ -121,165 +63,81 @@
-
-
-
-
- 上传附件
-
- 单个附件限制100M
-
-
-
@@ -338,7 +187,7 @@ export default {
budgetDate: 0,
state: 0,
dataState: 0,
- fileList:[]
+ fileList: []
},
postOptions: [],
statusList: [],
@@ -378,13 +227,14 @@ export default {
{ required: true, message: "预算天数为必填", trigger: "blur" },
],
fileList: [
- { required: true, message: "预算天数为必填", trigger: "blur" },
+ { required: true, message: "附件为必填", trigger: "blur" },
],
},
filePng,
zipPng,
imagePng,
token: getToken(),
+ delFileArr: []
};
},
@@ -450,6 +300,8 @@ export default {
this.formData.projectId = res.data.projectId;
this.formData.projectCode = res.data.projectCode;
this.$modal.msgSuccess("操作成功");
+ this.fetchProjectData()
+
} else {
const hasLog = await projectApi.projectHasLogData({
projectId: this.formData.projectId,
@@ -463,9 +315,22 @@ export default {
)
.then(async () => {
await projectApi.updateProject(projectDataToSave);
+ if (this.delFileArr.length) {
+ await systemApi.delFileBatch(this.delFileArr.join(','))
+ this.delFileArr = []
+
+ }
+ this.fetchProjectData()
+
});
} else {
await projectApi.updateProject(projectDataToSave);
+ if (this.delFileArr.length) {
+ await systemApi.delFileBatch(this.delFileArr.join(','))
+ this.delFileArr = []
+ }
+ this.fetchProjectData()
+
this.$modal.msgSuccess("操作成功");
}
}
@@ -568,11 +433,11 @@ export default {
openProjectManagerSelect() {
this.projectManagerSelectedUser = this.formData.projectLeader
? [
- {
- userId: this.formData.projectLeader,
- nickName: this.formData.projectLeaderName,
- },
- ]
+ {
+ userId: this.formData.projectLeader,
+ nickName: this.formData.projectLeaderName,
+ },
+ ]
: [];
this.showProjectManagerSelect = true;
},
@@ -623,7 +488,7 @@ export default {
},
async fetchProjectData(id) {
try {
- const response = await projectApi.getProjectDetail(id);
+ const response = await projectApi.getProjectDetail(id||this.formData.projectId);
const projectData = response.data;
let {
projectId,
@@ -693,9 +558,10 @@ export default {
}
},
beforeUpload(file) {
+
this.fileLoading = true;
if (file.size > 1024 * 1024 * 100) {
- this.fileLoading = false;
+ this.fileLoading = false;
this.$message({
type: "warning",
@@ -704,8 +570,8 @@ export default {
return false;
}
},
- successUpload(res,file,fileList) {
- if(!fileList.filter((ele)=>ele.percentage!=100).length){
+ successUpload(res, file, fileList) {
+ if (!fileList.filter((ele) => ele.percentage != 100).length) {
this.fileLoading = false;
}
if (res.code == 200) {
@@ -716,6 +582,7 @@ export default {
fileUrl: res.url,
});
} else {
+ this.fileLoading = false;
this.$message({
type: "error",
message: res.msg,
@@ -729,48 +596,47 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- systemApi.delFile(row.id).then((res) => {
- this.formData.fileList = this.formData.fileList.filter(
- (ele) => ele.fileNewName != row.fileNewName
- );
- this.$message({
- type:'success',
- message: "删除成功!"
- })
- });
+ this.delFileArr.push(row.id)
+ this.formData.fileList = this.formData.fileList.filter(
+ (ele) => ele.fileNewName != row.fileNewName
+ );
+ this.$message({
+ type: 'success',
+ message: "删除成功!"
+ })
});
} else {
this.formData.fileList = this.formData.fileList.filter(
(ele) => ele.fileNewName != row.fileNewName
);
this.$message({
- type:'success',
- message: "删除成功!"
- })
+ type: 'success',
+ message: "删除成功!"
+ })
}
},
- getFileType(name){
- var data={
- jpg: 'image',
- jpeg: 'image',
- png: 'image',
- gif: 'image',
- bmp: 'image',
- tiff: 'image',
- svg: 'image',
- pdf: 'file',
- doc: 'file',
- docx: 'file',
- xls: 'file',
- xlsx: 'file',
- txt: 'file',
- ppt: 'file',
- zip: 'zip',
- rar: 'zip',
- tar: 'zip',
- targz: 'zip',
- }
- return data[name.split('.')[1]]||'file'
+ getFileType(name) {
+ var data = {
+ jpg: 'image',
+ jpeg: 'image',
+ png: 'image',
+ gif: 'image',
+ bmp: 'image',
+ tiff: 'image',
+ svg: 'image',
+ pdf: 'file',
+ doc: 'file',
+ docx: 'file',
+ xls: 'file',
+ xlsx: 'file',
+ txt: 'file',
+ ppt: 'file',
+ zip: 'zip',
+ rar: 'zip',
+ tar: 'zip',
+ targz: 'zip',
+ }
+ return data[name.split('.')[1]] || 'file'
},
downFile(url) {
window.open(url);
@@ -817,7 +683,8 @@ export default {
}
.custom-form ::v-deep .el-form-item {
- margin-bottom: 25px; /* 增加表单行间距 */
+ margin-bottom: 25px;
+ /* 增加表单行间距 */
}
.custom-form ::v-deep .el-form-item__content {
@@ -826,24 +693,29 @@ export default {
}
.custom-form ::v-deep .el-input {
- height: 42px; /* 调高输入框高度 */
+ height: 42px;
+ /* 调高输入框高度 */
width: 80%;
}
::v-deep .el-form-item__label {
- height: 42px; /* 调高输入框高度 */
+ height: 42px;
+ /* 调高输入框高度 */
line-height: 42px;
}
.custom-form ::v-deep .el-input__wrapper,
.custom-form ::v-deep .el-date-editor.el-input,
.custom-form ::v-deep .el-input-number {
- height: 42px; /* 调高输入框高度 */
+ height: 42px;
+ /* 调高输入框高度 */
width: 80%;
}
+
.custom-form ::v-deep .el-input__inner {
height: 100%;
}
+
.custom-form ::v-deep .el-select {
width: 100%;
}
@@ -855,12 +727,14 @@ export default {
display: flex;
flex-direction: column;
}
+
.userBox {
width: 100%;
display: flex;
flex-direction: column;
flex: 1;
}
+
.table-actions {
width: 100%;
display: flex;
@@ -927,13 +801,15 @@ export default {
height: 64px;
margin-bottom: 16px;
}
+
.fileRow {
height: 38px;
padding: 0 10px;
border: 1px solid #ccc;
border-radius: 5px;
margin-bottom: 10px;
- img{
+
+ img {
height: 18px;
}
@@ -942,12 +818,14 @@ export default {
cursor: pointer;
}
}
-.fileItem{
+
+.fileItem {
gap: 10px;
-cursor: pointer;
+ cursor: pointer;
}
-.fileBox{
- max-height: 200px;
+
+.fileBox {
+ max-height: 136px;
overflow: auto;
padding-right: 10px;
max-width: 90%;
diff --git a/src/views/projectBank/userProject.vue b/src/views/projectBank/userProject.vue
index d027c26..d388899 100644
--- a/src/views/projectBank/userProject.vue
+++ b/src/views/projectBank/userProject.vue
@@ -237,6 +237,8 @@ export default {
.selectBox span {
width: 120px;
}
+.content{
+
::v-deep .el-table {
height: 100% !important;
}
@@ -318,4 +320,6 @@ export default {
::v-deep .el-table__footer td {
border: none !important;
}
+}
+
diff --git a/src/views/workAppraisal/detail.vue b/src/views/workAppraisal/detail.vue
index ced2565..a2321c5 100644
--- a/src/views/workAppraisal/detail.vue
+++ b/src/views/workAppraisal/detail.vue
@@ -6,21 +6,14 @@
{{ examineTask.taskName }}
-
- ![]()
- ![]()
- ![]()
-
+
+
- {{ item.fileName }}
+
+ 上传附件
+
+ 单个附件限制100M
+
+
+
-
+ ![]()
+ ![]()
+ ![]()
+
+ {{ item.fileName }}
+ ×
×
- 保存
+ 保存
取消
- 新增成员
+ 新增成员
-
+
-
-
+
{{
postOptions.find((post) => post.dictValue === row.postId)
? postOptions.find((post) => post.dictValue === row.postId)
- .dictLabel
+ .dictLabel
: ""
}}
@@ -287,21 +145,12 @@
- 保存
- 提交
+ 保存
+ 提交
- {{ examineUser.userName }}
+ {{
+ examineUser.userName }}
考核评分：
@@ -28,93 +21,64 @@
-
+
-
+
-
+
+
+
+
{{ table[0].reviewCategory }}
+
+
+
+
+
-
+
+
+ ">
- 0
10
- 
-
-
+
+
+
+
-
-
+
{{ scope.row.score }}
暂未打分
@@ -122,49 +86,38 @@
-
- {{ scope.row.remark ? "查看" : "暂未评价" }}
-
- {{ scope.row.remark ? "查看" : "暂未评价" }}
+ {{ scope.row.remark ? "查看" : "暂未评价"
+ }}
+
+ {{ scope.row.remark ? "查看" : "暂未评价"
+ }}
+
评价
+
+
+
+
+
-
+
-
+
+
+
@@ -173,25 +126,16 @@
@@ -215,7 +159,7 @@ export default {
{
label: "评分标准",
prop: "remarks",
- minWidth:this.$route.query.isNormal? 240:360,
+ minWidth: this.$route.query.isNormal ? 240 : 360,
},
],
// 二维数组，每个子数组代表一个表格的数据
@@ -312,7 +256,10 @@ export default {
score: ele.score,
configId: ele.id,
remark: ele.remark,
+ reviewCategory: ele.reviewCategory,
}));
+ this.saveData.examineRemarkList = this.tableData.filter((ele)=>ele[0].reviewCategory!='发展与协作').map((ele) => ({ reviewCategory: ele[0].reviewCategory, remark: ele[0].remarkCate }))
+
this.saveData.taskId = this.examineTaskId;
this.saveData.examineId = this.examineId;
},
@@ -326,21 +273,21 @@ export default {
return;
}
// 提交
- if (this.saveData.examineDetailList.filter((ele) => !ele.score).length) {
+ if (this.saveData.examineDetailList.filter((ele) => !ele.score && ele.reviewCategory != '发展与协作' || (!ele.score && !this.isNormal)).length) {
this.$alert("存在未评分绩效项，请完善后再试", "提交失败", {
confirmButtonText: "确定",
type: "warning",
});
} else if (
- this.saveData.examineDetailList.filter((ele) => !ele.remark).length &&
+ this.saveData.examineDetailList.filter((ele) => !ele.remark && ele.reviewCategory == '发展与协作').length &&
this.isNormal &&
status
) {
- this.$alert("自评总结为必填，请完善后再试", "提交失败", {
+ this.$alert("发展与协作下的自评总结为必填，请完善后再试", "提交失败", {
confirmButtonText: "确定",
type: "warning",
});
- } else if (this.saveData.judgeContent.length > 300 && !this.isNormal) {
+ } else if (this.saveData.judgeContent.length > 300 && !this.isNormal && this.examineTask.templateType == '0') {
this.$message({
message: "总体评价限制300个字符",
type: "warning",
@@ -350,6 +297,11 @@ export default {
message: "总体评价为必填",
type: "warning",
});
+ } else if (this.saveData.examineRemarkList.filter((ele) => !ele.remark).length && this.isNormal) {
+ this.$message({
+ message: "存在未填写大类评价，请完善后再试",
+ type: "warning",
+ });
} else {
if (status) {
this.$confirm(
@@ -400,9 +352,11 @@ export default {
.conetentBox {
padding: 40px 30px 30px;
background-color: #fff;
- height: 90vh; /* 设置整体高度 */
+ height: 90vh;
+ /* 设置整体高度 */
overflow: auto;
}
+
.el-table {
margin-top: 20px;
}
@@ -412,31 +366,37 @@ export default {
font-size: 16px;
font-weight: bold;
}
+
::v-deep .el-slider__runway {
height: 14px;
border-radius: 10px;
margin: 10px !important;
/* width: 95%; */
}
+
::v-deep .el-slider__runway.disabled .el-slider__bar {
height: 14px;
border-radius: 10px;
background-color: #ff5722;
}
+
::v-deep .el-slider__stop {
height: 14px;
border-radius: 0;
z-index: 1000;
}
+
::v-deep .el-slider__bar {
height: 14px;
border-radius: 10px;
background: linear-gradient(to right, #ffb144, #ff7d00);
}
+
::v-deep .el-slider__button {
display: none;
}
+
.scoreText {
color: #fff;
position: absolute;
@@ -445,6 +405,7 @@ export default {
display: flex;
flex-direction: row;
}
+
::v-deep .el-table th {
text-align: left;
font-size: 14px;
@@ -456,6 +417,7 @@ export default {
font-size: 14px;
font-weight: bold;
}
+
.statusText {
color: #ff7d00;
position: absolute;
@@ -464,43 +426,52 @@ export default {
font-size: 14px;
font-weight: 600;
}
+
.hasEdit {
color: #999999;
}
+
::v-deep .el-dialog {
margin-top: 15% !important;
}
+
.tableBox {
height: 75%;
overflow: auto;
padding: 20px;
background-color: #fff;
}
+
.tableBox ::v-deep .el-table {
border-left: 1px solid #eeeeee;
border-right: 1px solid #eeeeee;
}
+
.tableRow {
padding: 20px;
box-shadow: 0 0 20px #0000000f;
}
+
.titleBox {
font-size: 20px;
font-weight: bold;
margin-bottom: 40px;
}
+
.headerBox {
padding: 20px;
background-color: #f9f9f9;
border-radius: 2px;
font-size: 16px;
}
+
.block {
width: 4px;
height: 24px;
background-color: #4096ff;
margin-right: 10px;
}
+
.stepBox {
position: absolute;
top: 33px;
@@ -509,6 +480,7 @@ export default {
background-color: #fff;
z-index: 100;
}
+
.totalBox {
width: 180px;
display: flex;
@@ -516,28 +488,35 @@ export default {
font-size: 16px;
color: #333333;
}
+
.scoreTotal {
font-size: 28px;
font-weight: 700;
color: #ff7d00;
}
+
::v-deep .el-table__body .sorceTableCell .cell {
margin-bottom: 20px;
}
-::v-deep .sorceTableCell.el-table__cell{
-padding-right: 10px !important;
+
+::v-deep .sorceTableCell.el-table__cell {
+ padding-right: 10px !important;
}
+
::v-deep .el-table__body .el-table__cell {
padding: 20px 40px;
}
+
::v-deep .el-table__header .el-table__cell {
padding: 14px 30px;
}
-::v-deep .el-table__header .el-table__cell .cell{
+
+::v-deep .el-table__header .el-table__cell .cell {
padding-left: 20px !important;
}
-::v-deep .editCell{
+
+::v-deep .editCell {
padding-right: 20px !important;
}
diff --git a/src/views/workAppraisal/taskModule/moduleDetail.vue b/src/views/workAppraisal/taskModule/moduleDetail.vue
new file mode 100644
index 0000000..29b3850
--- /dev/null
+++ b/src/views/workAppraisal/taskModule/moduleDetail.vue
@@ -0,0 +1,493 @@
+
+ 总体评价
-
+
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workAppraisal/taskModule/taskModule.vue b/src/views/workAppraisal/taskModule/taskModule.vue
new file mode 100644
index 0000000..776d9d6
--- /dev/null
+++ b/src/views/workAppraisal/taskModule/taskModule.vue
@@ -0,0 +1,492 @@
+
+
+
+
+
+
+ 看板名称
+
+
+
+
+ 看板类型
+
+
+
+
+
+
+
+
+
+
+ 累计权重
+
+ {{ item.title }}
+ {{ item.weight }}%
+
+
+
+
+
+
+ {{ ele.title }}
+ {{ ele.weight }}%
+
+
+ 总计
+
+ {{
+ scoreList.reduce((total, ele) => total + (ele.weight || 0), 0)
+ }}%
+
+
+
+
+
+
+
+ 考核项
+ 评分标准
+
+ 权重占比
+
+
+
+
+ {{ item.reviewItem }}
+
+
+ {{ item.remarks }}
+
+
+
+
+
+ 0
+ 20
+
+
+
+
+
+
+
+ {{ item.weight }}
+
+
+
+
+
+ {{ ele.title }}
+
+
+ 考核项
+ 评分标准
+
+ 权重占比
+
+
+
+
+
+
+
+
+ {{ item.reviewItem }}
+
+
+ {{ item.remarks }}
+
+
+
+
+
+ 0
+ 20
+
+
+
+
+
+
+
+ {{ item.weight }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workAppraisal/taskSet.vue b/src/views/workAppraisal/taskSet.vue
index 927222c..384e0e4 100644
--- a/src/views/workAppraisal/taskSet.vue
+++ b/src/views/workAppraisal/taskSet.vue
@@ -1,44 +1,18 @@
+
+
+
+
+
+
+
- + 新增任务
+ + 新增任务
-
+
-
-
+
-
-
-
+
-
+ }">
-
+ }">
+
+
@@ -168,16 +92,8 @@
+
+ 年度看板
+ 季度看板
+ 月度看板
+
+
+
+
+
+ 累计权重
-
{{ item.title }}
@@ -185,25 +101,16 @@
-
+
- {{ ele.title }}
{{ ele.weight }}%
+
总计
{{
@@ -214,64 +121,48 @@
-
指标
- 权重占比
+ 指标
+
+ 权重占比
+
-
+
@@ -335,9 +217,8 @@ export default {
if (value == 2) var color = "#999";
else var color = "#4096FF";
- return `${
- value ? "已过期" : "进行中"
- }`;
+ return `${value ? "已过期" : "进行中"
+ }`;
},
},
{
@@ -389,11 +270,14 @@ export default {
userIdList: [],
endTime: "",
peopleNumber: 0,
+ templateType:'0',
+ templateId:'',
year: "",
+ taskStatus: 0
},
rules: {
taskName: [
- { required: true, message: "请输入活动名称", trigger: "blur" },
+ { required: true, message: "请输入任务名称", trigger: "blur" },
{ min: 1, max: 20, message: "长度限制20个字符", trigger: "blur" },
],
peopleNumberDetail: [
@@ -403,11 +287,13 @@ export default {
{ required: true, message: "请选择截止时间", trigger: "blur" },
],
year: [{ required: true, message: "请选择年份", trigger: "blur" }],
+ templateId: [{ required: true, message: "请选择任务看板", trigger: "blur" }],
},
dialogVisible2: false,
letfValue: "",
scoreList: [],
selectRow: {},
+ modelList: [],
};
},
watch: {
@@ -495,6 +381,10 @@ export default {
userIdList: [],
endTime: "",
peopleNumber: 0,
+ templateType: '0',
+ templateId: '',
+ taskStatus: 0
+
};
this.selectRow = {};
},
@@ -507,6 +397,9 @@ export default {
this.taskData.peopleNumberDetail = row.peopleNumberDetail;
this.taskData.userIdList = row.userIdList;
this.taskData.endTime = row.endTime;
+ this.taskData.templateId = row.templateId;
+ this.taskData.templateType = row.templateType;
+ this.taskData.taskStatus = row.taskStatus;
this.taskData.year = String(row.year);
this.selectRow = row;
},
@@ -566,7 +459,7 @@ export default {
},
{
title: "系统核算绩效指标",
- list: Object.keys(arrList["2"]).map((ele) => ({
+ list: Object.keys(arrList["2"] || {}).map((ele) => ({
title: ele,
weight: arrList["2"][ele].reduce(
(total, item) => (item.weight || 0) + total,
@@ -575,7 +468,7 @@ export default {
rightArr: arrList["2"][ele],
type: 2,
})),
- weight: Object.values(arrList["2"]).reduce(
+ weight: Object.values(arrList["2"] || {}).reduce(
(total, item) =>
(item.reduce((total, item) => (item.weight || 0) + total, 0) ||
0) + total,
@@ -583,6 +476,9 @@ export default {
),
},
];
+ if (!arrList["2"]) {
+ this.scoreList.length = 2
+ }
this.dialogVisible2 = true;
});
@@ -683,16 +579,25 @@ export default {
});
});
},
- selectable(row,index){
- if(row.roles.find((ele)=>ele.roleName=='普通员工')){
- return true
- }else{
- return false
+ selectable(row, index) {
+ if (row.roles.find((ele) => ele.roleName == "普通员工")) {
+ return true;
+ } else {
+ return false;
}
- }
+ },
+ async getTaskModel() {
+ const res = await taskApi.getTaskModel({ pageNum: 1, pageSize: 1000 });
+ this.modelList = res.rows.map((ele) => ({
+ value: ele.id,
+ label: ele.templateName,
+ templateType: ele.templateType
+ }));
+ },
},
mounted() {
this.getTaskList();
+ this.getTaskModel();
},
};
@@ -724,7 +629,8 @@ export default {
}
.demo-form-inline .el-form-item:last-child {
- margin-right: 0; /* 移除最后一个元素的右边距 */
+ margin-right: 0;
+ /* 移除最后一个元素的右边距 */
}
.form-item {
@@ -789,6 +695,7 @@ export default {
left: 50%;
transform: translate(-50%, -50%);
}
+
::v-deep .el-table th {
text-align: center;
}
@@ -796,14 +703,17 @@ export default {
::v-deep .el-table .cell {
text-align: center;
}
+
::v-deep .el-dialog {
margin-top: 10% !important;
}
+
.modal {
display: flex;
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
}
+
.left {
width: 40%;
padding: 20px;
@@ -811,89 +721,108 @@ export default {
height: 450px;
overflow: auto;
}
+
.right {
width: 60%;
padding: 20px 40px;
height: 450px;
overflow: auto;
+
div.center {
text-align: center;
position: relative;
}
}
+
.scoreBox {
position: absolute;
top: 45px;
right: -20px;
}
+
::v-deep .el-slider__runway {
height: 14px;
border-radius: 10px;
margin: 10px !important;
/* width: 95%; */
}
+
::v-deep .el-slider__runway.disabled .el-slider__bar {
height: 14px;
border-radius: 10px;
background-color: #ff5722;
}
+
::v-deep .el-slider__stop {
height: 14px;
border-radius: 0;
z-index: 1000;
}
+
::v-deep .el-slider__bar {
height: 14px;
border-radius: 10px;
background: linear-gradient(to right, #ffb144, #ff7d00);
}
+
::v-deep .el-slider__button {
display: none;
}
+
.scoreText {
color: #1686d8;
}
+
.setText {
margin-bottom: 20px;
text-align: right;
}
+
.leftSub {
padding: 10px 20px 10px 10px;
margin-bottom: 5px;
cursor: pointer;
}
+
.setTitle {
font-weight: bold;
}
+
::v-deep .el-collapse-item__content {
padding-bottom: 10px;
}
-::v-deep .el-collapse-item__header {
-}
-.contentTitle {
-}
+
+::v-deep .el-collapse-item__header {}
+
+.contentTitle {}
+
.statusText {
color: #ff5722;
}
+
::v-deep .el-collapse {
border: none !important;
}
+
.search-buttons ::v-deep .el-button {
width: 90px !important;
height: 36px;
}
+
::v-deep .operation-buttons .el-button {
padding: 4px 8px;
margin: 0 2px;
font-weight: 600;
font-size: 14px;
}
+
.selectClass {
background-color: #4096ff;
color: #fff;
}
+
.scoreText {
color: #fff;
position: absolute;
@@ -903,12 +832,14 @@ export default {
flex-direction: row;
width: 40px;
}
+
.block {
width: 4px;
height: 24px;
background-color: #4096ff;
margin-right: 10px;
}
+
.stepBox {
position: absolute;
top: 29px;
@@ -917,6 +848,7 @@ export default {
background-color: #fff;
z-index: 100;
}
+
.totalBox {
width: 150px;
display: flex;
diff --git a/src/views/worklog/components/rightTable.vue b/src/views/worklog/components/rightTable.vue
index dcf72ef..6ccf1a7 100644
--- a/src/views/worklog/components/rightTable.vue
+++ b/src/views/worklog/components/rightTable.vue
@@ -162,11 +162,11 @@
-
{{ item.reviewItem }}
-
+ ">
- 0
20
-
-
-
+
-->
-
-
+
+
@@ -280,19 +171,10 @@
+
{{ item.weight }}
{{ item.weight }}%
20%
+
附件详情
-
+
{{ scope.row.loggerId && !scope.row.edit ? "编辑" : "确认" }}
@@ -174,6 +174,7 @@
type="text"
@click="handleDelete(scope.row, scope.$index)"
style="color: #666"
+ v-show="!disableTable"
>
{{ scope.row.loggerId && !scope.row.edit ? "删除" : "取消" }}
@@ -188,7 +189,7 @@
:close-on-click-modal="false"
>
-
+
-
+
删除
@@ -304,6 +305,7 @@ export default {
filePng,
zipPng,
imagePng,
+ delFileArr:[]
};
},
methods: {
@@ -328,7 +330,7 @@ export default {
ele.showContent = false;
return ele;
});
- if (this.tableData.length == 0) {
+ if (this.tableData.length == 0&&!this.disableTable) {
this.handleAdd();
}
});
@@ -406,6 +408,12 @@ export default {
await workLogApi.addLog(param);
this.$emit("changeCaleder");
}
+ if(this.delFileArr.length){
+ systemApi.delFile({ids:this.delFileArr}).then((res) => {
+ this.fileList = []
+ this.delFileArr=[]
+ });
+ }
this.$modal.msgSuccess("操作成功");
row.edit = false;
this.getLogList();
@@ -445,6 +453,8 @@ export default {
fileUrl: res.url,
});
} else {
+ this.fileLoading = false;
+
this.$message({
type: "error",
message: res.msg,
@@ -455,10 +465,27 @@ export default {
this.dialogVisibleFile = false;
this.fileList = [];
},
- saveFile() {
+ async saveFile() {
this.dialogVisibleFile = false;
-
this.checkRow.fileList = this.fileList;
+ if(this.checkRow.loggerId){
+ await workLogApi.editLog(this.checkRow);
+ if(this.delFileArr.length){
+ systemApi.delFileBatch(this.delFileArr.join(',')).then((res) => {
+ this.fileList = []
+ this.delFileArr=[]
+ this.getLogList();
+
+ });
+ }else{
+ this.getLogList();
+
+ }
+ }
+ this.$message({
+ type: "success",
+ message: "保存成功!",
+ });
},
async getAllProject() {
const response = await projectApi.listProject({
@@ -563,15 +590,14 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- systemApi.delFile(row.id).then((res) => {
- this.fileList = this.fileList.filter(
- (ele) => ele.fileNewName != row.fileNewName
- );
- this.$message({
+ this.delFileArr.push(row.id)
+ this.fileList = this.fileList.filter(
+ (ele) => ele.fileNewName != row.fileNewName
+ );
+ this.$message({
type:'success',
message: "删除成功!"
})
- });
});
} else {
this.fileList = this.fileList.filter(