From b734890015ea3b6870969e7bc6637a2481ed4bd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 24 八月 2023 10:15:23 +0800
Subject: [PATCH] Merge branch 'DeBug' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/followvisit/tasklist/index.vue | 109 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 57 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 3b969de..1849fc0 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -139,78 +139,68 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="搴忓彿"
- align="center"
- key="userId"
- prop="userId"
- />
+ <el-table-column label="搴忓彿" align="center" key="id" prop="id" />
<el-table-column
label="浠诲姟鍚嶇О"
align="center"
sortable
- key="userName"
- prop="userName"
+ key="name"
+ prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="鏈嶅姟妯℃澘"
+ label="浠诲姟鎻忚堪"
align="center"
- key="types"
- prop="types"
+ key="describe"
+ prop="describe"
/>
<el-table-column
- label="鍒涘缓鏃ユ湡"
+ label="浠诲姟鎬绘暟"
align="center"
key="nickName"
prop="nickName"
/>
- <el-table-column
- label="寰呮墽琛�/鎬绘暟"
+ <!-- <el-table-column
+ label="鎮ｈ�呮�绘暟"
align="center"
key="phonenumber"
prop="phonenumber"
width="120"
- >
- <template slot-scope="scope">
- <span style="margin-left: 10px"
- >{{ scope.row.date }}/{{ scope.row.data }}</span
- >
- </template>
- </el-table-column>
+ /> -->
<el-table-column
- label="鎵ц鐘舵��"
+ label="鍒涘缓浜�"
align="center"
- key="topicnumber"
- prop="topicnumber"
- width="120"
- :show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <div>鎵ц瀹屾垚/鎵ц澶辫触</div>
- </template>
- </el-table-column>
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- key="topicnumberaa"
- prop="topicnumberaa"
- sortable
+ key="create_by"
+ prop="create_by"
width="120"
:show-overflow-tooltip="true"
/>
-
<el-table-column
- label="瀹℃牳鏃堕棿"
+ label="鍒涘缓鏃堕棿"
sortable
align="center"
- prop="createTime"
+ prop="create_time"
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.create_time) }}</span>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ label="鏈�杩戜慨鏀�"
+ sortable
+ align="center"
+ prop="update_time"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span
+ >{{ scope.row.update_by }}
+ {{ parseTime(scope.row.update_time) }}</span
+ >
</template>
</el-table-column>
<el-table-column
@@ -247,7 +237,7 @@
><i class="el-icon-s-data"></i>璇︽儏</span
></el-button
>
- <el-button
+ <!-- <el-button
size="medium"
type="text"
@click="handleUpdate(scope.row)"
@@ -255,7 +245,7 @@
><span class="button-bb"
><i class="el-icon-s-order"></i>鎶ヨ〃</span
></el-button
- >
+ > -->
<el-button
size="medium"
type="text"
@@ -344,6 +334,14 @@
resetUserPwd,
changeUserStatus,
} from "@/api/system/user";
+import {
+ listsvr_prj,
+ getsvr_task,
+ addsvr_task,
+ updatesvr_task,
+ delsvr_task,
+} from "@/api/smartorpor/svr_task";
+
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -581,8 +579,9 @@
/** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
getList() {
this.loading = true;
- listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+ listsvr_prj(this.addDateRange(this.topqueryParams, this.dateRange)).then(
(response) => {
+ console.log(response);
this.userList = response.rows;
this.total = response.total;
this.loading = false;
@@ -686,8 +685,11 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
- this.addalteropen = true;
+ this.$router.push({
+ path: "/followvisit/tasklist/FollowupDetails/",
+ });
+ // this.reset();
+ // this.addalteropen = true;
// getUser().then((response) => {
// this.postOptions = response.posts;
// this.roleOptions = response.roles;
@@ -697,17 +699,10 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.reset();
- const userId = row.userId || this.ids;
- getUser(userId).then((response) => {
- this.form = response.data;
- this.postOptions = response.posts;
- this.roleOptions = response.roles;
- this.$set(this.form, "postIds", response.postIds);
- this.$set(this.form, "roleIds", response.roleIds);
- this.addalteropen = true;
- this.title = "淇敼鐢ㄦ埛";
- this.form.password = "";
+ // const userId = row.userId || this.ids;
+ this.$router.push({
+ path: "/followvisit/tasklist/FollowupDetails/",
+ query: { id: row.id },
});
},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3