From 2aecb223c25bda27aed109d9677fa421be2c0f91 Mon Sep 17 00:00:00 2001
From: heimawl <1785969728@qq.com>
Date: 星期五, 18 八月 2023 17:57:26 +0800
Subject: [PATCH] 11

---
 src/views/followvisit/tasklist/index.vue                 |  104 ++--
 src/api/smartorpor/ivr_tasksms.js                        |   71 +++
 src/api/smartorpor/ivr_taskcall.js                       |   71 +++
 src/views/followvisit/tasklist/FollowupDetails/index.vue |  582 ++++++++++++++--------------
 src/api/smartorpor/svr_task.js                           |   80 ++++
 src/api/smartorpor/svr_prjtask.js                        |  128 ++++++
 src/api/smartorpor/svr_prjtaskline.js                    |   89 ++++
 src/api/smartorpor/ivr_task.js                           |   71 +++
 8 files changed, 854 insertions(+), 342 deletions(-)

diff --git a/src/api/smartorpor/ivr_task.js b/src/api/smartorpor/ivr_task.js
new file mode 100644
index 0000000..2762bd3
--- /dev/null
+++ b/src/api/smartorpor/ivr_task.js
@@ -0,0 +1,71 @@
+
+	/*API鎺ュ彛
+	      taskid//  
   svrtaskid//鎮h�呮湇鍔′换鍔d
   taskname//  
   templateid//  
   templatename//  
   labelinfo//  
   state//  
   count//  
   executed//  
   unexecuted//  
   fail//  
   userid//  
   username//  
   addtime//  
   checkuserid//  
   checkusername//  
   checktime//  
   type// 1锛屽嚭闄㈤殢璁匡紱2锛屼綋妫�閫氱煡锛�3锛屾弧鎰忓害璋冩煡锛�4锛屽鏁欙紱 
   typename//  
   usebqsms// 0.涓嶄娇鐢ㄦ挱鍓嶇煭淇� 1.浣跨敤鎾墠鐭俊 
   usebhsms// 0.涓嶄娇鐢ㄦ挱鍚庣煭淇� 1.浣跨敤鎾墠鐭俊 
   usesendsms//  
   deptcode//  
   del_flag// 鍒犻櫎鏍囪 
   update_by// 鏇存柊浜� 
   update_time// 鏇存柊鏃堕棿 
   create_by// 鍒涘缓浜� 
   create_time// 鍒涘缓鏃堕棿 
   isupload// 涓婁紶鏍囪 
   upload_time// 涓婁紶鏃堕棿 
   orgid// 鏈烘瀯ID 
   pid//鐖禝D
   guid//GUID
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistivr_task(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listivr_task(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/list',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getivr_task(taskid) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/' + taskid,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addivr_task(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updateivr_task(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delivr_task(taskid) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_task/del/' +taskid,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/api/smartorpor/ivr_taskcall.js b/src/api/smartorpor/ivr_taskcall.js
new file mode 100644
index 0000000..1fe9ab2
--- /dev/null
+++ b/src/api/smartorpor/ivr_taskcall.js
@@ -0,0 +1,71 @@
+
+	/*API鎺ュ彛
+	      callid//  
   sendname// 鍙戦�佷汉 
   phone// 鎵嬫満鍙� 
   sex//  
   age// 骞撮緞 
   sfzh// 韬唤璇佸彿 
   addr// 鍦板潃 
   senderdetail//  
   inserttype//  
   taskid// 浠诲姟ID 
   templateid//  
   templatename// 妯℃澘鍚� 
   senddate// 鍙戦�佹棩鏈� 
   sendlimitabegin// 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� 
   sendlimitaend// 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒� 
   sendlimitpbegin// 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒� 
   sendlimitpend// 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒� 
   sendlimitnbegin// 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒� 
   sendlimitnend// 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒� 
   sendstate// 鍙戦�佺姸鎬� 
   senduuid// 鍙戦�乁UID 
   result// 缁撴灉 
   finishtime// 瀹屾垚鏃堕棿 
   userid// 鐢ㄦ埛ID 
   username// 鐢ㄦ埛鍚� 
   outbounduuid//  
   recordid// 灏辫瘖璁板綍缂栧彿 
   recallcount// 閲嶆嫧鎬绘暟 
   exrecallcount// 褰撳墠閲嶆嫧娆℃暟 
   pulltime// 鎷夊彇鏃堕棿 
   bqsms//  
   bhsms//  
   deptcode//  
   labelstatus//  
   del_flag// 鍒犻櫎鏍囪 
   update_by// 鏇存柊浜� 
   update_time//鏇存柊鏃堕棿
   create_by// 鍒涘缓浜� 
   create_time// 鍒涘缓鏃堕棿
   isupload// 涓婁紶鏍囪 
   upload_time// 涓婁紶鏃堕棿 
   orgid// 鏈烘瀯ID 
   pid//鐖禝D
   guid//GUID
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistivr_taskcall(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listivr_taskcall(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/list',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getivr_taskcall(callid) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/' + callid,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addivr_taskcall(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updateivr_taskcall(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delivr_taskcall(callid) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_taskcall/del/' +callid,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/api/smartorpor/ivr_tasksms.js b/src/api/smartorpor/ivr_tasksms.js
new file mode 100644
index 0000000..1946047
--- /dev/null
+++ b/src/api/smartorpor/ivr_tasksms.js
@@ -0,0 +1,71 @@
+
+	/*API鎺ュ彛
+	      id//  
   taskid// 浠诲姟缂栧彿 
   type// 绫诲瀷0.涓嶄娇鐢� 1.浠诲姟鍓� 2.浠诲姟鍚� 
   smstemplateid// 鐭俊妯℃澘涓婚敭 
   phonestatusid// 鐢佃瘽鐘舵�佷富閿� 
   smstemplatename// 鐭俊妯℃澘鍚嶇О 
   phonestatusname// 鐢佃瘽鐘舵�佸悕绉� 
   isdel//  
   content//  
   tagid// 鏍囩缂栧彿 
   del_flag// 鍒犻櫎鏍囪 
   update_by// 鏇存柊浜� 
   update_time// 鏇存柊鏃堕棿 
   create_by// 鍒涘缓浜� 
   create_time// 鍒涘缓鏃堕棿 
   isupload// 涓婁紶鏍囪 
   upload_time// 涓婁紶鏃堕棿 
   orgid// 鏈烘瀯ID 
   pid//鐖禝D
   guid//GUID
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistivr_tasksms(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listivr_tasksms(query) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/list',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getivr_tasksms(id) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/' + id,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addivr_tasksms(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updateivr_tasksms(data) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delivr_tasksms(id) {
+	  return request({
+		url: 'proc/smartor/entity/ivr/ivr_tasksms/del/' +id,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/api/smartorpor/svr_prjtask.js b/src/api/smartorpor/svr_prjtask.js
new file mode 100644
index 0000000..8b96b33
--- /dev/null
+++ b/src/api/smartorpor/svr_prjtask.js
@@ -0,0 +1,128 @@
+
+/*鎮h�呮湇鍔′换鍔¤〃API鎺ュ彛
+  id// 鑷ID 
+   tasktype// 浠诲姟绫诲瀷 
+   name//浠诲姟鍚嶇О
+   describe//浠诲姟鎻忚堪
+   schemeid// 鏂规ID 
+   schemeplanid// 璁″垝ID 
+   state// 鐘舵��
+   impltype //鎵ц鏂瑰紡
+   impTemplate //鎵ц妯℃澘
+   plantime// 璁″垝鎵ц鏃堕棿 
+   actualtime// 瀹為檯瀹屾垚鏃堕棿 
+   overtime// 閫炬湡鏃堕棿 
+
+   del_flag// 鍒犻櫎鏍囪 
+   create_by// 鍒涘缓浜� 
+   create_time// 鍒涘缓鏃堕棿 
+   update_by// 鏇存柊浜� 
+   update_time// 鏇存柊鏃堕棿 
+   isupload// 涓婁紶鏍囪 
+   upload_time// 涓婁紶鏃堕棿 
+   pid//鐖禝D
+   guid//GUID
+   pguid//鐖�
+   baselinetime// 鍩虹嚎鏃堕棿 
+   plantime// 璁″垝鎵ц鏃堕棿 
+   actualtime// 瀹為檯瀹屾垚鏃堕棿 
+   overtime// 閫炬湡鏃堕棿 
+   patientsource// 鎮h�呮潵婧�
+   taskconfigid// 閰嶇疆ID 
+   relationid// 鍏宠仈缂栧彿 绉戝椤圭洰闂嵎瀹f暀 
+   relationname// 鍏宠仈鍚嶇О 
+   content// 浠嬬粛鎻愰啋鍐呭 
+   tipscontent// 鎻愮ず鍐呭 
+   finshtime// 鍏抽棴鏃堕棿 
+   finshtype// 鍏抽棴绫诲瀷
+   finshdesc// 鍏抽棴璇存槑 
+   termvaliditytime// 鏈夋晥鏈� 
+   schemestatus// 鏄惁鐢熸垚鏂规
+   visitid// 灏辫瘖ID 
+   visittype// 灏辫瘖绫诲瀷 
+   tasksource// 浠诲姟鏉ユ簮
+   relationtype// 鍏宠仈椤圭洰绫诲瀷
+   isartificial// 鏄惁浜哄伐澶勭悊
+   overduetipstime// 灏嗛�炬湡鏃堕棿 
+   isabnormal// 鏄惁寮傚父璺熻繘浠诲姟
+   artificialtag// 宸茬粡浜哄伐澶勭悊鏍囧織
+   relationcode// 鍏宠仈浠g爜 闂嵎銆佸鏁欍�佸洖璁裤�佸璇婃彁閱掋�佷綋妫�鎻愰啋 
+   schemecode// 鏂规浠g爜 
+   lastplantime// 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� 
+   istest// 鏄惁涓烘祴璇曚换鍔�
+   firstplantime// 绗竴娆¤鍒掓墽琛屾椂闂� 
+   repeatsecond// 閲嶅彂娆℃暟
+   isrepeat// 鏄惁瀛樺湪閲嶅彂鏍囪 
+   ismanual// 鎵嬪姩鎵ц鏍囪 
+   losstime// 澶辫鏃堕棿 
+   relationlistid// 
+   orgid// 鏈烘瀯ID 
+
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistsvr_prjtask(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listsvr_prjtask(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/list',
+		method: 'post',
+		data: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getsvr_prjtask(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/' + id,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addsvr_prjtask(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updatesvr_prjtask(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delsvr_prjtask(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtask/del/' +id,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/api/smartorpor/svr_prjtaskline.js b/src/api/smartorpor/svr_prjtaskline.js
new file mode 100644
index 0000000..5008295
--- /dev/null
+++ b/src/api/smartorpor/svr_prjtaskline.js
@@ -0,0 +1,89 @@
+
+	/*鎮h�呮湇鍔′换鍔¤〃API鎺ュ彛
+	      id// 鑷ID 
   schemeid// 鏂规ID 
   schemeplanid// 璁″垝ID 
   patientid// 鎮h��
   state// 鐘舵��
   plantime// 璁″垝鎵ц鏃堕棿 
   actualtime// 瀹為檯瀹屾垚鏃堕棿 
   overtime// 閫炬湡鏃堕棿 
+   tasktype// 浠诲姟绫诲瀷 
+   isartificial// 鏄惁浜哄伐澶勭悊
+   overduetipstime// 灏嗛�炬湡鏃堕棿 
+   isabnormal// 鏄惁寮傚父璺熻繘浠诲姟
+   
+   sendname //濮撳悕
+   phone  //鐢佃瘽
+   sex   //鎬у埆
+   sge   //骞撮緞
+   empident   //鐪佷唤璇佸彿
+   addr  //鍦板潃
+
+   lastplantime// 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� 
+   istest// 鏄惁涓烘祴璇曚换鍔�
+   firstplantime// 绗竴娆¤鍒掓墽琛屾椂闂� 
+   repeatsecond// 閲嶅彂娆℃暟
+
   baselinetime// 鍩虹嚎鏃堕棿 
+   patientsource// 鎮h�呮潵婧�
   taskconfigid// 閰嶇疆ID 
   relationid// 鍏宠仈缂栧彿 绉戝椤圭洰闂嵎瀹f暀 
   relationname// 鍏宠仈鍚嶇О 
   content// 浠嬬粛鎻愰啋鍐呭 
   tipscontent// 鎻愮ず鍐呭 
   finshtime// 鍏抽棴鏃堕棿 
   finshtype// 鍏抽棴绫诲瀷
   finshdesc// 鍏抽棴璇存槑 
   termvaliditytime// 鏈夋晥鏈� 
   schemestatus// 鏄惁鐢熸垚鏂规
   visitid// 灏辫瘖ID 
   visittype// 灏辫瘖绫诲瀷 
   tasksource// 浠诲姟鏉ユ簮
   relationtype// 鍏宠仈椤圭洰绫诲瀷
   isartificial// 鏄惁浜哄伐澶勭悊
   overduetipstime// 灏嗛�炬湡鏃堕棿 
   isabnormal// 鏄惁寮傚父璺熻繘浠诲姟
   artificialtag// 宸茬粡浜哄伐澶勭悊鏍囧織
   relationcode// 鍏宠仈浠g爜 闂嵎銆佸鏁欍�佸洖璁裤�佸璇婃彁閱掋�佷綋妫�鎻愰啋 
   schemecode// 鏂规浠g爜 
   lastplantime// 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� 
   istest// 鏄惁涓烘祴璇曚换鍔�
   firstplantime// 绗竴娆¤鍒掓墽琛屾椂闂� 
   repeatsecond// 閲嶅彂娆℃暟
   isrepeat// 鏄惁瀛樺湪閲嶅彂鏍囪 
   ismanual// 鎵嬪姩鎵ц鏍囪 
   losstime// 澶辫鏃堕棿 
   relationlistid// 
   orgid// 鏈烘瀯ID 
   del_flag// 鍒犻櫎鏍囪 
   create_by// 鍒涘缓浜� 
   create_time// 鍒涘缓鏃堕棿 
   update_by// 鏇存柊浜� 
   update_time// 鏇存柊鏃堕棿 
   isupload// 涓婁紶鏍囪 
   upload_time// 涓婁紶鏃堕棿 
   pid//鐖禝D
   guid//GUID
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistsvr_prjtaskline(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listsvr_prjtaskline(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/list',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getsvr_prjtaskline(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/' + id,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addsvr_prjtaskline(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updatesvr_prjtaskline(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delsvr_prjtaskline(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prjtaskline/del/' +id,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/api/smartorpor/svr_task.js b/src/api/smartorpor/svr_task.js
new file mode 100644
index 0000000..57d956f
--- /dev/null
+++ b/src/api/smartorpor/svr_task.js
@@ -0,0 +1,80 @@
+
+	/*涓讳换鍔PI鎺ュ彛
+	      id// 鑷ID 
+   state// 鐘舵��
+   name//浠诲姟鍚嶇О
+   describe//浠诲姟鎻忚堪
+   create_by// 鍒涘缓浜� 
+   create_time// 鍒涘缓鏃堕棿 
+   update_by// 鏇存柊浜� 
+   update_time// 鏇存柊鏃堕棿 
+   guid//GUID
+   del_flag// 鍒犻櫎鏍囪 
+	*/
+	import request from '@/utils/request'
+
+	export function slavelistsvr_prj(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/slavelist',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 璇诲彇鍒楄〃淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 
+	*/
+	export function listsvr_prj(query) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/list',
+		method: 'get',
+		params: query
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅
+		鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟
+	*/
+	export function getsvr_prj(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/' + id,
+		method: 'get'
+	  })
+	}
+
+	/*
+		鍔熻兘: 澧炲姞瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function addsvr_prj(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/add',
+		method: 'post',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鏇存柊瀵硅薄
+		鍙傛暟锛歞ata 瀵硅薄鏁版嵁
+	*/
+	export function updatesvr_prj(data) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/update',
+		method: 'put',
+		data: data
+	  })
+	}
+
+	/*
+		鍔熻兘: 鍒犻櫎瀵硅薄
+		鍙傛暟锛歰bjid 瀵硅薄ID
+	*/
+	export function delsvr_prj(id) {
+	  return request({
+		url: 'proc/smartor/entity/svr/svr_prj/del/' +id,
+		method: 'delete'
+	  })
+	}
\ No newline at end of file
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index f67a271..59d944c 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -2,14 +2,10 @@
   <div class="Questionnairemanagement">
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
-      <div style="height: 400px">
+      <div style="height: 300px">
         <el-steps direction="vertical" :active="Editprogress">
           <el-step title="鍩虹淇℃伅"></el-step>
           <el-step title="浠诲姟璇︽儏璁剧疆"></el-step>
