@@ -24,7 +24,7 @@
:divided="!!item.divided"
:name="item.path">
{{$L(item.name)}}
-
+
@@ -528,6 +528,9 @@ export default {
this.archivedProjectShow = true;
return;
case 'workReport':
+ if (this.reportUnreadNumber > 0) {
+ this.reportTabs = "receive";
+ }
this.workReportShow = true;
return;
case 'clearCache':
@@ -742,7 +745,6 @@ export default {
},
getReportUnread() {
- this.reportTabs = "my";
this.$store.dispatch("call", {
url: 'report/unread',
method: 'get',
@@ -750,10 +752,6 @@ export default {
this.reportUnreadNumber = data.total ? data.total : 0;
}).catch(() => {});
},
-
- openReceiveReport(){
- this.reportTabs = "receive";
- }
}
}
diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue
index 6887f2cc..72c9141e 100644
--- a/resources/assets/js/pages/manage/components/ReportEdit.vue
+++ b/resources/assets/js/pages/manage/components/ReportEdit.vue
@@ -10,17 +10,17 @@
{{ $L("日报") }}
-
-
+
-
-
+
@@ -62,7 +62,7 @@
@@ -124,15 +124,14 @@ export default {
},
handleSubmit: function () {
- let id = this.reportData.id;
if (this.reportData.receive.length === 0) {
$A.messageError(this.$L("请选择接收人"));
return false;
}
- if (this.id === 0 && id > 1) {
+ if (this.id === 0 && this.reportData.id > 1) {
$A.modalConfirm({
title: '覆盖提交',
- content: '是否覆盖提交',
+ content: '你已提交过此日期的报告，是否覆盖提交？',
loading: true,
zIndex: 2000,
onOk: () => {
@@ -142,7 +141,6 @@ export default {
} else {
this.doSubmit();
}
-
},
doSubmit() {
diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue
index 4ad4b762..cb415c81 100644
--- a/resources/assets/js/pages/manage/components/ReportMy.vue
+++ b/resources/assets/js/pages/manage/components/ReportMy.vue
@@ -114,8 +114,8 @@ export default {
align: 'center',
width: 100,
minWidth: 100,
- render: (h, params) => {
- if (!params.row.id) {
+ render: (h, {column, row}) => {
+ if (!row.id) {
return null;
}
const vNodes = [
@@ -126,7 +126,7 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
- this.$emit("edit", params.row.id);
+ this.$emit("edit", row.id);
}
}
})]),
@@ -138,14 +138,14 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
- this.$emit("detail", params.row);
+ this.$emit("detail", row);
}
}
})]),
];
return h('TableAction', {
props: {
- column: params.column
+ column
}
}, vNodes);
},
diff --git a/resources/assets/js/pages/manage/components/ReportReceive.vue b/resources/assets/js/pages/manage/components/ReportReceive.vue
index 5b2ebb4c..4f428f4d 100644
--- a/resources/assets/js/pages/manage/components/ReportReceive.vue
+++ b/resources/assets/js/pages/manage/components/ReportReceive.vue
@@ -103,13 +103,13 @@ export default {
initLanguage() {
this.noDataText = this.noDataText || "数据加载中.....";
this.columns = [{
- "title": this.$L("标题"),
- "key": 'title',
- "sortable": true,
- "minWidth": 120,
- render: (h, params) => {
+ title: this.$L("标题"),
+ key: 'title',
+ sortable: true,
+ minWidth: 120,
+ render: (h, {row}) => {
let arr = []
- const myUser = params.row.receives_user.find(({userid}) => userid == this.userId)
+ const myUser = row.receives_user.find(({userid}) => userid == this.userId)
if (myUser && myUser.pivot.read == 0) {
arr.push(
h('Tag', {
@@ -117,35 +117,35 @@ export default {
color: "orange",
}
}, this.$L("未读")),
- h('span', params.row.title)
+ h('span', row.title)
)
} else {
arr.push(
- h('span', params.row.title)
+ h('span', row.title)
)
}
return h('div', arr)
}
}, {
- "title": this.$L("类型"),
- "key": 'type',
- "align": 'center',
- "sortable": true,
- "maxWidth": 80,
+ title: this.$L("类型"),
+ key: 'type',
+ align: 'center',
+ sortable: true,
+ maxWidth: 80,
}, {
- "title": this.$L("接收时间"),
- "key": 'receive_time',
- "align": 'center',
- "sortable": true,
- "maxWidth": 180,
+ title: this.$L("接收时间"),
+ key: 'receive_time',
+ align: 'center',
+ sortable: true,
+ maxWidth: 180,
}, {
title: this.$L("操作"),
align: 'center',
width: 100,
minWidth: 100,
- render: (h, params) => {
- if (!params.row.id) {
+ render: (h, {column, row}) => {
+ if (!row.id) {
return null;
}
const vNodes = [
@@ -157,10 +157,10 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
- this.$emit("detail", params.row)
- const myUser = params.row.receives_user.find(({userid}) => userid == this.userId)
+ this.$emit("detail", row)
+ const myUser = row.receives_user.find(({userid}) => userid == this.userId)
if (myUser) {
- this.$set(myUser, 'pivot.read', 1)
+ this.$set(myUser.pivot, 'read', 1)
}
}
}
@@ -168,7 +168,7 @@ export default {
];
return h('TableAction', {
props: {
- column: params.column
+ column: column
}
}, vNodes);
},