From 7acadd5e1bb4c7de24cc633ed634efe1fac7546b Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 26 二月 2025 09:07:08 +0800
Subject: [PATCH] 1
---
src/views/system/user/index.vue | 10
src/views/doctor/checkAll/index.vue | 1517 +++++++++++++++---------------------------------
src/views/hosp/order/index.vue | 178 ----
src/api/doctor/check.js | 7
src/views/reservation/resercopy/index.vue | 3
src/views/system/biol/index.vue | 133 ----
6 files changed, 531 insertions(+), 1,317 deletions(-)
diff --git a/src/api/doctor/check.js b/src/api/doctor/check.js
index 78085d8..cc5e9a0 100644
--- a/src/api/doctor/check.js
+++ b/src/api/doctor/check.js
@@ -27,6 +27,13 @@
params:query
})
}
+export function shanchu(query) {
+ return request({
+ url: '/check/delzongjianyishengchakanyichangxiangmu',
+ method: 'get',
+ params:query
+ })
+}
// 浣撴绉戝鍒楄〃鏄剧ず鎺ュ彛
export function yingXiangGetProList(query) {
return request({
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index f22e922..e589c9d 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1,127 +1,47 @@
<template>
<div class="mainbox">
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- style="width: 120px"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
+ @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- style="width: 180px"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @keyup.enter.native="submitForm"
- @blur="hb"
- ></el-input>
+ <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @keyup.enter.native="submitForm" @blur="hb"></el-input>
</el-form-item>
<el-form-item label="浣撴鏃堕棿" prop="tjTime">
- <el-date-picker
- v-model="startTime"
- type="datetimerange"
- align="right"
- :picker-options="pickerOptions"
- style="width: 310px"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
+ style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="tjCompName"
- style="margin-left: 20px"
- >
- <el-select
- :remote-method="getRemoteData"
- v-model="queryParams.tjCompName"
- value-key="drugManufacturerId"
- style="width: 180px"
- remote
- filterable
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="searchSelect"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.drugManufacturerId"
- :label="dict.cnName"
- :value="dict"
- />
+ <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+ <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+ style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- size="mini"
- @click="submitForm"
- style="margin-right: 15px"
- >鎼滅储</el-button
- >
+ <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-radio-group
- v-model="tjStatus"
- @input="radioChange"
- style="margin-left: 20px"
- >
+ <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px">
<el-radio-button label="0">鏈鏍�</el-radio-button>
<el-radio-button label="1">宸插鏍�</el-radio-button>
</el-radio-group>
<template>
- <el-table
- v-loading="loading"
- :data="checkList"
- ref="table"
- border
- style="margin: 20px; width: 98%"
- @current-change="handleCurrentChange"
- >
+ <el-table v-loading="loading" :data="checkList" ref="table" border style="margin: 20px; width: 98%"
+ @current-change="handleCurrentChange">
<!-- <template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template> -->
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- :show-overflow-tooltip="true"
- width="160px"
- fixed="left"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- :show-overflow-tooltip="true"
- width="100px"
- fixed="left"
- />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px"
+ fixed="left" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" :show-overflow-tooltip="true" width="100px"
+ fixed="left" />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="cusSex"
- :show-overflow-tooltip="true"
- width="55px"
- >
+ <el-table-column label="鎬у埆" align="center" prop="cusSex" :show-overflow-tooltip="true" width="55px">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
<span v-if="scope.row.cusSex == '1'">濂�</span>
@@ -129,20 +49,8 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</el-table-column>
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="cusBrithday"
- :show-overflow-tooltip="true"
- width="110px"
- />
- <el-table-column
- label="鐢佃瘽"
- align="center"
- prop="cusPhone"
- :show-overflow-tooltip="true"
- width="130px"
- />
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
+ <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
<!-- <el-table-column
label="浣撴鏃堕棿"
@@ -151,133 +59,62 @@
:show-overflow-tooltip="true"
width="110px"
/> -->
- <el-table-column
- label="瀹℃牳鏃堕棿"
- align="center"
- prop="shsj"
- :show-overflow-tooltip="true"
- width="180px"
- />
- <el-table-column
- label="瀹屾垚鏃堕棿"
- align="center"
- prop="finishTime"
- :show-overflow-tooltip="true"
- width="160px"
- />
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="tjStatus"
- :show-overflow-tooltip="true"
- width="120px"
- >
+ <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" />
+ <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" />
+ <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px">
<template slot-scope="scope">
<span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="tjCompName"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" />
<el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_tjtype"
- :value="scope.row.tjCategory"
- />
+ <dict-tag :options="dict.type.dict_tjtype" :value="scope.row.tjCategory" />
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="120px"
- fixed="right"
- >
+ <el-table-column label="鎿嶄綔" align="center" width="120px" fixed="right">
<template slot-scope="scope">
- <el-button
- fixed="right"
- title="澶勬柟"
- type="text"
- size="mini"
- @click.stop="rowClick(scope.row)"
- icon="el-icon-edit-outline"
- ></el-button>
- <el-button
- fixed="right"
- title="璇︽儏"
- type="text"
- size="mini"
- @click.stop="handleClick(scope.row)"
- icon="el-icon-document-copy"
- ></el-button>
+ <el-button fixed="right" title="澶勬柟" type="text" size="mini" @click.stop="rowClick(scope.row)"
+ icon="el-icon-edit-outline"></el-button>
+ <el-button fixed="right" title="璇︽儏" type="text" size="mini" @click.stop="handleClick(scope.row)"
+ icon="el-icon-document-copy"></el-button>
<!-- <el-button type="text" size="mini" @click="generate(scope.row)" v-if="scope.row.tjStatus=='1'">鐢熸垚</el-button> -->
- <el-button
- type="text"
- size="mini"
- @click.stop="viewReport(scope.row)"
- v-if="scope.row.tjStatus == '1'"
- title="棰勮"
- icon="el-icon-view"
- ></el-button>
- <el-button
- type="text"
- size="mini"
- v-if="scope.row.tjStatus == '1'"
- title="鎾ら攢"
- @click.stop="getRevoke(scope.row)"
- icon="el-icon-refresh-left"
- ></el-button>
+ <el-button type="text" size="mini" @click.stop="viewReport(scope.row)" v-if="scope.row.tjStatus == '1'"
+ title="棰勮" icon="el-icon-view"></el-button>
+ <el-button type="text" size="mini" v-if="scope.row.tjStatus == '1'" title="鎾ら攢"
+ @click.stop="getRevoke(scope.row)" icon="el-icon-refresh-left"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pag">
<div class="pag1">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="submitForm"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+ @pagination="submitForm" />
</div>
</div>
</template>
<!-- 鐐瑰嚮寮瑰嚭妗� -->
- <el-drawer
- custom-class="tanchu"
- :visible.sync="drawer"
- :before-close="handleClose"
- :with-header="false"
- size="100%"
- show-close="true"
- >
+ <el-drawer custom-class="tanchu" :visible.sync="drawer" :before-close="handleClose" :with-header="false" size="100%"
+ show-close="true">
<div class="top">
- <table
- style="
+ <table style="
width: 100%;
margin: 10px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<caption style="background-color: #f8f8f9; font-size: 18px">
{{
tableAll.cusName
}}鐨勪綋妫�璧勬枡
</caption>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
height: 36px;
- "
- >
+ ">
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
濮撳悕锛�
</td>
@@ -292,18 +129,16 @@
tableAll.cusSex == 0
? "鐢�"
: tableAll.cusSex == 1
- ? "濂�"
- : "鏈煡"
+ ? "濂�"
+ : "鏈煡"
}}
</td>
</tr>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
height: 36px;
- "
- >
+ ">
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
浣撴鍗曞彿锛�
</td>
@@ -328,361 +163,225 @@
</el-button>
</div>
<div class="btn1">
- <el-button @click="historicalreport()" type="primary"
- ><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button
- >
+ <el-button @click="historicalreport()" type="primary"><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button>
</div>
<div v-if="tableAll.tjCategory == '02'" class="btn1">
- <el-button @click="medicalhistory()" type="primary"
- ><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button
- >
+ <el-button @click="medicalhistory()" type="primary"><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button>
</div>
<div class="btn1" v-if="msgjianqian == 'y' || msgjianqian == 'Y'">
- <el-button @click="jianqian()" type="primary"
- ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
- >
+ <el-button @click="jianqian()" type="primary"><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button>
</div>
<div class="btn1">
- <el-button @click="xiangmuqingkuang()" type="primary"
- ><span class="vertical-text">椤圭洰鎯呭喌</span></el-button
- >
+ <el-button @click="xiangmuqingkuang()" type="primary"><span class="vertical-text">椤圭洰鎯呭喌</span></el-button>
</div>
<div class="btn1">
- <el-button @click="yichangjieguo()" type="primary"
- ><span class="vertical-text">寮傚父缁撴灉</span></el-button
- >
+ <el-button @click="yichangjieguo()" type="primary"><span class="vertical-text">寮傚父缁撴灉</span></el-button>
</div>
</div>
<div class="box">
- <div
- class="left"
- style="
- font-size: 14px;
- width: 1100px;
- margin-left: 10px;
- padding: 0 0 50px;
- "
- >
- <div v-for="(item, index) in changedate" :key="index">
- <div
- style="
- text-align: center;
- background-color: #aad8df;
- margin-top: 10px;
- "
- >
- {{ item.parent || "" }}
- </div>
- <div v-if="item.xmlb == '0'">
- <el-table
- :data="item.sons"
- border
- style="width: 100%"
- :row-style="changRed"
- :header-cell-style="{ background: '#aad8df' }"
- >
- <el-table-column align="center" label="妫�娴嬮」鐩�" width="464">
- <template slot-scope="scope">
- <div>{{ scope.row.proName }}</div>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="180"
- >
- </el-table-column>
- <el-table-column align="center" prop="" label="鍗曚綅">
- <template slot-scope="scope">
- <div v-if="scope.row.project != null">
- {{ scope.row.standard.company || "" }}
- </div>
- <div v-else>{{ scope.row.proAdvice }}</div>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- prop="conclusion"
- label="寮傚父"
- width="180"
- ></el-table-column>
- <el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�">
- <template slot-scope="scope">
- <div v-if="scope.row.project != null">
- {{
- scope.row.standard.tjStandardGtValue ||
- "/" + "-" + scope.row.standard.tjStandardLtValue ||
- "/"
- }}
- </div>
- <div v-else>{{ scope.row.stanId || "/" }}</div>
- </template>
- </el-table-column>
- </el-table>
- <table style="width: 100%" v-if="tjproject != '1'">
- <tr
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <td
- style="
+ <div class="left-container">
+ <div class="left">
+ <div v-for="(item, index) in changedate" :key="index">
+ <div style="
+ text-align: center;
+ background-color: #aad8df;
+ margin-top: 10px;
+ ">
+ {{ item.parent || "" }}
+ </div>
+ <div v-if="item.xmlb == '0'">
+ <el-table :data="item.sons" border style="width: 100%" :row-style="changRed"
+ :header-cell-style="{ background: '#aad8df' }">
+ <el-table-column align="center" label="妫�娴嬮」鐩�" width="464">
+ <template slot-scope="scope">
+ <div>{{ scope.row.proName }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="180">
+ </el-table-column>
+ <el-table-column align="center" prop="" label="鍗曚綅">
+ <template slot-scope="scope">
+ <div v-if="scope.row.project != null">
+ {{ scope.row.standard.company || "" }}
+ </div>
+ <div v-else>{{ scope.row.proAdvice }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="conclusion" label="寮傚父" width="180"></el-table-column>
+ <el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�">
+ <template slot-scope="scope">
+ <div v-if="scope.row.project != null">
+ {{
+ scope.row.standard.tjStandardGtValue ||
+ "/" + "-" + scope.row.standard.tjStandardLtValue ||
+ "/"
+ }}
+ </div>
+ <div v-else>{{ scope.row.stanId || "/" }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <table style="width: 100%" v-if="tjproject != '1'">
+ <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 7%;
+ ">
+ 灏忕粨锛�
+ </td>
+ <td style="border: 1px solid #dfe6ec; width: 45%">
+ <el-input v-model="item.remark" disabled></el-input>
+ </td>
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 15%;
+ ">
+ 涓绘鍖诲笀锛�
+ </td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+ {{ item.doctorName }}
+ </td>
+ </tr>
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- width: 7%;
- "
- >
- 灏忕粨锛�
- </td>
- <td style="border: 1px solid #dfe6ec; width: 45%">
- <el-input v-model="item.remark" disabled></el-input>
- </td>
- <td
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 15%;
- "
- >
- 涓绘鍖诲笀锛�
- </td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="2"
- >
- {{ item.doctorName }}
- </td>
- </tr>
- <tr
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 200px;
- "
- >
- <td
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 240px;
- "
- >
- 澶囨敞锛�
- </td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="3"
- >
- <el-input
- type="textarea"
- autosize
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="changedate[index].remark"
- v-on:input="change"
- style="width: 100%"
- >
- </el-input>
- <!-- <textarea
- placeholder="璇疯緭鍏ュ唴瀹�"
- :autosize="{ minRows: 2 }"
- style="width: 100%; height: 240px; resize: none"
- v-model="changedate[index].remark"
- v-on:input="change"
- ></textarea> -->
- </td>
- </tr>
- </table>
- </div>
- <div v-else>
- <table style="width: 100%" v-if="tjproject != '1'">
- <tr style="border: 1px solid #dfe6ec">
- <td
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 15%;
- height: auto;
- "
- >
- 妫�鏌ユ墍瑙侊細
- </td>
- <td
- style="border: 1px solid #dfe6ec; height: auto"
- colspan="2"
- >
- <el-input
- type="textarea"
- autosize
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="item.jgbx"
- style="width: 100%"
- >
- </el-input>
- <!-- <textarea
- placeholder="璇疯緭鍏ュ唴瀹�"
- :autosize="{ minRows: 3}"
- style="width: 100%; height: auto; resize: none"
- v-model="item.jgbx"
- ></textarea> -->
- </td>
- </tr>
- <tr
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- >
- <td
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 15%;
- "
- >
- 妫�鏌ユ彁绀猴細
- </td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="2"
- >
- <el-input
- type="textarea"
- autosize
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="item.remark"
- style="width: 100%"
- >
- </el-input>
- <!-- <textarea
+ width: 200px;
+ ">
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 240px;
+ ">
+ 澶囨敞锛�
+ </td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="3">
+ <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="changedate[index].remark"
+ v-on:input="change" style="width: 100%">
+ </el-input>
+ <!-- <textarea
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :autosize="{ minRows: 2 }"
+ style="width: 100%; height: 240px; resize: none"
+ v-model="changedate[index].remark"
+ v-on:input="change"
+ ></textarea> -->
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div v-else>
+ <table style="width: 100%" v-if="tjproject != '1'">
+ <tr style="border: 1px solid #dfe6ec">
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 15%;
+ height: auto;
+ ">
+ 妫�鏌ユ墍瑙侊細
+ </td>
+ <td style="border: 1px solid #dfe6ec; height: auto" colspan="2">
+ <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="item.jgbx" style="width: 100%">
+ </el-input>
+ <!-- <textarea
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :autosize="{ minRows: 3}"
+ style="width: 100%; height: auto; resize: none"
+ v-model="item.jgbx"
+ ></textarea> -->
+ </td>
+ </tr>
+ <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 15%;
+ ">
+ 妫�鏌ユ彁绀猴細
+ </td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+ <el-input type="textarea" autosize placeholder="璇疯緭鍏ュ唴瀹�" v-model="item.remark" style="width: 100%">
+ </el-input>
+ <!-- <textarea
- placeholder="璇疯緭鍏ュ唴瀹�"
- style="width: 100%; resize: none"
- v-model="item.remark"
- ></textarea> -->
- </td>
- </tr>
- <tr
- style="
- border: 1px solid #dfe6ec;
- border-collapse: collapse;
- width: 200px;
- "
- >
- <td
- style="
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ style="width: 100%; resize: none"
+ v-model="item.remark"
+ ></textarea> -->
+ </td>
+ </tr>
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- width: 15%;
- "
- >
- 涓绘鍖诲笀锛�
- </td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- colspan="2"
- >
- {{ item.doctorName }}
- </td>
- </tr>
- </table>
+ width: 200px;
+ ">
+ <td style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 15%;
+ ">
+ 涓绘鍖诲笀锛�
+ </td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+ {{ item.doctorName }}
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
- </div>
- <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
- <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button>
- <el-button type="primary" @click="proposalChange"
- >鐢熸垚寤鸿</el-button
- >
- </div>
+ <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
+ <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button>
+ <el-button type="primary" @click="proposalChange">鐢熸垚寤鸿</el-button>
+ </div>
- <el-form
- ref="numberValidateForm"
- label-width="80px"
- class="demo-ruleForm"
- v-if="tjproject != '1'"
- >
- <el-form-item label="鎬绘寤鸿">
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="textarea1"
- :rows="3"
- style="width: 96%"
- >
- </el-input>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footers">
- <el-button type="primary" @click.stop="guanbi">鍙栨秷</el-button>
- <el-button
- v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')"
- type="primary"
- @click.stop="rowClick"
- icon="el-icon-edit-outline"
- >寮�澶勬柟</el-button
- >
- <div v-if="tjproject == '0'">
- <el-button
- type="primary"
- @click="determine"
- :disabled="isdisabled"
- >鎻愪氦骞剁敓鎴愭姤鍛�</el-button
- >
+ <el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm" v-if="tjproject != '1'">
+ <el-form-item label="鎬绘寤鸿">
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3" style="width: 96%">
+ </el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footers">
+ <el-button type="primary" @click.stop="guanbi">鍙栨秷</el-button>
+ <el-button v-if="tjproject == '0' && (msgkcf == 'y' || msgkcf == 'Y')" type="primary"
+ @click.stop="rowClick" icon="el-icon-edit-outline">寮�澶勬柟</el-button>
+ <div v-if="tjproject == '0'">
+ <el-button type="primary" @click="determine" :disabled="isdisabled">鎻愪氦骞剁敓鎴愭姤鍛�</el-button>
+ </div>
</div>
</div>
</div>
-
<div class="rightbox">
<div class="right">
<template v-if="status1 == 0">
<div v-for="(item, index) in yichangList" :key="index">
- <div
- style="
+ <div style="
text-align: center;
background-color: #67c23a;
margin-top: 10px;
- "
- >
+ ">
{{ item.proName || "" }}
</div>
<template v-if="item.jyjc == '0'">
- <el-table
- :stripe="true"
- :row-style="red"
- :data="item.sone"
- border
- style="width: 100%"
- :header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
- :row-key="getRowKeys"
- >
+ <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
+ :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys">
<el-table-column type="expand">
<template slot-scope="props">
- <div>
- <div
- v-if="
- props.row.advices && props.row.advices.length > 0
- "
- >
- <div
- v-for="(jianyi, index1) in props.row.advices"
- :key="index1"
- style="padding: 0 10px; margin-bottom: 10px"
- >
+ <div style="padding: 10px;">
+ <!-- 鍐呭鍖哄煙 -->
+ <div v-if="props.row.advices && props.row.advices.length > 0">
+ <div v-for="(jianyi, index1) in props.row.advices" :key="index1"
+ style="margin-bottom: 10px">
<div>
鏍囬锛�
- <el-input
- v-model="jianyi.bt"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="jianyi.bt" size="small" type="textarea" autosize></el-input>
</div>
<div>
鍐呭锛�
- <el-input
- v-model="jianyi.nr"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="jianyi.nr" size="small" type="textarea" autosize></el-input>
</div>
</div>
</div>
@@ -691,112 +390,55 @@
<div v-else>
<div>
鏍囬锛�
- <el-input
- v-model="emptyAdvice.bt"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="emptyAdvice.bt" size="small" type="textarea" autosize></el-input>
</div>
<div>
鍐呭锛�
- <el-input
- v-model="emptyAdvice.nr"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="emptyAdvice.nr" size="small" type="textarea" autosize></el-input>
</div>
+ </div>
+
+
+ <div style="margin-top: 10px;">
+ <el-button @click="shanchu(props.row)" type="danger" size="small">鍒犻櫎</el-button>
</div>
</div>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="妫�娴嬮」鐩�"
- :show-overflow-tooltip="true"
- width="353"
- >
+ <el-table-column align="center" label="妫�娴嬮」鐩�" :show-overflow-tooltip="true" width="353">
<template slot-scope="scope">
<div>{{ scope.row.proName }}</div>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="85"
- >
+ <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="85">
</el-table-column>
- <el-table-column
- align="center"
- prop="stanId"
- label=" 鍙傝�冭寖鍥�"
- width="117"
- >
+ <el-table-column align="center" prop="stanId" label=" 鍙傝�冭寖鍥�" width="117">
</el-table-column>
- <el-table-column
- align="center"
- prop="proAdvice"
- label="鍗曚綅"
- width="78"
- >
+ <el-table-column align="center" prop="proAdvice" label="鍗曚綅" width="78">
</el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- width="100">
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="danger" size="small">鍒犻櫎</el-button>
- </template>
- </el-table-column>
+
</el-table>
</template>
<template v-if="item.jyjc == '1'">
- <el-table
- :stripe="true"
- :row-style="red"
- :data="item.sone"
- border
- style="width: 100%"
- :header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
- :row-key="getRowKeys"
- >
+ <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
+ :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys">
<el-table-column type="expand">
<template slot-scope="props">
- <div>
- <!-- 濡傛灉 advices 闈炵┖锛屾覆鏌撳叾鍐呭 -->
- <div
- v-if="
- props.row.advices && props.row.advices.length > 0
- "
- >
- <div
- v-for="(jianyi, index1) in props.row.advices"
- :key="index1"
- style="padding: 0 10px; margin-bottom: 10px"
- >
+ <div style="padding: 10px;">
+ <!-- 鍐呭鍖哄煙 -->
+ <div v-if="props.row.advices && props.row.advices.length > 0">
+ <div v-for="(jianyi, index1) in props.row.advices" :key="index1"
+ style="margin-bottom: 10px">
<div>
鏍囬锛�
- <el-input
- v-model="jianyi.bt"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="jianyi.bt" size="small" type="textarea" autosize></el-input>
</div>
<div>
鍐呭锛�
- <el-input
- v-model="jianyi.nr"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="jianyi.nr" size="small" type="textarea" autosize></el-input>
</div>
</div>
</div>
@@ -805,43 +447,28 @@
<div v-else>
<div>
鏍囬锛�
- <el-input
- v-model="emptyAdvice.bt"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="emptyAdvice.bt" size="small" type="textarea" autosize></el-input>
</div>
<div>
鍐呭锛�
- <el-input
- v-model="emptyAdvice.nr"
- size="small"
- type="textarea"
- autosize
- ></el-input>
+ <el-input v-model="emptyAdvice.nr" size="small" type="textarea" autosize></el-input>
</div>
+ </div>
+
+
+ <div style="margin-top: 10px;">
+ <el-button @click="shanchu(props.row)" type="danger" size="small">鍒犻櫎</el-button>
</div>
</div>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="妫�娴嬮」鐩�"
- width="232"
- :show-overflow-tooltip="true"
- >
+ <el-table-column align="center" label="妫�娴嬮」鐩�" width="232" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div>{{ scope.row.proName }}</div>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="403"
- >
+ <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="403">
</el-table-column>
</el-table>
</template>
@@ -849,43 +476,21 @@
</template>
<template v-if="status1 == 1">
<div>
- <div
- style="
+ <div style="
text-align: center;
background-color: #e6a23c;
margin-top: 10px;
- "
- >
+ ">
椤圭洰妫�鏌ユ儏鍐�
</div>
- <el-table
- :row-style="redxiangmu"
- :data="statusList"
- style="width: 100%"
- :header-cell-style="{ background: '#e6a23c' }"
- >
- <el-table-column
- align="center"
- label="閮ㄩ棬"
- width="144"
- prop="deptName"
- >
+ <el-table :row-style="redxiangmu" :data="statusList" style="width: 100%"
+ :header-cell-style="{ background: '#e6a23c' }">
+ <el-table-column align="center" label="閮ㄩ棬" width="144" prop="deptName">
</el-table-column>
- <el-table-column
- align="center"
- prop="proName"
- label="椤圭洰"
- width="260"
- >
+ <el-table-column align="center" prop="proName" label="椤圭洰" width="260">
</el-table-column>
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="type"
- :show-overflow-tooltip="true"
- width="120"
- >
+ <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.type == '0'">鏈鏍�</span>
<span v-if="scope.row.type == '1'">宸插鏍�</span>
@@ -893,12 +498,7 @@
<span v-if="scope.row.type == '3'">寤舵湡</span>
</template>
</el-table-column>
- <el-table-column
- label="妫�鏌ユ椂闂�"
- align="center"
- prop="bcupdateTime"
- width="160"
- />
+ <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
</el-table>
</div>
</template>
@@ -908,152 +508,69 @@
<div class="hist3" v-if="wenzhen">
<span class="txt">闂瘖淇℃伅</span>
- <el-form
- ref="form"
- :model="formobj"
- label-width="100px"
- :inline="true"
- size="mini"
- >
+ <el-form ref="form" :model="formobj" 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: 100%; font-weight: 600"
- >
+ <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 100%; font-weight: 600">
<div style="width: 100%">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input
- disabled
- v-model="formobj.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- />
+ <el-input disabled v-model="formobj.cusName" placeholder="璇疯緭鍏ュ鍚�" />
</el-form-item>
<el-form-item label="鑱屼笟" prop="work">
- <el-select
- filterable
- v-model="formobj.work"
- placeholder="璇烽�夋嫨鑱屼笟"
- clearable
- style="width: 150px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.tj_work"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select filterable v-model="formobj.work" placeholder="璇烽�夋嫨鑱屼笟" clearable style="width: 150px"
+ disabled>
+ <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
- disabled
- filterable
- v-model="formobj.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 disabled filterable v-model="formobj.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
- disabled
- type="textarea"
- rows="4"
- v-model="formobj.contactPoison"
- placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
- style="width: 700px"
- />
+ <el-input disabled type="textarea" rows="4" v-model="formobj.contactPoison" placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
+ style="width: 700px" />
</el-form-item>
<el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
- <el-input
- disabled
- type="textarea"
- rows="4"
- v-model="formobj.medicalHistory"
- placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
- style="width: 700px"
- />
+ <el-input disabled type="textarea" rows="4" v-model="formobj.medicalHistory" placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
+ style="width: 700px" />
</el-form-item>
</div>
</el-collapse-item>
<el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
<div style="width: 100%">
<el-form-item label="鍒濇疆(宀�)" prop="chuchao">
- <el-input
- v-model="formobj.chuchao"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.chuchao" style="width: 70px" disabled />
</el-form-item>
<el-form-item label="缁忔湡" prop="jingqi">
- <el-input
- v-model="formobj.jingqi"
- disabled
- style="width: 70px"
- />澶�
+ <el-input v-model="formobj.jingqi" disabled style="width: 70px" />澶�
</el-form-item>
<el-form-item label="鍛ㄦ湡" prop="zhouqi">
- <el-input
- v-model="formobj.zhouqi"
- disabled
- style="width: 70px"
- />澶�
+ <el-input v-model="formobj.zhouqi" disabled style="width: 70px" />澶�
</el-form-item>
<el-form-item label="鏈鏈堢粡" prop="mociage">
- <el-input
- v-model="formobj.mociage"
- disabled
- style="width: 100px"
- />
+ <el-input v-model="formobj.mociage" disabled style="width: 100px" />
</el-form-item>
</div>
</el-collapse-item>
<el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
<div style="width: 100%">
<el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
- <el-input
- v-model="formobj.zinv"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.zinv" style="width: 70px" disabled />
</el-form-item>
<el-form-item label="娴佷骇(娆�)" prop="liuchan">
- <el-input
- v-model="formobj.liuchan"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.liuchan" style="width: 70px" disabled />
</el-form-item>
<el-form-item label="鏃╀骇(娆�)" prop="zaochan">
- <el-input
- v-model="formobj.zaochan"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.zaochan" style="width: 70px" disabled />
</el-form-item>
<el-form-item label="姝讳骇(娆�)" prop="sichan">
- <el-input
- v-model="formobj.sichan"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.sichan" style="width: 70px" disabled />
</el-form-item>
<el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
- <el-input
- v-model="formobj.yichangtai"
- style="width: 70px"
- disabled
- />
+ <el-input v-model="formobj.yichangtai" style="width: 70px" disabled />
</el-form-item>
</div>
</el-collapse-item>
@@ -1061,152 +578,72 @@
<div style="width: 100%">
<el-form-item label="鏄惁鍚哥儫" prop="xiyan">
<!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> -->
- <el-select
- disabled
- filterable
- v-model="formobj.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 disabled filterable v-model="formobj.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="formobj.xiyanpinlv"
- disabled
- style="width: 70px"
- />鏀�/澶�
+ <el-input v-model="formobj.xiyanpinlv" disabled style="width: 70px" />鏀�/澶�
</el-form-item>
<el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
- <el-input
- v-model="formobj.xiyanyear"
- disabled
- style="width: 70px"
- />骞� </el-form-item
- ><br />
+ <el-input v-model="formobj.xiyanyear" disabled 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="formobj.yinjiu"
- disabled
- 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="formobj.yinjiu" disabled 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="formobj.yinjiupinlv"
- disabled
- style="width: 70px"
- />ml/澶�
+ <el-input v-model="formobj.yinjiupinlv" disabled style="width: 70px" />ml/澶�
</el-form-item>
<el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
- <el-input
- v-model="formobj.yinjiuyear"
- disabled
- style="width: 70px"
- />骞�
+ <el-input v-model="formobj.yinjiuyear" disabled style="width: 70px" />骞�
</el-form-item>
<el-form-item label="鍏朵粬" prop="qita">
- <el-input
- v-model="formobj.qita"
- placeholder="璇疯緭鍏ュ叾浠�"
- disabled
- type="textarea"
- style="width: 600px"
- rows="2"
- />
+ <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" disabled type="textarea" style="width: 600px"
+ rows="2" />
</el-form-item>
</div>
</el-collapse-item>
<el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
<div style="width: 100%">
- <el-table
- border
- :data="formobj.tjAskHistorysList"
- ref="tjAskHistorys"
- style="width: 98%"
- >
+ <el-table border :data="formobj.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%">
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
<template slot-scope="scope">
- <el-input
- size="mini"
- disabled
- v-model="scope.row.diseaseName"
- placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
- />
+ <el-input size="mini" disabled v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" />
</template>
</el-table-column>
<el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
<template slot-scope="scope">
- <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"
- disabled
- v-model="scope.row.diseaseCompany"
- placeholder="璇疯緭鍏ヨ瘖鏂崟浣�"
- />
+ <el-input size="mini" disabled 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
- disabled
- 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 disabled 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
- disabled
- size="mini"
- v-model="scope.row.remark"
- placeholder="璇疯緭鍏ュ娉�"
- />
+ <el-input disabled size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" />
</template>
</el-table-column>
</el-table>
@@ -1219,94 +656,48 @@
<el-table-column type="selection" width="40" align="center" />
<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 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"
- disabled
- v-model="scope.row.endTime"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- style="width: 130px"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker size="mini" disabled 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"
- disabled
- v-model="scope.row.workCompany"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- />
+ <el-input size="mini" disabled v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
</template>
</el-table-column>
<el-table-column label="閮ㄩ棬" prop="workDept">
<template slot-scope="scope">
- <el-input
- disabled
- size="mini"
- v-model="scope.row.workDept"
- placeholder="璇疯緭鍏ラ儴闂�"
- />
+ <el-input disabled size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" />
</template>
</el-table-column>
<el-table-column label="宸ョ" prop="workType">
<template slot-scope="scope">
- <el-input
- disabled
- size="mini"
- v-model="scope.row.workType"
- placeholder="璇疯緭鍏ュ伐绉�"
- />
+ <el-input disabled size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
</template>
</el-table-column>
<el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
- <el-select
- filterable
- disabled
- size="mini"
- v-model="scope.row.harmTypeLogs"
- multiple
- placeholder="璇烽�夋嫨鏈夊鍥犵礌"
- clearable
- >
- <el-option
- v-for="dict in harmTypeList"
- :key="dict.aid"
- :label="dict.harmtype"
- :value="dict.aid"
- />
+ <el-select filterable disabled size="mini" v-model="scope.row.harmTypeLogs" multiple
+ placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
+ <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
+ :value="dict.aid" />
</el-select>
</template>
</el-table-column>
<el-table-column label="闃叉姢鎺柦" prop="fangHu">
<template slot-scope="scope">
- <el-input
- disabled
- size="mini"
- v-model="scope.row.fangHu"
- placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�"
- />
+ <el-input disabled size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
</template>
</el-table-column>
</el-table>
@@ -1317,31 +708,13 @@
</div>
</el-drawer>
- <el-dialog
- class="dia"
- title="PDF 棰勮"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- >
+ <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false" width="50%">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="jianqians"
- width="1000px"
- :before-close="handleClose1"
- >
- <jianqianwenzhen
- :jianqianwenzhendata="jianqianwenzhendata"
- v-if="flags"
- ></jianqianwenzhen>
+ <el-dialog title="鎻愮ず" :visible.sync="jianqians" width="1000px" :before-close="handleClose1">
+ <jianqianwenzhen :jianqianwenzhendata="jianqianwenzhendata" v-if="flags"></jianqianwenzhen>
<span slot="footer" class="dialog-footer">
<el-button @click="jianqians = false">鍙� 娑�</el-button>
</span>
@@ -1351,16 +724,11 @@
<proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
<createproposal ref="createproposal" :creatobj="creatobj" />
- <el-dialog
- title="甯哥敤寤鸿缁存姢"
- :visible.sync="propdialog"
- width="500px"
- append-to-body
- >
+ <el-dialog title="甯哥敤寤鸿缁存姢" :visible.sync="propdialog" width="500px" append-to-body>
</el-dialog>
</div>
</template>
-
+
<script>
import jianqianwenzhen from "@/components/jianqianwenzhen";
@@ -1385,7 +753,7 @@
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
import { getCompany, queryCompany } from "@/api/team/tuanti";
-import { reportHistory, yichang } from "@/api/doctor/check";
+import { reportHistory, yichang, shanchu } from "@/api/doctor/check";
import { getPdf, revoke } from "@/api/hosp/order";
import { cSWebGetPro } from "@/api/doctor/examination";
import ViewPdf from "@/components/ViewPdf";
@@ -1572,6 +940,40 @@
});
},
methods: {
+ shanchu(row) {
+ console.log(row)
+ shanchu({
+ id: row.orderDetailId,
+ }).then((res) => {
+ console.log(res);
+ // 鎵惧埌瑕佸垹闄ら」鎵�鍦ㄧ殑鐖剁骇鏁扮粍
+ const parentItem = this.yichangList.find(item =>
+ item.sone.some(soneItem => soneItem.proId === row.proId)
+ );
+
+ if (parentItem) {
+ // 浠庣埗绾х殑 sone 鏁扮粍涓垹闄よ椤�
+ const index = parentItem.sone.findIndex(item => item.proId === row.proId);
+ if (index > -1) {
+ parentItem.sone.splice(index, 1);
+
+ // 濡傛灉鍒犻櫎鍚� sone 鏁扮粍涓虹┖,鍒欏垹闄ゆ暣涓埗绾ч」
+ if (parentItem.sone.length === 0) {
+ const parentIndex = this.yichangList.indexOf(parentItem);
+ if (parentIndex > -1) {
+ this.yichangList.splice(parentIndex, 1);
+ }
+ }
+
+ // 鏇存柊 expends 鏁扮粍
+ this.getExpends();
+
+ this.$message.success('鍒犻櫎鎴愬姛');
+ }
+ }
+ })
+
+ },
getConfigKey() {
getconfigKey("sfkqtwbg").then((res) => {
this.msgtuwen = res.msg;
@@ -1743,7 +1145,10 @@
setTimeout(() => {
loading.close();
}, 3000);
- this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+ this.$message({
+ message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+ type: "error"
+ });
} else {
this.dialogVisible = true;
@@ -2345,7 +1750,7 @@
state: 1,
id: this.MsgId,
};
- getfiedState(data).then((res) => {});
+ getfiedState(data).then((res) => { });
this.submitForm();
});
} else {
@@ -2377,7 +1782,7 @@
// });
// }
// },
- change(vale) {},
+ change(vale) { },
// determine() {
// let tjNumber = this.tableAll.tjNumber;
@@ -2605,25 +2010,33 @@
.mainbox {
position: relative;
}
+
.btn {
margin: 20px 0px;
}
+
.btnbox {
display: flex;
flex-direction: column;
- gap: 10px; /* 鎸夐挳涔嬮棿鐨勯棿璺� */
- position: fixed; /* 浣挎暣涓寜閽尯鍩熷浐瀹氬湪椤甸潰 */
- right: 0; /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */
- top: 20%; /* 鍒濆浣嶇疆 */
+ gap: 10px;
+ /* 鎸夐挳涔嬮棿鐨勯棿璺� */
+ position: fixed;
+ /* 浣挎暣涓寜閽尯鍩熷浐瀹氬湪椤甸潰 */
+ right: 0;
+ /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */
+ top: 20%;
+ /* 鍒濆浣嶇疆 */
z-index: 10;
}
/* 姣忎釜鎸夐挳鐨勬牱寮� */
.btn1 {
- animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
+ animation: fadeInUp 0.5s ease-out forwards;
+ /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
cursor: pointer;
text-align: center;
}
+
.vertical-text {
writing-mode: vertical-rl;
text-orientation: upright;
@@ -2633,86 +2046,97 @@
@keyframes fadeInUp {
0% {
opacity: 0;
- transform: translateY(20px) scale(0.5); /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */
+ transform: translateY(20px) scale(0.5);
+ /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */
}
+
100% {
opacity: 1;
- transform: translateY(0) scale(1); /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */
+ transform: translateY(0) scale(1);
+ /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */
}
}
/* 姣忎釜鎸夐挳鐨勪綅缃拰鍔ㄧ敾寤惰繜 */
-.btnbox > div:nth-child(1) {
- top: 20%; /* 绗竴涓寜閽殑浣嶇疆 */
- animation-delay: 0s; /* 鏃犲欢杩� */
+.btnbox>div:nth-child(1) {
+ top: 20%;
+ /* 绗竴涓寜閽殑浣嶇疆 */
+ animation-delay: 0s;
+ /* 鏃犲欢杩� */
}
-.btnbox > div:nth-child(2) {
- top: 30%; /* 绗簩涓寜閽殑浣嶇疆 */
+.btnbox>div:nth-child(2) {
+ top: 30%;
+ /* 绗簩涓寜閽殑浣嶇疆 */
animation-delay: 0.2s;
}
-.btnbox > div:nth-child(3) {
- top: 40%; /* 绗笁涓寜閽殑浣嶇疆 */
+.btnbox>div:nth-child(3) {
+ top: 40%;
+ /* 绗笁涓寜閽殑浣嶇疆 */
animation-delay: 0.4s;
}
-.btnbox > div:nth-child(4) {
- top: 50%; /* 绗洓涓寜閽殑浣嶇疆 */
+.btnbox>div:nth-child(4) {
+ top: 50%;
+ /* 绗洓涓寜閽殑浣嶇疆 */
animation-delay: 0.6s;
}
-.btnbox > div:nth-child(5) {
- top: 60%; /* 绗簲涓寜閽殑浣嶇疆 */
+.btnbox>div:nth-child(5) {
+ top: 60%;
+ /* 绗簲涓寜閽殑浣嶇疆 */
animation-delay: 0.8s;
}
-.btnbox > div:nth-child(6) {
- top: 70%; /* 绗叚涓寜閽殑浣嶇疆 */
+.btnbox>div:nth-child(6) {
+ top: 70%;
+ /* 绗叚涓寜閽殑浣嶇疆 */
animation-delay: 1s;
}
.main {
- height: 800px;
- overflow: hidden;
+ height: 80vh; // 鏀逛负浣跨敤瑙嗙獥楂樺害
+ min-height: 600px; // 璁剧疆鏈�灏忛珮搴�
+ overflow: auto; // 鏀逛负auto鍏佽婊氬姩
}
-#printIframe::-webkit-scrollbar {
+// 浼樺寲婊氬姩鏉℃牱寮�
+.main::-webkit-scrollbar {
width: 6px;
}
-/* 淇敼 婊氬姩鏉＄殑 涓嬮潰 鐨� 鏍峰紡 */
-#printIframe::-webkit-scrollbar-track {
+.main::-webkit-scrollbar-track {
background-color: white;
- -webkit-border-radius: 2em;
- -moz-border-radius: 2em;
border-radius: 2em;
}
-/* 淇敼 婊戝潡 */
-#printIframe::-webkit-scrollbar-thumb {
+.main::-webkit-scrollbar-thumb {
background-color: #dcdfe6;
- -webkit-border-radius: 2em;
- -moz-border-radius: 2em;
border-radius: 2em;
}
+
::v-deep .el-dialog {
- width: 1700px;
- height: 900px;
+ margin-top: 5vh !important; // 璋冩暣瀵硅瘽妗嗕綅缃�
}
+
::v-deep .el-dialog__header {
padding: 8px;
}
+
::v-deep .el-dialog__body {
padding: 0;
}
+
::v-deep .el-button--medium {
padding: 10px;
}
+
::v-deep .el-dialog__headerbtn {
// position: relative;
top: 13px;
}
+
/* .el-dialog {
width: 1264px;
height: 800px;
@@ -2746,9 +2170,11 @@
display: flex;
justify-content: center;
align-items: center;
- z-index: 1000; /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */
+ z-index: 1000;
+ /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */
width: 300px;
- background-color: white; /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */
+ background-color: white;
+ /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */
}
/* 纭繚鎸夐挳涔嬮棿鏈夊悎閫傜殑闂磋窛 */
@@ -2761,30 +2187,66 @@
border: none;
outline: none;
}
+
.box {
display: flex;
+ height: calc(100vh - 200px);
+ margin-top: 20px;
+ overflow: hidden;
+}
- // height: 100vh;
+.left-container {
+ flex: 1;
+ margin-right: 10px;
+ overflow: hidden;
+}
+
+.left {
+ height: 100%;
+ padding: 0 10px;
+ overflow-y: scroll; // 鏀逛负 scroll 鑰屼笉鏄� auto
+
+ &::-webkit-scrollbar {
+ width: 8px; // 澧炲姞瀹藉害浣垮叾鏇村鏄撶湅瑙�
+ background-color: #f5f5f5;
+ display: block; // 纭繚鏄剧ず
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #909399;
+ border-radius: 4px;
+ }
+
+ &::-webkit-scrollbar-track {
+ background: #f5f5f5;
+ border-radius: 4px;
+ }
}
.rightbox {
- // margin-left: 60px;
- // position: fixed;
- // top: 107px;
- // right: 56px;
- width: 684px;
- position: fixed; /* 鍥哄畾瀹氫綅 */
- right: 60px;
- .right {
- background-color: #fff;
- // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
- z-index: 10;
- max-height: 900px;
- height: calc(100vh - 100px);
- /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */
- overflow-y: auto !important; /* 鍏佽鍨傜洿婊氬姩 */
- padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
- padding-bottom: 200px;
+ width: 700px;
+ overflow: hidden;
+}
+
+.right {
+ height: 100%;
+ padding: 0 10px;
+ overflow-y: scroll; // 鏀逛负 scroll 鑰屼笉鏄� auto
+
+ &::-webkit-scrollbar {
+ width: 8px; // 澧炲姞瀹藉害
+ background-color: #f5f5f5;
+ display: block; // 纭繚鏄剧ず
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #909399;
+ border-radius: 4px;
+ }
+
+ &::-webkit-scrollbar-track {
+ background: #f5f5f5;
+ border-radius: 4px;
}
}
@@ -2795,6 +2257,7 @@
background-color: #fff;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
display: flex;
+
.el-icon-close {
cursor: pointer;
font-size: 30px;
@@ -2804,18 +2267,20 @@
color: rgb(24, 144, 255);
}
}
+
.kong {
box-shadow: none;
}
+
::v-deep .el-table--medium .el-table__cell {
padding: 5px 0;
}
+
::-webkit-scrollbar {
display: none;
}
+
::v-deep .el-drawer {
padding: 0 0 50px;
}
</style>
-
-
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 2056b76..7c847ec 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -804,13 +804,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -953,15 +960,7 @@
<div class="tab8">
<el-row :gutter="20" style="width: 100%">
<el-col :span="22">
- <!-- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div> -->
+
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterage"
@@ -984,29 +983,6 @@
</el-tree>
</div>
</el-col>
- <!-- <el-col :span="11">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </el-col> -->
- <!-- <el-col :span="11"> </el-col> -->
</el-row>
</div>
</el-tab-pane>
@@ -1014,15 +990,6 @@
<div class="tab8">
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="22">
- <!-- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 椤圭洰鍒楄〃
- </div> -->
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText"
@@ -1045,106 +1012,6 @@
</el-tree>
</div>
</el-col>
- <!-- <el-col :span="11">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 鏄庣粏椤圭洰鍒楄〃
- </div>
- <div class="tab3">
- <div class="outside1">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
- </el-tree>
- </div>
- </div>
- </el-col> -->
- <!-- <el-col :span="11">
- <div class="grid-content bg-purple">
- <div
- style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- "
- >
- 宸查�夐」鐩垪琛�
- </div>
-
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px">
- </el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
- </el-table-column>
-
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
- </template>
- </el-table-column>
- </el-table> -->
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse> -->
- <!-- </div>
- </el-col> -->
</el-row>
</div>
</el-tab-pane>
@@ -1158,13 +1025,20 @@
<el-table
:data="DataList3"
border
- style="width: 100%"
+ style="width: 100%; table-layout: fixed"
height="560"
- :span-method="objectspanmethod"
- >
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ :span-method="objectspanmethod">
+ <el-table-column
+ prop="propinName"
+ label="妫�鏌ラ」鐩�"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+ <el-table-column
+ prop="proName"
+ label="鏄庣粏椤圭洰"
+ width="200px"
+ :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -2686,7 +2560,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 8d478e9..205c8b4 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -397,6 +397,7 @@
</template>
<script>
+import Cookies from "js-cookie"
import {
addDept,
addComp,
@@ -512,7 +513,7 @@
// 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
updateSupport: 0,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() },
+ headers: { Authorization: "Bearer " + getToken(),hospId: Cookies.get("hospId") },
// 涓婁紶鐨勫湴鍧�
url:
process.env.VUE_APP_BASE_API +
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 81e2f80..07064b3 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -544,9 +544,8 @@
import { getInfo } from "@/api/login";
import { isPdfOrJimu } from "@/api/doctor/checkAll";
import {
- listOrder,
- getNumber,
getPdf,
+ getPdfpre,
getprint,
hasReport,
hasPrintCode,
@@ -819,14 +818,15 @@
},
baogaoyulan() {
const tjNumber = this.report[0];
- console.log(tjNumber, 5555);
this.isLoading = true;
isPdfOrJimu(tjNumber).then((response) => {
if (response.data.flag == "0") {
const flag = true;
this.isLoading = false;
- getPdf(tjNumber, flag).then((response) => {
+ let sfdy = this.queryParams.dyzt == 0 ? 1 : 0
+ getPdfpre(tjNumber, flag, sfdy).then((response) => {
+
if (response.size === 0) {
const loading = this.$loading({
lock: true,
@@ -837,15 +837,12 @@
setTimeout(() => {
loading.close();
}, 3000);
- // this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
this.$message({
message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
type: "warning",
});
} else {
- console.log(response);
this.dialogVisible = true;
-
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
}
});
@@ -933,18 +930,6 @@
contentType: "application/pdf",
}).then((res) => {
this.dialogVisible = true;
- // 杞悗鍚庣殑blob瀵硅薄
- console.log("blob", res.preview);
- // var ifr = document.createElement("iframe");
- // ifr.style.frameborder = "no";
- // ifr.style.display = "none";
- // ifr.style.pageBreakBefore = "always";
- // ifr.setAttribute("id", "printPdf");
- // ifr.setAttribute("name", "printPdf");
- // ifr.src =res.preview
- // document.body.appendChild(ifr);
- // this.doPrint("printPdf");
- // window.URL.revokeObjectURL( ifr.src);
try {
this.url = res.preview;
} catch (error) {
@@ -954,116 +939,6 @@
});
},
- // 浣撴鎶ュ憡
- // viewReport() {
- // const flag = true;
- // this.failList = [];
- // this.form.name = "鎶ュ憡鎵撳嵃澶辫触锛�";
-
- // if (this.report.length == 1) {
- // this.report.forEach((item) => {
- // this.tjNumber = item;
- // });
- // getPdf(this.tjNumber, flag).then((response) => {
- // if (response.size == 0) {
- // // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- // this.dialogVisible = false;
- // this.DataList1.forEach((item) => {
- // if (item.tjNumber === this.tjNumber) {
- // this.userId = item.tjCustomerName;
- // this.form.name += item.tjCustomerName;
- // }
- // });
- // this.failList.push({
- // tjNumber: this.tjNumber,
- // printStatus: 0,
- // printBy: this.userId,
- // createBy: this.userIds,
- // });
- // } else {
- // this.dialogVisible = true;
- // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- // console.log(this.url)
- // this.DataList1.forEach((item) => {
- // if (item.tjNumber === this.tjNumber) {
- // this.userId = item.tjCustomerName;
- // // this.form.name += item.tjCustomerName
- // }
- // });
- // this.failList.push({
- // tjNumber: this.tjNumber,
- // printStatus: 1,
- // printBy: this.userId,
- // createBy: this.userIds,
- // });
- // }
- // this.joggle(this.failList);
- // this.getList();
- // });
- // } else {
- // for (let i = 0; i < this.report.length; i++) {
- // if (i <= this.report.length) {
- // this.tjNumber = this.report[i];
- // getPdf(this.tjNumber, flag).then((response) => {
- // if (response.size == 0) {
- // this.failList = [];
- // this.DataList1.forEach((item) => {
- // if (item.tjNumber === this.report[i]) {
- // this.userId = item.tjCustomerName;
- // if (this.form.name) {
- // this.form.name =
- // this.form.name + "," + item.tjCustomerName;
- // }
- // }
- // });
- // this.failList.push({
- // tjNumber: this.report[i],
- // printStatus: 0,
- // printBy: this.userId,
- // createBy: this.userIds,
- // });
- // this.joggle(this.failList);
- // this.getList();
- // // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
- // this.dialogVisible = false;
- // } else {
- // this.failList = [];
- // this.DataList1.forEach((item) => {
- // if (item.tjNumber === this.report[i]) {
- // this.userId = item.tjCustomerName;
- // }
- // });
- // this.failList.push({
- // tjNumber: this.report[i],
- // printStatus: 1,
- // printBy: this.userId,
- // createBy: this.userIds,
- // });
- // this.joggle(this.failList);
- // this.getList();
- // // this.dialogVisible = true;
- // // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- // const newBlob = [];
- // newBlob.push(response);
- // const blob = new Blob(newBlob, { type: "application/pdf" });
-
- // var date = new Date().getTime();
- // var ifr = document.createElement("iframe");
- // ifr.style.frameborder = "no";
- // ifr.style.display = "none";
- // ifr.style.pageBreakBefore = "always";
- // ifr.setAttribute("id", "printPdf" + date);
- // ifr.setAttribute("name", "printPdf" + date);
- // ifr.src = window.URL.createObjectURL(blob);
- // document.body.appendChild(ifr);
- // this.doPrint("printPdf" + date);
- // window.URL.revokeObjectURL(ifr.src); // 閲婃斁URL 瀵硅薄
- // }
- // });
- // }
- // }
- // }
- // },
doPrint(val) {
var ordonnance = document.getElementById(val).contentWindow;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4b2252f..1e8735e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -372,15 +372,7 @@
v-hasPermi="['system:user:edit']"
>鍒嗛厤瑙掕壊</el-dropdown-item
>
- <!-- 娣诲姞鐢ㄦ埛璇︽儏鎸夐挳 鐐瑰嚮璺冲嚭璇ョ敤鎴风殑璇︾粏淇℃伅椤甸潰 -->
- <!-- <el-button
- size="mini"
- type="text"
- icon="el-icon-share"
- @click="handleSearch(scope.row)"
- v-hasPermi="['hosp:Userinfo:list']"
- >璇︾粏淇℃伅</el-button
- > -->
+
</el-dropdown-menu>
</el-dropdown>
</template>
--
Gitblit v1.8.0