-          <el-step
-            title="娲鹃�佹偅鑰呰缃�"
-            description="杩欐槸涓�娈靛緢闀垮緢闀垮緢闀跨殑鎻忚堪鎬ф枃瀛�"
-          ></el-step>
         </el-steps>
       </div>
     </div>
@@ -414,7 +410,7 @@
             ></right-toolbar> -->
                   <el-table
                     v-loading="loading"
-                    :data="userList"
+                    :data="sonuserList"
                     @selection-change="handleSelectionChange"
                   >
                     <el-table-column
@@ -425,43 +421,37 @@
                     <el-table-column
                       label="搴忓彿"
                       align="center"
-                      key="userId"
-                      prop="userId"
+                      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="鏈嶅姟妯℃澘"
                       align="center"
-                      key="types"
-                      prop="types"
+                      key="impTemplate"
+                      prop="impTemplate"
                     />
                     <el-table-column
                       label="鍒涘缓鏃ユ湡"
                       align="center"
-                      key="nickName"
-                      prop="nickName"
+                      key="create_time"
+                      prop="create_time"
                     />
                     <el-table-column
-                      label="寰呮墽琛�/鎬绘暟"
+                      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="鎵ц鐘舵��"
@@ -476,20 +466,20 @@
                       </template>
                     </el-table-column>
                     <el-table-column
