From 0f4844c4422769914614715ad4851732bd2f5001 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期五, 02 七月 2021 21:01:35 +0800
Subject: [PATCH] 周五下午的修改
---
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue | 2
src/pages/shuohuangMonitorAnalyze/components/taskManage.vue | 71 ++++++++++-------------------------
src/api/shuohuang.ts | 7 +++
3 files changed, 28 insertions(+), 52 deletions(-)
diff --git a/src/api/shuohuang.ts b/src/api/shuohuang.ts
index ae2ba4c..e1929e4 100644
--- a/src/api/shuohuang.ts
+++ b/src/api/shuohuang.ts
@@ -127,6 +127,13 @@
method: 'post',
data
})
+
+ export const cancelAssign = (data: any) =>
+ request({
+ url: '/data/api-c/lkg/cancelAssign',
+ method: 'post',
+ data
+ })
export const uploadDirectory = (data: any) =>
request({
url: '/data/api-c/user/uploadMulti',
diff --git a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
index 415a061..a3d85f7 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/taskManage.vue
@@ -214,7 +214,7 @@
>鍙栨秷鍒嗛厤</span
>
<span
- @click="cancelDistribute(scope.row)"
+ @click="cancelAssign(scope.row)"
v-show="taskType == 2"
>鍙栨秷鎸囨淳</span
>
@@ -268,7 +268,7 @@
addToAssignList,
getTaskList,
distributeTask,
- cancelMission,
+ cancelMission,cancelAssign,
} from "@/api/shuohuang";
export default {
data() {
@@ -286,7 +286,7 @@
actCollapseName: "",
personList: [],
memberChecked: [],
- taskTableData: null,
+ taskTableData: [],
taskVideoChecked: [],
notAssignedOnly: false,
isIndeterminate: false,
@@ -330,7 +330,19 @@
},
cancelDistribute(row) {
let arr = row.VideoList.map(x => x.ID);
- cancelMission({ LkgIDs: arr }).then((res) => {
+ cancelMission({ VideoIDs: arr }).then((res) => {
+ if (res.success) {
+ this.$notify({
+ type: "success",
+ message: res.msg,
+ });
+ this.refreshAll();
+ }
+ });
+ },
+ cancelAssign(row) {
+ let arr = row.VideoList.map(x => x.ID);
+ cancelAssign({ VideoIDs: arr }).then((res) => {
if (res.success) {
this.$notify({
type: "success",
@@ -408,8 +420,8 @@
return a.map((item) => item.ID);
});
addToAssignList({
- UserID: this.memberChecked,
- LkgIDs: arr,
+ HandlerUserID: this.memberChecked,
+ VideoIDs: arr,
}).then((res) => {
if (res.success) {
this.$notify({
@@ -427,58 +439,15 @@
// _this.orgTreeDialogVisible = false;
});
},
- // deepNodeChildren(node) {
- // if (node.ChildDept && node.ChildDept.length > 0) {
- // return node.ChildDept.map((child) => {
- // let childObj = {};
- // childObj.id = child.ID;
- // childObj.label = child.Name;
- // childObj.Status = child.Status;
- // if (child.ChildDept) {
- // childObj.children = this.deepNodeChildren(child);
- // }
- // if (child.UserLst) {
- // childObj.children = this.deepNodeChildren(child);
- // }
- // return childObj;
- // });
- // } else if (node.UserLst && node.UserLst.length > 0) {
- // return node.UserLst.map((child) => {
- // let childObj = {};
- // childObj.id = child.ID;
- // childObj.label = child.Name;
- // childObj.Status = child.Status;
- // return childObj;
- // });
- // }
- // },
- // checkOrgNode(a, b, c) {
- // this.checkedOrg = a;
- // },
- // getOrganizeTreeData() {
- // let _this = this;
- // getOrganizeTree().then((res) => {
- // _this.organizeData = res.data.map((item) => {
- // let obj = {};
- // obj.id = item.ID;
- // obj.label = item.Name;
- // obj.Status = item.Status;
- // obj.children = _this.deepNodeChildren(item);
- // return obj;
- // });
- // });
- // },
distributeTask() {
let _this = this;
distributeTask({
- LkgIDs: this.taskVideoChecked,
+ VideoIDs: this.taskVideoChecked,
+ distributerID: ""
}).then((res) => {
_this.renderTaskTable();
});
},
- // selOrg () {
- // this.orgTreeDialogVisible = true;
- // },
},
};
</script>
diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
index 7251adf..1a5f8b3 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
@@ -127,7 +127,7 @@
PageIndex: 1,
pageSizes: [8, 15, 20],
PageSize: 8,
- searchTime: [this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 5).format("YYYY-MM-DD HH:mm:ss"), this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
+ searchTime: ["2020-01-01 00:00:00", this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
}
},
mounted () {
--
Gitblit v1.8.0