From d9d66b61d2b4b7205a327d3e0c297ab38b579854 Mon Sep 17 00:00:00 2001 From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com> Date: 星期三, 06 十二月 2023 19:04:15 +0800 Subject: [PATCH] qxtj --- src/views/hosp/history/index.vue | 424 +++++++++++++++++--------------- src/views/doctor/checkAll/index.vue | 9 src/views/hosp/harmType/index.vue | 248 +++++++++++++++++++ src/views/hosp/order/index.vue | 11 src/api/hosp/harmType.js | 44 +++ 5 files changed, 538 insertions(+), 198 deletions(-) diff --git a/src/api/hosp/harmType.js b/src/api/hosp/harmType.js new file mode 100644 index 0000000..9d0aa6d --- /dev/null +++ b/src/api/hosp/harmType.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 鏌ヨ鑱屼笟鐥呭垪琛� +export function listHarmType(query) { + return request({ + url: '/hosp/harmType/list', + method: 'get', + params: query + }) +} + +// 鏌ヨ鑱屼笟鐥呰缁� +export function getHarmType(aid) { + return request({ + url: '/hosp/harmType/' + aid, + method: 'get' + }) +} + +// 鏂板鑱屼笟鐥� +export function addHarmType(data) { + return request({ + url: '/hosp/harmType', + method: 'post', + data: data + }) +} + +// 淇敼鑱屼笟鐥� +export function updateHarmType(data) { + return request({ + url: '/hosp/harmType', + method: 'put', + data: data + }) +} + +// 鍒犻櫎鑱屼笟鐥� +export function delHarmType(aid) { + return request({ + url: '/hosp/harmType/' + aid, + method: 'delete' + }) +} diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue index 68e1d04..d8501c3 100644 --- a/src/views/doctor/checkAll/index.vue +++ b/src/views/doctor/checkAll/index.vue @@ -125,9 +125,12 @@ </tr> </table> </div> - <div> + <div style="display:flex;"> <div style="margin: 10px 10px;"> <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button> + </div> + <div style="margin: 10px 10px;"> + <el-button type="primary" size="mini" @click="medicalhistory()">鑱屼笟鐥呭彶</el-button> </div> </div> @@ -566,6 +569,10 @@ } }) }, + + medicalhistory(){ + + }, // viewReport(row) { // const tjNumber = row.tjNumber; // const viewNum = "792997692059705344"; diff --git a/src/views/hosp/harmType/index.vue b/src/views/hosp/harmType/index.vue new file mode 100644 index 0000000..7bf4da3 --- /dev/null +++ b/src/views/hosp/harmType/index.vue @@ -0,0 +1,248 @@ +<template> + <div class="app-container"> + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> + <el-form-item label="${comment}" prop="harmpinyin"> + <el-input v-model="queryParams.harmpinyin" placeholder="璇疯緭鍏�${comment}" clearable + @keyup.enter.native="handleQuery" /> + </el-form-item> + <el-form-item label="${comment}" prop="sort"> + <el-input v-model="queryParams.sort" placeholder="璇疯緭鍏�${comment}" clearable + @keyup.enter.native="handleQuery" /> + </el-form-item> + <el-form-item label="${comment}" prop="externalcode"> + <el-input v-model="queryParams.externalcode" placeholder="璇疯緭鍏�${comment}" clearable + @keyup.enter.native="handleQuery" /> + </el-form-item> + <el-form-item label="${comment}" prop="harmcode"> + <el-input v-model="queryParams.harmcode" placeholder="璇疯緭鍏�${comment}" clearable + @keyup.enter.native="handleQuery" /> + </el-form-item> + <el-form-item label="${comment}" prop="protection"> + <el-input v-model="queryParams.protection" placeholder="璇疯緭鍏�${comment}" clearable + @keyup.enter.native="handleQuery" /> + </el-form-item> + <el-form-item> + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> + <el-button icon="el-icon-refresh" size="mini" @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="mini" @click="handleAdd" + v-hasPermi="['hosp:harmType:add']">鏂板 + </el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" + v-hasPermi="['hosp:harmType:edit']">淇敼 + </el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" + v-hasPermi="['hosp:harmType:remove']">鍒犻櫎 + </el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" + v-hasPermi="['hosp:harmType:export']">瀵煎嚭 + </el-button> + </el-col> + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> + + <el-table v-loading="loading" :data="harmTypeList" @selection-change="handleSelectionChange"> + <el-table-column type="selection" width="55" align="center" /> + <el-table-column label="${comment}" align="center" prop="aid" /> + <el-table-column label="${comment}" align="center" prop="harmpinyin" /> + <el-table-column label="${comment}" align="center" prop="harmtype" /> + <el-table-column label="${comment}" align="center" prop="sort" /> + <el-table-column label="${comment}" align="center" prop="harminfo" /> + <el-table-column label="${comment}" align="center" prop="externalcode" /> + <el-table-column label="${comment}" align="center" prop="harmcode" /> + <el-table-column label="${comment}" align="center" prop="type" /> + <el-table-column label="${comment}" align="center" prop="protection" /> + <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> + <template slot-scope="scope"> + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" + v-hasPermi="['hosp:harmType:edit']">淇敼 + </el-button> + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" + v-hasPermi="['hosp:harmType:remove']">鍒犻櫎 + </el-button> + </template> + </el-table-column> + </el-table> + + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + @pagination="getList" /> + + <!-- 娣诲姞鎴栦慨鏀硅亴涓氱梾瀵硅瘽妗� --> + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> + <el-form-item label="${comment}" prop="harmpinyin"> + <el-input v-model="form.harmpinyin" placeholder="璇疯緭鍏�${comment}" /> + </el-form-item> + <el-form-item label="${comment}" prop="sort"> + <el-input v-model="form.sort" placeholder="璇疯緭鍏�${comment}" /> + </el-form-item> + <el-form-item label="${comment}" prop="harminfo"> + <el-input v-model="form.harminfo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> + </el-form-item> + <el-form-item label="${comment}" prop="externalcode"> + <el-input v-model="form.externalcode" placeholder="璇疯緭鍏�${comment}" /> + </el-form-item> + <el-form-item label="${comment}" prop="harmcode"> + <el-input v-model="form.harmcode" placeholder="璇疯緭鍏�${comment}" /> + </el-form-item> + <el-form-item label="${comment}" prop="protection"> + <el-input v-model="form.protection" placeholder="璇疯緭鍏�${comment}" /> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="submitForm">纭� 瀹�</el-button> + <el-button @click="cancel">鍙� 娑�</el-button> + </div> + </el-dialog> + </div> +</template> + +<script> +import { + listHarmType, + getHarmType, + delHarmType, + addHarmType, + updateHarmType +} from "@/api/hosp/harmType"; + +export default { + name: "HarmType", + data() { + return { + // 閬僵灞� + loading: true, + // 閫変腑鏁扮粍 + ids: [], + // 闈炲崟涓鐢� + single: true, + // 闈炲涓鐢� + multiple: true, + // 鏄剧ず鎼滅储鏉′欢 + showSearch: true, + // 鎬绘潯鏁� + total: 0, + // 鑱屼笟鐥呰〃鏍兼暟鎹� + harmTypeList: [], + // 寮瑰嚭灞傛爣棰� + title: "", + // 鏄惁鏄剧ず寮瑰嚭灞� + open: false, + // 鏌ヨ鍙傛暟 + queryParams: { + pageNum: 1, + pageSize: 10, + harmpinyin: null, + harmtype: null, + sort: null, + harminfo: null, + externalcode: null, + harmcode: null, + type: null, + protection: null + }, + // 琛ㄥ崟鍙傛暟 + form: {}, + // 琛ㄥ崟鏍¢獙 + rules: { + } + }; + }, + created() { + this.getList(); + }, + methods: { + /** 鏌ヨ鑱屼笟鐥呭垪琛� */ + getList() { + this.loading = true; + listHarmType(this.queryParams).then(response => { + this.harmTypeList = response.rows; + this.total = response.total; + this.loading = false; + }); + }, + // 鍙栨秷鎸夐挳 + cancel() { + this.open = false; + this.reset(); + }, + // 琛ㄥ崟閲嶇疆 + reset() { + this.form = { + aid: null, + harmpinyin: null, + harmtype: null, + sort: null, + harminfo: null, + externalcode: null, + harmcode: null, + type: null, + protection: null + }; + this.resetForm("form"); + }, + /** 鎼滅储鎸夐挳鎿嶄綔 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, + /** 閲嶇疆鎸夐挳鎿嶄綔 */ + resetQuery() { + this.resetForm("queryForm"); + this.handleQuery(); + }, + // 澶氶�夋閫変腑鏁版嵁 + handleSelectionChange(selection) { + this.ids = selection.map(item => item.aid) + this.single = selection.length !== 1 + this.multiple = !selection.length + }, + /** 鏂板鎸夐挳鎿嶄綔 */ + handleAdd() { + this.reset(); + this.open = true; + this.title = "娣诲姞鑱屼笟鐥�"; + }, + /** 淇敼鎸夐挳鎿嶄綔 */ + handleUpdate(row) { + this.reset(); + const aid = row.aid || this.ids + getHarmType(aid).then(response => { + this.form = response.data; + this.open = true; + this.title = "淇敼鑱屼笟鐥�"; + }); + }, + /** 鎻愪氦鎸夐挳 */ + submitForm() { + + }, + /** 鍒犻櫎鎸夐挳鎿嶄綔 */ + handleDelete(row) { + + + }, + + + SelectionChange(selection) { }, + + + + /** 瀵煎嚭鎸夐挳鎿嶄綔 */ + handleExport() { + + } + } +} + ; +</script> diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue index 7a54ea5..9645e50 100644 --- a/src/views/hosp/history/index.vue +++ b/src/views/hosp/history/index.vue @@ -4,119 +4,78 @@ <div class="hist2"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="濮撳悕" prop="name"> - <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鎴峰悕" clearable @keyup.enter.native="handleQuery" style="width:130px"/> + <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鎴峰悕" clearable @keyup.enter.native="handleQuery" + style="width:130px" /> </el-form-item> <el-form-item label="浣撴鍙�" prop="tjNum"> - <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable @keyup.enter.native="handleQuery"/> + <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable + @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> </el-form-item> </el-form> - <el-table :row-class-name="tableRowClassName" height="650px" v-loading="loading" :data="orderList" ref="multipleTable" @selection-change="handleSelectionChange" border style="width: 95%"> + <el-table :row-class-name="tableRowClassName" height="650px" v-loading="loading" :data="orderList" + ref="multipleTable" @selection-change="handleSelectionChange" border style="width: 95%"> <el-table-column type="selection" width="40px" align="center" /> - <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" :show-overflow-tooltip="true" fixed="left"/> - <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" width="110px" :show-overflow-tooltip="true"/> + <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" :show-overflow-tooltip="true" + fixed="left" /> + <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" width="110px" :show-overflow-tooltip="true" /> <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="55px" :show-overflow-tooltip="true"> <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> </template> </el-table-column> - <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" width="120px" :show-overflow-tooltip="true"/> - <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="70" :show-overflow-tooltip="true" - /> + <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" width="120px" :show-overflow-tooltip="true" /> + <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="70" :show-overflow-tooltip="true" /> <el-table-column label="骞撮緞鍗曚綅" align="center" prop="ageUnit" width="80" :show-overflow-tooltip="true"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.dict_ageunit" - :value="scope.row.ageUnit" - /> + <dict-tag :options="dict.type.dict_ageunit" :value="scope.row.ageUnit" /> </template> </el-table-column> <el-table-column label="鑱屼笟" align="center" prop="career" width="120" :show-overflow-tooltip="true"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.dict_job" - :value="scope.row.career" - /> + <dict-tag :options="dict.type.dict_job" :value="scope.row.career" /> </template> </el-table-column> </el-table> <div class="pagi"> <div class="pagi1"> - <pagination - v-show="total > 0" - :total="total" - :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" - @pagination="getList" - /> + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" + :limit.sync="queryParams.pageSize" @pagination="getList" /> </div> </div> </div> <div class="hist3"> <span class="txt">闂瘖淇℃伅</span> - <el-form - ref="form" - :model="form" - :rules="rules" - label-width="100px" - :inline="true" - size="mini" - > + <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true" size="mini"> <el-collapse class="coll" v-model="activeName" accordion> - <el-collapse-item - class="coll" - title="鍩烘湰淇℃伅" - name="1" - style="width: 900px; font-weight: 600" - > + <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 900px; font-weight: 600"> <div style="width: 900px"> <el-form-item label="濮撳悕" prop="cusName"> <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" /> </el-form-item> <el-form-item label="鑱屼笟" prop="work"> - <el-select - filterable - v-model="form.work" - placeholder="璇烽�夋嫨鑱屼笟" - clearable - style="width: 150px" - > - <el-option - v-for="dict in dict.type.tj_work" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> + <el-select filterable v-model="form.work" placeholder="璇烽�夋嫨鑱屼笟" clearable style="width: 150px"> + <el-option v-for="dict in dict.type.tj_work" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus"> - <el-select - filterable - v-model="form.workStatus" - placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" - clearable - style="width: 150px" - > - <el-option - v-for="dict in dict.type.tj_work_status" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> + <el-select filterable v-model="form.workStatus" placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" clearable style="width: 150px"> + <el-option v-for="dict in dict.type.tj_work_status" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> + <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison"> + <el-input type="textarea" rows="4" v-model="form.contactPoison" placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�" + style="width: 700px" /> + </el-form-item> <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory"> - <el-input - type="textarea" - rows="4" - v-model="form.medicalHistory" - placeholder="璇疯緭鍏ユ棦寰�鐥呭彶" - style="width: 700px" - /> + <el-input type="textarea" rows="4" v-model="form.medicalHistory" placeholder="璇疯緭鍏ユ棦寰�鐥呭彶" + style="width: 700px" /> </el-form-item> </div> </el-collapse-item> @@ -159,67 +118,31 @@ <div style="width: 900px"> <el-form-item label="鏄惁鍚哥儫" prop="xiyan"> <!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> --> - <el-select - filterable - v-model="form.xiyan" - placeholder="璇烽�夋嫨鏄惁鍚哥儫" - clearable - style="width: 150px" - > - <el-option - v-for="dict in dict.type.tj_smoking_pinlv" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> + <el-select filterable v-model="form.xiyan" placeholder="璇烽�夋嫨鏄惁鍚哥儫" clearable style="width: 150px"> + <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv"> - <el-input - v-model="form.xiyanpinlv" - style="width: 70px" - />鏀�/澶� + <el-input v-model="form.xiyanpinlv" style="width: 70px" />鏀�/澶� </el-form-item> <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear"> - <el-input - v-model="form.xiyanyear" - style="width: 70px" - />骞� </el-form-item - ><br /> + <el-input v-model="form.xiyanyear" style="width: 70px" />骞� </el-form-item><br /> <el-form-item label="鏄惁楗厭" prop="yinjiu"> <!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> --> - <el-select - filterable - v-model="form.yinjiu" - placeholder="璇烽�夋嫨鏄惁楗厭" - clearable - style="width: 150px" - > - <el-option - v-for="dict in dict.type.tj_smoking_pinlv" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> + <el-select filterable v-model="form.yinjiu" placeholder="璇烽�夋嫨鏄惁楗厭" clearable style="width: 150px"> + <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv"> - <el-input - v-model="form.yinjiupinlv" - style="width: 70px" - />ml/澶� + <el-input v-model="form.yinjiupinlv" style="width: 70px" />ml/澶� </el-form-item> <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear"> <el-input v-model="form.yinjiuyear" style="width: 70px" />骞� </el-form-item> <el-form-item label="鍏朵粬" prop="qita"> - <el-input - v-model="form.qita" - placeholder="璇疯緭鍏ュ叾浠�" - type="textarea" - style="width: 600px" - rows="2" - /> + <el-input v-model="form.qita" placeholder="璇疯緭鍏ュ叾浠�" type="textarea" style="width: 600px" rows="2" /> </el-form-item> </div> </el-collapse-item> @@ -227,26 +150,16 @@ <div style="width: 900px"> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button - type="primary" - icon="el-icon-plus" - size="mini" - @click="addmembers()" - >娣诲姞 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addmembers()">娣诲姞 </el-button> </el-col> <el-col :span="1.5"> - <el-button type="danger" icon="el-icon-delete" size="mini" - >鍒犻櫎 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="delemembers()">鍒犻櫎 </el-button> </el-col> </el-row> - <el-table - border - :data="form.tjAskHistorysList" - ref="tjAskHistorys" - style="width: 98%" - > + <el-table border :data="form.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%" + @selection-change="handlebingChange"> <el-table-column type="selection" width="40" align="center" /> <!-- <el-table-column label="搴忓彿" @@ -256,11 +169,7 @@ /> --> <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName"> <template slot-scope="scope"> - <el-input - size="mini" - v-model="scope.row.diseaseName" - placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" - /> + <el-input size="mini" v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" /> </template> </el-table-column> <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData"> @@ -269,54 +178,95 @@ v-model="scope.row.diseaseData" placeholder="璇疯緭鍏ヨ瘖鏂棩鏈�" /> --> - <el-date-picker - size="mini" - v-model="scope.row.diseaseData" - align="right" - type="date" - placeholder="閫夋嫨鏃ユ湡" - :picker-options="pickerOptions" - style="width: 130px" - value-format="yyyy-MM-dd" - > + <el-date-picker size="mini" v-model="scope.row.diseaseData" align="right" type="date" + placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px" value-format="yyyy-MM-dd"> </el-date-picker> </template> </el-table-column> <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany"> <template slot-scope="scope"> - <el-input - size="mini" - v-model="scope.row.diseaseCompany" - placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" - /> + <el-input size="mini" v-model="scope.row.diseaseCompany" placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" /> </template> </el-table-column> <el-table-column label="鏄惁鐥婃剤" prop="isOk"> <template slot-scope="scope"> <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> --> - <el-select - filterable - size="mini" - v-model="scope.row.isOk" - placeholder="璇烽�夋嫨鏄惁鐥婃剤" - clearable - > - <el-option - v-for="dict in dict.type.sys_yes_no" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> + <el-select filterable size="mini" v-model="scope.row.isOk" placeholder="璇烽�夋嫨鏄惁鐥婃剤" clearable> + <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" + :value="dict.value" /> </el-select> </template> </el-table-column> <el-table-column label="澶囨敞" prop="remark"> <template slot-scope="scope"> - <el-input - size="mini" - v-model="scope.row.remark" - placeholder="璇疯緭鍏ュ娉�" - /> + <el-input size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" /> + </template> + </el-table-column> + </el-table> + </div> + </el-collapse-item> + + <el-collapse-item title="鑱屼笟鍙�" name="7"> + <div style="width: 900px"> + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addmemberss()">娣诲姞 + </el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="danger" icon="el-icon-delete" size="mini" @click="delememberss()">鍒犻櫎 + </el-button> + </el-col> + </el-row> + <el-table border :data="form.workLogs" style="width: 98%" @selection-change="handlezhiyeChange"> + <el-table-column type="selection" width="40" align="center" /> + <!-- <el-table-column + label="搴忓彿" + align="center" + prop="index" + width="50" + /> --> + <el-table-column label="寮�濮嬫椂闂�" prop="beginTime"> + <template slot-scope="scope"> + <el-date-picker size="mini" v-model="scope.row.beginTime" align="right" type="date" + placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px" value-format="yyyy-MM-dd"> + </el-date-picker> + </template> + </el-table-column> + <el-table-column label="缁撴潫鏃堕棿" prop="endTime"> + <template slot-scope="scope"> + <el-date-picker size="mini" v-model="scope.row.endTime" align="right" type="date" placeholder="閫夋嫨鏃ユ湡" + :picker-options="pickerOptions" style="width: 130px" value-format="yyyy-MM-dd"> + </el-date-picker> + </template> + </el-table-column> + <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany"> + <template slot-scope="scope"> + <el-input size="mini" v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" /> + </template> + </el-table-column> + <el-table-column label="閮ㄩ棬" prop="workDept"> + <template slot-scope="scope"> + <el-input size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" /> + </template> + </el-table-column> + <el-table-column label="宸ョ" prop="workType"> + <template slot-scope="scope"> + <el-input size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" /> + </template> + </el-table-column> + <el-table-column label="鏈夊鍥犵礌" prop="workLogs"> + <template slot-scope="scope"> + <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> --> + <el-select filterable size="mini" v-model="scope.row.workLogs" placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable> + <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" + :value="dict.value" /> + </el-select> + </template> + </el-table-column> + <el-table-column label="闃叉姢鎺柦" prop="fangHu"> + <template slot-scope="scope"> + <el-input size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" /> </template> </el-table-column> </el-table> @@ -325,20 +275,13 @@ </el-collapse> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm" style="margin-top: 10px" :disabled="isdisabled" - >鎻愪氦</el-button - > + <el-button type="primary" @click="submitForm" style="margin-top: 10px" :disabled="isdisabled">鎻愪氦</el-button> </div> </div> </div> <!-- 娣诲姞鎴栦慨鏀归棶璇婂璇濇 --> - <el-dialog - :title="title" - :visible.sync="open" - width="1000px" - append-to-body - > + <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> </el-dialog> </div> </template> @@ -353,10 +296,10 @@ export default { name: "History", - dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work","dict_ageunit","dict_job"], + dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work", "dict_ageunit", "dict_job"], data() { return { - selectList:[], + selectList: [], pickerOptions: { disabledDate(time) { return time.getTime() > Date.now(); @@ -421,6 +364,8 @@ }, // 琛ㄥ崟鍙傛暟 form: {}, + chageall: [], + bingshiall: [], rew: [], // 琛ㄥ崟鏍¢獙 rules: { @@ -549,33 +494,33 @@ let del_row = selection.shift(); this.$refs.multipleTable.toggleRowSelection(del_row, false); } - selection.forEach(item1=>{ + selection.forEach(item1 => { if (item1.tjCustomerSex === 1) { - this.sex = true; - } else { - this.sex = false; - } + this.sex = true; + } else { + this.sex = false; + } }) let userId = selection.map((item) => item.userId); getInfoById(userId).then((response) => { this.form = response.data; - if(this.form.xiyan == null){ - this.form.xiyan ="1" + if (this.form.xiyan == null) { + this.form.xiyan = "1" } - if(this.form.xiyanpinlv == null){ - this.form.xiyanpinlv ="0" + if (this.form.xiyanpinlv == null) { + this.form.xiyanpinlv = "0" } - if(this.form.xiyanyear == null){ - this.form.xiyanyear ="0" + if (this.form.xiyanyear == null) { + this.form.xiyanyear = "0" } - if(this.form.yinjiu == null){ - this.form.yinjiu ="1" + if (this.form.yinjiu == null) { + this.form.yinjiu = "1" } - if(this.form.yinjiupinlv == null){ - this.form.yinjiupinlv ="0" + if (this.form.yinjiupinlv == null) { + this.form.yinjiupinlv = "0" } - if(this.form.yinjiuyear == null){ - this.form.yinjiuyear ="0" + if (this.form.yinjiuyear == null) { + this.form.yinjiuyear = "0" } this.form.tjAskHistorysList = response.data.tjAskHistorysList; // this.isdisabled= true @@ -618,6 +563,87 @@ } this.$forceUpdate(); }, + + handlebingChange(selection) { + this.bingshiall = [] + this.bingshiall = selection + }, + + delemembers() { + this.form.tjAskHistorysList.forEach((item, index) => { + this.bingshiall.forEach((item1, index1) => { + if (item.id == item1.id) { + if (this.bingshiall.length == 1) { + this.form.tjAskHistorysList.splice(index, 1) + } else { + this.form.tjAskHistorysList.splice(index, index1) + } + + } + }) + }) + }, + + + addmemberss() { + if (this.form.cusName) { + if (!this.form.workLogs) { + this.form.workLogs = []; + this.form.workLogs.push({ + id: parseInt(this.form.workLogs.length + 1), + beginTime: "", + endTime: "", + workCompany: "", + workDept: "", + workType: "", + workLogs: "", + fangHu: "", + Selection, + }); + } else { + this.form.workLogs.push({ + id: parseInt(this.form.workLogs.length + 1), + beginTime: "", + endTime: "", + workCompany: "", + workDept: "", + workType: "", + workLogs: "", + fangHu: "", + Selection, + }); + } + console.log(that.form.workLogs) + } else { + Message.warning("璇峰厛濉啓瀹㈡埛鍚�"); + } + this.$forceUpdate(); + }, + + handlezhiyeChange(selection) { + this.chageall = [] + this.chageall = selection + + }, + + delememberss() { + let that = this + console.log(that.chageall) + + if (that.form.workLogs.length == that.chageall.length) { + that.form.workLogs = [] + } else { + that.chageall.forEach((item1, index1) => { + that.form.workLogs.forEach((item, index) => { + if (item.id == item1.id) { + console.log(111111) + that.form.workLogs.splice(index, 1) + } + }) + }) + } + + }, /** 鎻愪氦鎸夐挳 */ submitForm() { updateHistory(this.form).then((response) => { @@ -640,19 +666,24 @@ display: flex; justify-content: space-evenly; } + .hist2 { width: 708px; } + .hist3 { margin-top: 60px; } + .coll { width: 100%; } + ::v-deep .el-collapse-item__header { font-weight: 800; font-size: 16px; } + .txt { font-size: 16px; font-weight: 800; @@ -661,6 +692,7 @@ justify-content: center; margin-bottom: 20px; } + .el-table .warning-row { background: #e5f3ff !important; } diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index 0792d34..9f9542a 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -318,7 +318,16 @@ title="浣撴鎶ュ憡" @click="viewReport(scope.row)" ></el-button> --> - + <!-- <el-button + type="text" + size="mini" + class="btn" + icon="el-icon-view" + title="涓汉淇℃伅琛�" + v-if="scope.row.tjCategory == '02'" + @click="viewReport(scope.row)" + ></el-button> --> + <el-button type="text" size="mini" -- Gitblit v1.8.0