-                      label="瀹℃牳浜�"
+                      label="鏇存柊浜�"
                       align="center"
-                      key="topicnumberaa"
-                      prop="topicnumberaa"
+                      key="update_by"
+                      prop="update_by"
                       sortable
                       width="120"
                       :show-overflow-tooltip="true"
                     />
 
                     <el-table-column
-                      label="瀹℃牳鏃堕棿"
+                      label="鏇存柊鏃堕棿"
                       sortable
                       align="center"
-                      prop="createTime"
+                      prop="update_time"
                       width="160"
                     >
                       <template slot-scope="scope">
@@ -566,208 +556,8 @@
         </div>
         <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
         <el-button type="success" @click="submitForm('ruleForm')"
-          >涓嬩竴姝�</el-button
-        >
-        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-      </div>
-      <!-- 缁撴灉鍙嶉 -->
-      <div v-if="Editprogress == 3">
-        <div class="leftvlue-jbxx">
-          <div class="examine-jic">
-            <div class="headline">
-              <div>娲鹃�佹偅鑰呭垪琛�</div>
-              <div class="Add-details">+娣诲姞</div>
-            </div>
-            <div class="examine-jic">
-              <div class="jic-value">
-                <el-row :gutter="20">
-                  <!--鐢ㄦ埛鏁版嵁-->
-
-                  <el-form
-                    :model="topqueryParams"
-                    ref="queryForm"
-                    size="small"
-                    :inline="true"
-                    v-show="showSearch"
-                    label-width="98px"
-                  >
-                    <el-form-item label="浠诲姟鍚嶇О">
-                      <el-input v-model="topqueryParams.name"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="浠诲姟绫诲瀷" prop="status">
-                      <el-select
-                        v-model="topqueryParams.topic"
-                        placeholder="璇烽�夋嫨"
-                      >
-                        <el-option
-                          v-for="item in topicoptions"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="浠诲姟鐘舵��" prop="status">
-                      <el-select
-                        v-model="topqueryParams.topic"
-                        placeholder="璇烽�夋嫨"
-                      >
-                        <el-option
-                          v-for="item in topicoptions"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item>
-                      <el-button
-                        type="primary"
-                        icon="el-icon-search"
-                        size="medium"
-                        @click="handleQuery"
-                        >鎼滅储</el-button
-                      >
-                      <el-button
-                        icon="el-icon-refresh"
-                        size="medium"
-                        @click="resetQuery"
-                        >閲嶇疆</el-button
-                      >
-                    </el-form-item>
-                  </el-form>
-                  <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                      <el-button
-                        type="primary"
-                        plain
-                        icon="el-icon-plus"
-                        size="medium"
-                        @click="handleAddpatient"
-                        v-hasPermi="['system:user:add']"
-                        >鏂板</el-button
-                      >
-                    </el-col>
-
-                    <el-col :span="1.5">
-                      <el-button
-                        type="danger"
-                        plain
-                        icon="el-icon-delete"
-                        size="medium"
-                        :disabled="multiple"
-                        @click="handleDelete"
-                        v-hasPermi="['system:user:remove']"
-                        >鍒犻櫎</el-button
-                      >
-                    </el-col>
-                    <!-- <el-col :span="1.5"> </el-col> -->
-                  </el-row>
-
-                  <el-table
-                    v-loading="loading"
-                    :data="userList"
-                    @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="鎮h�呭悕绉�"
-                      align="center"
-                      sortable
-                      key="userName"
-                      prop="userName"
-                      :show-overflow-tooltip="true"
-                    />
-
-                    <el-table-column
-                      label="鍏ラ櫌鏃ユ湡"
-                      align="center"
-                      key="nickName"
-                      prop="nickName"
-                    />
-                    <el-table-column
-                      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"
-                      width="120"
-                      class-name="small-padding fixed-width"
-                    >
-                      <template slot-scope="scope">
-                        <el-button
-                          size="medium"
-                          type="text"
-                          @click="handleUpdate(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                          ><span class="button-zx"
-                            ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span
-                          ></el-button
-                        >
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      label="浠诲姟璇︽儏"
-                      align="center"
-                      width="200"
-                      class-name="small-padding fixed-width"
-                    >
-                      <template slot-scope="scope">
-                        <el-button
-                          size="medium"
-                          type="text"
-                          @click="handleUpdate(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                          ><span class="button-xq"
-                            ><i class="el-icon-s-data"></i>璇︽儏</span
-                          ></el-button
-                        >
-
-                        <el-button
-                          size="medium"
-                          type="text"
-                          @click="handleUpdate(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                          ><span class="button-sc"
-                            ><i class="el-icon-delete"></i>鍒犻櫎</span
-                          ></el-button
-                        >
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-row>
-              </div>
-            </div>
-          </div>
-        </div>
-        <el-button type="success" @click="submitForm('ruleForm')"
           >绔嬪嵆鍒涘缓</el-button
         >
