From f76f42312cbcbc6d63b2f25c1896a9e72b81eb88 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期四, 24 八月 2023 10:14:09 +0800 Subject: [PATCH] 11 --- src/views/followvisit/tasklist/index.vue | 8 src/views/followvisit/tasklist/FollowupDetails/index.vue | 313 +++++++++++++++----------------------------- src/views/patient/patient/index.vue | 2 src/api/smartorpor/svr_prjtask.js | 24 ++- src/api/smartorpor/svr_prjtaskline.js | 26 --- 5 files changed, 131 insertions(+), 242 deletions(-) diff --git a/src/api/smartorpor/svr_prjtask.js b/src/api/smartorpor/svr_prjtask.js index 8b96b33..d1be5ef 100644 --- a/src/api/smartorpor/svr_prjtask.js +++ b/src/api/smartorpor/svr_prjtask.js @@ -68,18 +68,28 @@ params: query }) } - + /* + 鍔熻兘: 鍦ㄥ瓙浠诲姟涓姞鍏ユ偅鑰� + 鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 + */ + export function Addpatienttask(query) { + return request({ + url: 'proc/smartor/data//data/taskline/patient', + method: 'post', + data: query + }) + } /* 鍔熻兘: 璇诲彇鍒楄〃淇℃伅 鍙傛暟锛歲uery 鎸囧畾鏌ヨ鍙傛暟 */ export function listsvr_prjtask(query) { - return request({ - url: 'proc/smartor/entity/svr/svr_prjtask/list', - method: 'post', - data: query - }) - } + return request({ + url: 'proc/smartor/entity/svr/svr_prjtask/list', + method: 'post', + data: query + }) + } /* 鍔熻兘: 鏍规嵁id璇诲彇鎸囧畾瀵硅薄淇℃伅 diff --git a/src/api/smartorpor/svr_prjtaskline.js b/src/api/smartorpor/svr_prjtaskline.js index 5008295..e23e291 100644 --- a/src/api/smartorpor/svr_prjtaskline.js +++ b/src/api/smartorpor/svr_prjtaskline.js @@ -1,24 +1,6 @@ - /*鎮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 + /*鎮h�呮湇鍔″瓙浠诲姟鏄庣粏琛ˋPI鎺ュ彛 + id// 鑷ID schemeid// 鏂规ID schemeplanid// 璁″垝ID patientid// 鎮h�匢D state// 鐘舵�� baselinetime// 鍩虹嚎鏃堕棿 plantime// 璁″垝鎵ц鏃堕棿 actualtime// 瀹為檯瀹屾垚鏃堕棿 overtime// 閫炬湡鏃堕棿 patientsource// 鎮h�呮潵婧� taskconfigid// 閰嶇疆ID relationid// 鍏宠仈缂栧彿 绉戝椤圭洰闂嵎瀹f暀 relationname// 鍏宠仈鍚嶇О content// 浠嬬粛鎻愰啋鍐呭 tipscontent// 鎻愮ず鍐呭 tasktype// 浠诲姟绫诲瀷 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 pguid//瀛愪换鍔uid patname// 濮撳悕 patsex// 鎬у埆 1:鐢� 2:濂� paticcardno// 璇佷欢鍙风爜 patbirthdate// 鐢熸棩 patage// 骞撮緞 pattelcode// 鎵嬫満鍙风爜 */ import request from '@/utils/request' @@ -37,8 +19,8 @@ export function listsvr_prjtaskline(query) { return request({ url: 'proc/smartor/entity/svr/svr_prjtaskline/list', - method: 'get', - params: query + method: 'post', + data: query }) } diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue index 59d944c..b480e12 100644 --- a/src/views/followvisit/tasklist/FollowupDetails/index.vue +++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue @@ -88,179 +88,7 @@ }}</el-button> <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button> </div> - <!-- 闂嵎璁剧疆 --> - <!-- <div v-if="Editprogress == 2"> - <div class="leftvlue-jbxx"> - <div class="examine-jic"> - <div class="headline">鏂规璁剧疆</div> - <div class="jic-value"> - <el-form ref="form" :model="form" label-width="105px"> - <el-form-item label="鎮h�呮潵婧�"> - <el-select v-model="form.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙"> - <el-option label="鍖哄煙涓�" value="shanghai"></el-option> - <el-option label="鍖哄煙浜�" value="beijing"></el-option> - </el-select> - </el-form-item> - <el-form-item label="鍑洪櫌绉戝" prop="desc"> - <el-cascader - class="demo-cascader" - placeholder="鍖呭惈" - v-model="form.templatevalue" - :options="options" - :props="{ expandTrigger: 'hover' }" - ></el-cascader> - <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="鍑洪櫌鐥呭尯" prop="desc"> - <el-cascader - class="demo-cascader" - placeholder="涓嶅寘鍚�" - v-model="form.templatevalue" - :options="options" - :props="{ expandTrigger: 'hover' }" - ></el-cascader> - <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="鎮h�呮潵婧�" prop="desc"> - <el-cascader - class="demo-cascader" - placeholder="鍖呭惈" - v-model="form.templatevalue" - :options="options" - :props="{ expandTrigger: 'hover' }" - ></el-cascader> - <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="灏辫瘖绉戝" prop="desc"> - <el-cascader - class="demo-cascader" - placeholder="鍖呭惈" - v-model="form.templatevalue" - :options="options" - :props="{ expandTrigger: 'hover' }" - ></el-cascader> - <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="閲嶅璁″垝澶勭悊:"> - <el-radio-group v-model="form.resource"> - <el-radio label="鏂拌鍒掕嚜鍔ㄧ粨妗�"></el-radio> - <el-radio label="鍘熻鍒掕嚜鍔ㄧ粨妗�"></el-radio> - </el-radio-group> - </el-form-item> - <el-form-item label="杩囨湡浠诲姟澶勭悊:"> - <el-radio-group v-model="form.resource"> - <el-radio label="鑷姩鍏抽棴"></el-radio> - <el-radio label="鑷姩鎵ц"></el-radio> - <el-radio label="浜哄伐澶勭悊"></el-radio> - </el-radio-group> - </el-form-item> - <el-form-item label="鎵�鏈変换鍔″畬鎴愯嚜鍔ㄧ粨妗�:" label-width="158px"> - <el-radio-group v-model="form.resource"> - <el-radio label="鏄�"></el-radio> - <el-radio label="鍚�"></el-radio> - </el-radio-group> - </el-form-item> - <el-form-item label=""> - <el-row gutter="5"> - <el-col :span="8" - ><el-select v-model="form.value" placeholder="璇烽�夋嫨鑷姩缁撴鏂瑰紡"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> </el-select - ></el-col> - </el-row> - <el-row gutter="5"> - <el-col :span="6" - ><el-select v-model="form.value" placeholder="璇烽�夋嫨鎮h�呯姸鎬�"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> </el-select - ></el-col> - <el-col :span="6" - ><el-select v-model="form.value" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> </el-select - ></el-col> - </el-row> - <el-row type="flex" gutter="5"> - <el-col :span="6" - ><el-select v-model="form.value" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> </el-select - ></el-col> - <el-col :span="6" - ><el-select v-model="form.value" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> </el-select - ></el-col> - </el-row> - </el-form-item> - </el-form> - </div> - </div> - </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 == 2"> <div class="leftvlue-jbxx"> @@ -410,7 +238,7 @@ ></right-toolbar> --> <el-table v-loading="loading" - :data="sonuserList" + :data="userList" @selection-change="handleSelectionChange" > <el-table-column @@ -815,7 +643,7 @@ <!--鐢ㄦ埛鏁版嵁--> <el-form - :model="topqueryParams" + :model="deliverytopqueryParams" ref="queryForm" size="small" :inline="true" @@ -823,12 +651,12 @@ label-width="98px" > <el-form-item label="浠诲姟鍚嶇О"> - <el-input v-model="topqueryParams.name"></el-input> + <el-input v-model="deliverytopqueryParams.name"></el-input> </el-form-item> <el-form-item label="浠诲姟绫诲瀷" prop="status"> <el-select - v-model="topqueryParams.topic" + v-model="deliverytopqueryParams.topic" placeholder="璇烽�夋嫨" > <el-option @@ -843,7 +671,7 @@ <el-form-item label="浠诲姟鐘舵��" prop="status"> <el-select - v-model="topqueryParams.topic" + v-model="deliverytopqueryParams.topic" placeholder="璇烽�夋嫨" > <el-option @@ -934,11 +762,11 @@ prop="topicnumber" width="120" :show-overflow-tooltip="true" - > - <template slot-scope="scope"> + /> + <!-- <template slot-scope="scope"> <div>鎵ц瀹屾垚/鎵ц澶辫触</div> </template> - </el-table-column> + </el-table-column> --> <el-table-column label="鎿嶄綔" align="center" @@ -987,6 +815,13 @@ </el-table-column> </el-table> </el-row> + <pagination + v-show="sontotal > 0" + :total="sontotal" + :page.sync="deliverytopqueryParams.pageNum" + :limit.sync="deliverytopqueryParams.pageSize" + @pagination="handleAdd" + /> </div> </div> </div> @@ -1010,7 +845,7 @@ <el-row :gutter="20"> <!--鐢ㄦ埛鏁版嵁--> <el-form - :model="topqueryParams" + :model="patientqueryParams" ref="queryForm" size="small" :inline="true" @@ -1018,10 +853,13 @@ label-width="98px" > <el-form-item label="鎮h�呭悕绉帮細"> - <el-input v-model="topqueryParams.name"></el-input> + <el-input v-model="patientqueryParams.name"></el-input> </el-form-item> <el-form-item label="鎮h�呮潵婧�" prop="status"> - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> + <el-select + v-model="patientqueryParams.topic" + placeholder="璇烽�夋嫨" + > <el-option v-for="item in topicoptions" :key="item.value" @@ -1032,7 +870,10 @@ </el-select> </el-form-item> <el-form-item label="鍑洪櫌绉戝" prop="status"> - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> + <el-select + v-model="patientqueryParams.topic" + placeholder="璇烽�夋嫨" + > <el-option v-for="item in topicoptions" :key="item.value" @@ -1044,7 +885,10 @@ </el-form-item> <el-form-item label="鍑洪櫌鐥呭尯" prop="status"> - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> + <el-select + v-model="patientqueryParams.topic" + placeholder="璇烽�夋嫨" + > <el-option v-for="item in topicoptions" :key="item.value" @@ -1072,45 +916,41 @@ </el-form> <el-table - v-loading="loading" - :data="userList" + v-loading="patientloading" + :data="patientuserList" @selection-change="handleSelectionChange" > <el-table-column type="selection" width="50" align="center" /> <el-table-column label="搴忓彿" align="center" - key="userId" - prop="userId" + key="patid" + prop="patid" /> <el-table-column label="鎮h�呭悕绉�" align="center" sortable - key="userName" - prop="userName" + key="name" + prop="name" :show-overflow-tooltip="true" /> <el-table-column - label="鍏ラ櫌鏃ユ湡" + label="鎮h�呮潵婧�" align="center" - key="nickName" - prop="nickName" + key="source" + prop="source" /> <el-table-column - label="鎵ц鐘舵��" + label="鎵嬫満鍙风爜" align="center" - key="topicnumber" - prop="topicnumber" + key="telcode" + prop="telcode" width="120" :show-overflow-tooltip="true" - > - <template slot-scope="scope"> - <div>鎵ц瀹屾垚/鎵ц澶辫触</div> - </template> - </el-table-column> + /> <el-table-column label="浠诲姟璇︽儏" @@ -1142,11 +982,18 @@ </el-table-column> </el-table> </el-row> + <pagination + v-show="patienttotal > 0" + :total="patienttotal" + :page.sync="patientqueryParams.pageNum" + :limit.sync="patientqueryParams.pageSize" + @pagination="handleAddpatient" + /> </div> </div> <span slot="footer" class="dialog-footer"> <el-button @click="dialogVisiblepatient = false">鍙� 娑�</el-button> - <el-button type="primary" @click="dialogVisiblepatient = false" + <el-button type="primary" @click="AddDispatchpatients" >纭畾娣诲姞</el-button > </span> @@ -1161,19 +1008,36 @@ addsvr_prjtask, updatesvr_prjtask, delsvr_prjtask, + Addpatienttask, } from "@/api/smartorpor/svr_prjtask"; +import { listpat_archive } from "@/api/smartorpor/pat_archive"; +import { listsvr_prjtaskline } from "@/api/smartorpor/svr_prjtaskline"; export default { data() { return { Editprogress: 2, //缂栬緫杩涘害 loading: false, // 閬僵灞� + patientloading: false, // 閬僵灞� dialogVisible: false, //浠诲姟璇︽儏寮规 dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗� - topqueryParams: {}, + topqueryParams: { + pageNum: 1, // + pageSize: 10, + }, + deliverytopqueryParams: { + pageNum: 1, // + pageSize: 10, + }, + patientqueryParams: { + pageNum: 1, // + pageSize: 10, + }, topicoptions: [], showSearch: true, // total: 0, // + sontotal: 0, // + patienttotal: 0, // // 閫変腑鏁扮粍 ids: [], // 闈炲崟涓鐢� @@ -1182,6 +1046,7 @@ multiple: true, // 鐢ㄦ埛琛ㄦ牸鏁版嵁 userList: null, + patientuserList: null, sonuserList: null, form: { name: "", @@ -1240,16 +1105,35 @@ // } // }); }, + // 瀛愪换鍔′竴绾у脊妗� handleAdd() { + listsvr_prjtaskline(this.deliverytopqueryParams).then((response) => { + console.log(response); + this.sonuserList = response.rows; + this.sontotal = response.total; + this.loading = false; + }); this.dialogVisible = true; }, + // 瀛愪换鍔′簩绾у脊妗� handleAddpatient() { + listpat_archive(this.patientqueryParams).then((response) => { + console.log(response); + this.patientuserList = response.rows; + this.patienttotal = response.total; + this.loading = false; + }); this.dialogVisiblepatient = true; }, handleUpdate() {}, handleDelete() {}, handleExport() {}, - handleSelectionChange() {}, + // 澶氶�夋閫変腑鏁版嵁 + handleSelectionChange(selection) { + this.ids = selection.map((item) => item.patid).join(","); + // let result = this.ids.join(","); + console.log(this.ids); + }, getList() {}, handleQuery() {}, resetQuery() {}, @@ -1275,10 +1159,21 @@ // 鏂板瀛愪换鍔� Addsubtask() { this.topqueryParams.pguid = 2; - addsvr_prjtask(this.topqueryParams).then((res) => { + // addsvr_prjtask(this.topqueryParams).then((res) => { + // console.log(res); + // }); + }, + // 鏂板娲鹃�佹偅鑰� + AddDispatchpatients() { + let objictpint = {}; + objictpint.patientes = this.ids; + objictpint.pguid = 2; + Addpatienttask(objictpint).then((res) => { console.log(res); }); + this.dialogVisiblepatient = false; }, + // 鏌ヨ瀛愪换鍔″垪琛� Getsubtask() { this.topqueryParams.pguid = 2; @@ -1286,10 +1181,12 @@ // 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); + this.userList = res.rows; + this.total = res.total; + console.log(this.userList); }); }, + /** 鏌ヨ鎮h�呭垪琛� */ }, }; </script> diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue index 9f6166b..1849fc0 100644 --- a/src/views/followvisit/tasklist/index.vue +++ b/src/views/followvisit/tasklist/index.vue @@ -161,13 +161,13 @@ key="nickName" prop="nickName" /> - <el-table-column + <!-- <el-table-column label="鎮h�呮�绘暟" align="center" key="phonenumber" prop="phonenumber" width="120" - /> + /> --> <el-table-column label="鍒涘缓浜�" @@ -237,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)" @@ -245,7 +245,7 @@ ><span class="button-bb" ><i class="el-icon-s-order"></i>鎶ヨ〃</span ></el-button - > + > --> <el-button size="medium" type="text" diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue index 78afbd9..21b21c1 100644 --- a/src/views/patient/patient/index.vue +++ b/src/views/patient/patient/index.vue @@ -479,7 +479,7 @@ delpat_archive, } from "@/api/smartorpor/pat_archive"; import { listbase_tag } from "@/api/smartorpor/base_tag"; -import { listtag } from "@/api/system/label"; + import { getToken } from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -- Gitblit v1.9.3