-        <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
         <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
       </div>
     </div>
@@ -776,7 +566,7 @@
       title="浠诲姟璇︽儏"
       :visible.sync="dialogVisible"
       width="60%"
-      :before-close="handleClose"
+      :before-close="handleCloserw"
     >
       <div class="jic-value">
         <div class="details-jic">
@@ -1013,6 +803,194 @@
           </div>
         </div>
       </div>
+      <div class="leftvlue-jbxx">
+        <div class="examine-jic">
+          <div class="headline">
+            <div>娲鹃�佹偅鑰呭垪琛�</div>
+            <div class="Add-details">+娣诲姞</div>
+          </div>
+          <div class="examine-jic">
+            <div class="jic-value">
+              <el-row :gutter="20">
+                <!--鐢ㄦ埛鏁版嵁-->
+
+                <el-form
+                  :model="topqueryParams"
+                  ref="queryForm"
+                  size="small"
+                  :inline="true"
+                  v-show="showSearch"
+                  label-width="98px"
+                >
+                  <el-form-item label="浠诲姟鍚嶇О">
+                    <el-input v-model="topqueryParams.name"></el-input>
+                  </el-form-item>
+
+                  <el-form-item label="浠诲姟绫诲瀷" prop="status">
+                    <el-select
+                      v-model="topqueryParams.topic"
+                      placeholder="璇烽�夋嫨"
+                    >
+                      <el-option
+                        v-for="item in topicoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="浠诲姟鐘舵��" prop="status">
+                    <el-select
+                      v-model="topqueryParams.topic"
+                      placeholder="璇烽�夋嫨"
+                    >
+                      <el-option
+                        v-for="item in topicoptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-search"
+                      size="medium"
+                      @click="handleQuery"
+                      >鎼滅储</el-button
+                    >
+                    <el-button
+                      icon="el-icon-refresh"
+                      size="medium"
+                      @click="resetQuery"
+                      >閲嶇疆</el-button
+                    >
+                  </el-form-item>
+                </el-form>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5">
+                    <el-button
+                      type="primary"
+                      plain
+                      icon="el-icon-plus"
+                      size="medium"
+                      @click="handleAddpatient"
+                      v-hasPermi="['system:user:add']"
+                      >鏂板</el-button
+                    >
+                  </el-col>
+
+                  <el-col :span="1.5">
+                    <el-button
+                      type="danger"
+                      plain
+                      icon="el-icon-delete"
+                      size="medium"
+                      :disabled="multiple"
+                      @click="handleDelete"
+                      v-hasPermi="['system:user:remove']"
+                      >鍒犻櫎</el-button
+                    >
+                  </el-col>
+                  <!-- <el-col :span="1.5"> </el-col> -->
+                </el-row>
+
+                <el-table
+                  v-loading="loading"
+                  :data="sonuserList"
+                  @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="鎮h�呭悕绉�"
+                    align="center"
+                    sortable
+                    key="userName"
+                    prop="userName"
+                    :show-overflow-tooltip="true"
+                  />
+
+                  <el-table-column
+                    label="鍏ラ櫌鏃ユ湡"
+                    align="center"
+                    key="nickName"
+                    prop="nickName"
+                  />
+                  <el-table-column
+                    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"
+                    width="120"
+                    class-name="small-padding fixed-width"
+                  >
+                    <template slot-scope="scope">
+                      <el-button
+                        size="medium"
+                        type="text"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:user:edit']"
+                        ><span class="button-zx"
+                          ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span
+                        ></el-button
+                      >
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="浠诲姟璇︽儏"
+                    align="center"
+                    width="300"
+                    class-name="small-padding fixed-width"
+                  >
+                    <template slot-scope="scope">
+                      <el-button
+                        size="medium"
+                        type="text"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:user:edit']"
+                        ><span class="button-xq"
+                          ><i class="el-icon-s-data"></i>璇︽儏</span
+                        ></el-button
+                      >
+
+                      <el-button
+                        size="medium"
+                        type="text"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:user:edit']"
+                        ><span class="button-sc"
+                          ><i class="el-icon-delete"></i>鍒犻櫎</span
+                        ></el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-row>
+            </div>
+          </div>
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
         <el-button type="primary" @click="dialogVisible = false"
@@ -1025,13 +1003,12 @@
       title="娣诲姞娲惧彂鎮h��"
       :visible.sync="dialogVisiblepatient"
       width="70%"
-      :before-close="handleClose"
+      :before-close="handleClosehz"
     >
       <div class="examine-jic">
         <div class="jic-value">
           <el-row :gutter="20">
             <!--鐢ㄦ埛鏁版嵁-->
-
             <el-form
               :model="topqueryParams"
               ref="queryForm"
@@ -1089,7 +1066,7 @@
                   icon="el-icon-refresh"
                   size="medium"
                   @click="resetQuery"
-                  >閲嶇疆</el-button
+                  >鍙栨秷鍒涘缓</el-button
                 >
               </el-form-item>
             </el-form>
@@ -1168,8 +1145,8 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="dialogVisible = false"
+        <el-button @click="dialogVisiblepatient = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="dialogVisiblepatient = false"
           >纭畾娣诲姞</el-button
         >
       </span>
@@ -1178,6 +1155,14 @@
 </template>
 
 <script>
+import {
+  listsvr_prjtask,
+  getsvr_prjtask,
+  addsvr_prjtask,
+  updatesvr_prjtask,
+  delsvr_prjtask,
+} from "@/api/smartorpor/svr_prjtask";
+
 export default {
   data() {
     return {
@@ -1197,6 +1182,7 @@
       multiple: true,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
+      sonuserList: null,
       form: {
         name: "",
         region: "",
@@ -1233,7 +1219,10 @@
     };
   },
 
-  created() {},
+  created() {
+    this.Addsubtask();
+    this.Getsubtask();
+  },
 
   methods: {
     // 涓嬩竴姝�
@@ -1264,11 +1253,12 @@
     getList() {},
     handleQuery() {},
     resetQuery() {},
-    handleClose() {
+    handleCloserw() {
       this.dialogVisible = false;
+    },
+    handleClosehz() {
       this.dialogVisiblepatient = false;
     },
-
     // 涓婁竴姝�
     laststep() {
       this.Editprogress--;
@@ -1281,6 +1271,24 @@
     PreviewTemplate() {},
     Acknowledgereference() {
       this.quote = true;
+    },
+    // 鏂板瀛愪换鍔�
+    Addsubtask() {
+      this.topqueryParams.pguid = 2;
+      addsvr_prjtask(this.topqueryParams).then((res) => {
+        console.log(res);
+      });
+    },
+    // 鏌ヨ瀛愪换鍔″垪琛�
+    Getsubtask() {
+      this.topqueryParams.pguid = 2;
+      console.log(this.topqueryParams);
+      // this.topqueryParams.pid = this.$route.query.id;
+      // console.log(this.topqueryParams.pid);
+      listsvr_prjtask(this.topqueryParams).then((res) => {
+        this.sonuserList = res.rows;
+        console.log(this.sonuserList);
+      });
     },
   },
 };
@@ -1315,69 +1323,71 @@
   border: 1px solid #dcdfe6;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
-  .leftvlue-jbxx {
-    margin-bottom: 50px;
-    font-size: 20px;
-    span {
-      position: absolute;
-      right: 80px;
-    }
-    .demo-cascader {
-      margin-right: 20px;
-    }
-    .PreviewTemplate {
+}
+.examine-jic {
+  .headline {
+    font-size: 24px;
+    border-left: 5px solid #41a1be;
+    padding-left: 5px;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    .Add-details {
+      font-size: 18px;
       color: #02a7f0;
       cursor: pointer;
-      font-size: 20px;
-      margin: 0 20px;
     }
   }
-  .examine-jic {
-    .headline {
-      font-size: 24px;
-      border-left: 5px solid #41a1be;
-      padding-left: 5px;
-      margin-bottom: 10px;
-      display: flex;
-      justify-content: space-between;
-      .Add-details {
-        font-size: 18px;
-        color: #02a7f0;
-        cursor: pointer;
+  .jic-value {
+    font-size: 20px;
+    border-top: 1px solid #a7abac;
+    padding: 10px;
+    margin-bottom: 10px;
+    .details-jic {
+      padding: 10px 15px;
+      border: 1px solid #dcdfe6;
+      -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+        0 0 6px 0 rgba(0, 0, 0, 0.04);
+      .details-title {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        div:nth-child(2) {
+          color: #02a7f0;
+          cursor: pointer;
+        }
       }
-    }
-    .jic-value {
-      font-size: 20px;
-      border-top: 1px solid #a7abac;
-      padding: 10px;
-      .details-jic {
-        padding: 10px 15px;
-        border: 1px solid #dcdfe6;
-        -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
-          0 0 6px 0 rgba(0, 0, 0, 0.04);
-        .details-title {
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 10px;
-          div:nth-child(2) {
-            color: #02a7f0;
-            cursor: pointer;
-          }
-        }
-        .details-renw {
-          background: #e4ebfc;
-          padding: 15px 5px;
-          border-radius: 5px;
-          margin-bottom: 20px;
-        }
+      .details-renw {
+        background: #e4ebfc;
+        padding: 15px 5px;
+        border-radius: 5px;
+        margin-bottom: 20px;
       }
     }
   }
 }
+// .leftvlue-jbxx {
+//   margin-bottom: 50px;
+//   font-size: 20px;
+//   span {
+//     position: absolute;
+//     right: 80px;
+//   }
+//   .demo-cascader {
+//     margin-right: 20px;
+//   }
+//   .PreviewTemplate {
+//     color: #02a7f0;
+//     cursor: pointer;
+//     font-size: 20px;
+//     margin: 0 20px;
+//   }
+// }
 .jic-value {
   font-size: 20px;
   border-top: 1px solid #a7abac;
   padding: 10px;
+  margin-bottom: 10px;
   .details-jic {
     padding: 10px 15px;
     border: 1px solid #dcdfe6;
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index d6792bd..9f6166b 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="寰呮墽琛�/鎬绘暟"
+          label="鎮h�呮�绘暟"
           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="鎵ц鐘舵��"
-          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
-          width="120"
-          :show-overflow-tooltip="true"
         />
 
         <el-table-column
-          label="瀹℃牳鏃堕棿"
+          label="鍒涘缓浜�"
+          align="center"
+          key="create_by"
+          prop="create_by"
+          width="120"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          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
@@ -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;
@@ -700,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