From 5b4e348267b5541d54fffcc75c7b307ad514a692 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期六, 15 二月 2025 18:24:58 +0800
Subject: [PATCH] 20250215
---
src/views/doctor/check/index.vue | 8
src/views/index.vue | 180 ++--
src/api/doctor/check.js | 7
src/utils/request123.js | 168 ++++
src/router/index.js | 22
src/utils/request.js | 20
src/views/system/tijian/index.vue | 6
.env.development | 1
/dev/null | 0
src/views/doctor/checkAll/index.vue | 1516 +++++++++++++----------------------------
src/views/login.vue | 43 +
src/views/system/comp/index.vue | 6
.env.production | 2
src/api/system/tijian.js | 7
src/views/system/package/index.vue | 169 ----
15 files changed, 857 insertions(+), 1,298 deletions(-)
diff --git a/.env.development b/.env.development
index fe84f8c..d43cde5 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,7 @@
# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
+VUE_APP_ENV ='development'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index bdf73b2..f43b731 100644
--- a/.env.production
+++ b/.env.production
@@ -4,5 +4,7 @@
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
+VUE_APP_ENV ='production'
+
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
diff --git a/34567.rar b/34567.rar
deleted file mode 100644
index 32c7c3f..0000000
--- a/34567.rar
+++ /dev/null
Binary files differ
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/api/system/tijian.js b/src/api/system/tijian.js
index 41ab0e9..1a38906 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -1,6 +1,11 @@
import request from "@/utils/request";
// import request1 from "@/utils/request1";
+// 涓轰綋妫�椤甸潰鐨勬墍鏈夋帴鍙ｆ坊鍔� useConfirmBox 鏍囪
+const headers = {
+ useConfirmBox: true
+}
+
// 鏌ヨ浣撴濂楅鍒楄〃
export function deptTreeSelect(cusSex) {
return request({
@@ -86,6 +91,7 @@
params: {
cusIdcard: cusIdcard,
},
+ headers
});
}
@@ -150,6 +156,7 @@
params: {
cusId: cusId,
},
+ headers
});
}
// 鐧昏鎴愬姛鍚庣敓鎴愬璇婂崟
diff --git a/src/router/index.js b/src/router/index.js
index 1f5425c..aaaa00e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import Router from 'vue-router'
-
+import Cookies from "js-cookie";
Vue.use(Router)
/* Layout */
@@ -405,8 +405,26 @@
return routerPush.call(this, location).catch(err => err)
}
-export default new Router({
+const router = new Router({
mode: 'history', // 鍘绘帀url涓殑#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
+
+router.beforeEach((to, from, next) => {
+ if (from.path === '/login') {
+ // 鑾峰彇褰撳墠鐜
+ const env = process.env.VUE_APP_ENV
+ // 鐢熶骇鐜澶勭悊
+ if (env === 'production') {
+ // 闃叉鐢ㄦ埛閫氳繃鍦板潃鏍忕洿鎺ヨ緭鍏RL璁块棶
+ if (from.name === null && to.path !== window.location.pathname) {
+ next(false)
+ return
+ }
+ }
+ }
+ next()
+})
+
+export default router
diff --git a/src/utils/request.js b/src/utils/request.js
index 7e52c0c..3a223a7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -62,6 +62,12 @@
Promise.reject(error)
})
+// 闇�瑕佺‘璁ゆ鐨勬帴鍙ｈ矾寰�
+const confirmDialogUrls = [
+ '/hosp/order/addtTransition',
+ '/hosp/customer/cusIdcard'
+];
+
// 鍝嶅簲鎷︽埅鍣�
service.interceptors.response.use(res => {
const code = res.data.code || 200;
@@ -87,17 +93,13 @@
}
return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
} else if (code === 500) {
- if (res.config.url === '/hosp/order/addtTransition') {
+ if (confirmDialogUrls.includes(res.config.url)) {
// 浣跨敤MessageBox鍜孧essage鏉ユ浛浠his.$confirm鍜宼his.$message
- MessageBox.confirm(res.data.msg, '鎻愮ず', {
+ MessageBox.confirm(res.data.msg, {
confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- center: true
- }).then(() => {
-
- }).catch(() => {
-
+ type: 'error',
+ showCancelButton: false,
+ closeOnClickModal: false
});
return Promise.reject('鐗瑰畾鎺ュ彛鍙戠敓500閿欒');
}
diff --git a/src/utils/request123.js b/src/utils/request123.js
new file mode 100644
index 0000000..e121c9f
--- /dev/null
+++ b/src/utils/request123.js
@@ -0,0 +1,168 @@
+import axios from 'axios'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+import { tansParams, blobValidate } from "@/utils/ruoyi";
+import cache from '@/plugins/cache'
+import { saveAs } from 'file-saver'
+import Cookies from "js-cookie"
+
+
+let downloadLoadingInstance;
+// 鏄惁鏄剧ず閲嶆柊鐧诲綍
+export let isRelogin = { show: false };
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+
+// 鍒涘缓axios瀹炰緥
+const service = axios.create({
+ // axios涓姹傞厤缃湁baseURL閫夐」锛岃〃绀鸿姹俇RL鍏叡閮ㄥ垎
+ baseURL: process.env.VUE_APP_BASE_API,
+ // 瓒呮椂
+ // timeout: 20000
+})
+
+// request鎷︽埅鍣�
+service.interceptors.request.use(config => {
+ const isToken = (config.headers || {}).isToken === false
+ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+ if (getToken() && !isToken) {
+ config.headers['Authorization'] = 'Bearer ' + getToken()
+ config.headers['hospId'] = Cookies.get("hospId");
+ }
+ if (config.method === 'get' && config.params) {
+ let url = config.url + '?' + tansParams(config.params);
+ url = url.slice(0, -1);
+ config.params = {};
+ config.url = url;
+ }
+ if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+ const requestObj = {
+ url: config.url,
+ data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+ time: new Date().getTime()
+ }
+ const sessionObj = cache.session.getJSON('sessionObj')
+ if (!sessionObj || sessionObj === '') {
+ cache.session.setJSON('sessionObj', requestObj)
+ } else {
+ const s_url = sessionObj.url;
+ const s_data = sessionObj.data;
+ const s_time = sessionObj.time;
+ const interval = 1000;
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ return Promise.reject()
+ } else {
+ cache.session.setJSON('sessionObj', requestObj)
+ }
+ }
+ }
+ return config
+}, error => {
+ Promise.reject(error)
+})
+
+// 瀹氫箟闇�瑕佷娇鐢ㄧ‘璁ゆ鐨勬帴鍙ｈ矾寰勫垪琛�
+const confirmBoxUrls = [
+ // customer鐩稿叧鎺ュ彛
+ 'hosp/customer/cusIdcard',
+];
+
+// 鍝嶅簲鎷︽埅鍣�
+service.interceptors.response.use(
+ response => {
+ const res = response.data;
+
+ if (response.config.responseType === 'blob') {
+ return response;
+ }
+ if (res.code !== 200) {
+ // 妫�鏌ュ綋鍓嶈姹傜殑URL鏄惁鍦ㄩ渶瑕佺‘璁ゆ鐨勫垪琛ㄤ腑
+ const needConfirmBox = confirmBoxUrls.some(url => response.config.url.includes(url));
+ console.log(needConfirmBox);
+ if (needConfirmBox) {
+ MessageBox.confirm(res.msg || '绯荤粺閿欒', '閿欒', {
+ confirmButtonText: '纭畾',
+ type: 'error',
+ showCancelButton: false,
+ closeOnClickModal: false
+ }).then(() => {
+ if (res.code === 401) {
+ store.dispatch('LogOut').then(() => {
+ location.href = '/index';
+ });
+ }
+ });
+ } else {
+ if (res.code === 401) {
+ store.dispatch('LogOut').then(() => {
+ location.href = '/index';
+ });
+ }
+ }
+
+ return Promise.reject(res);
+ } else {
+ return res;
+ }
+ },
+ error => {
+ let { message } = error;
+ if (message == "Network Error") {
+ message = "鍚庣鎺ュ彛杩炴帴寮傚父";
+ } else if (message.includes("timeout")) {
+ message = "绯荤粺鎺ュ彛璇锋眰瓒呮椂";
+ } else if (message.includes("Request failed with status code")) {
+ message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
+ }
+
+ // 妫�鏌ュ綋鍓嶈姹傜殑URL鏄惁鍦ㄩ渶瑕佺‘璁ゆ鐨勫垪琛ㄤ腑
+ const needConfirmBox = confirmBoxUrls.some(url => error.config.url.includes(url));
+
+ if (needConfirmBox) {
+ MessageBox.confirm(message || '绯荤粺閿欒', '閿欒', {
+ confirmButtonText: '纭畾',
+ type: 'error',
+ showCancelButton: false,
+ closeOnClickModal: false
+ });
+ } else {
+ Message({
+ message: message,
+ type: 'error',
+ duration: 5 * 1000
+ });
+ }
+
+ return Promise.reject(error);
+ }
+);
+
+// 閫氱敤涓嬭浇鏂规硶
+export function download(url, params, filename, config) {
+ downloadLoadingInstance = Loading.service({ text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+ return service.post(url, params, {
+ transformRequest: [(params) => { return tansParams(params) }],
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ responseType: 'blob',
+ ...config
+ }).then(async (data) => {
+ const isLogin = await blobValidate(data);
+ if (isLogin) {
+ const blob = new Blob([data])
+ saveAs(blob, filename)
+ } else {
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+ Message.error(errMsg);
+ }
+ downloadLoadingInstance.close();
+ }).catch((r) => {
+ console.error(r)
+ Message.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒')
+ downloadLoadingInstance.close();
+ })
+}
+
+export default service
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 719b8d3..41655ef 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -592,7 +592,7 @@
autosize
v-model="scope.row.conclusion"
autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
+ placeholder="杈撳叆缁撹"
disabled
></el-input>
</template>
@@ -634,7 +634,7 @@
type="textarea"
autosize
v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ placeholder="杈撳叆寤鸿"
:disabled="true"
></el-input>
</div>
@@ -814,7 +814,7 @@
size="mini"
v-model="scope.row.proResult"
autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
+ placeholder="杈撳叆缁撹"
@focus="handleFocus(scope.row)"
@blur="handleInputConfirm(scope.row)"
@input="vale"
@@ -891,7 +891,7 @@
type="textarea"
autosize
v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ placeholder="杈撳叆寤鸿"
:disabled="true"
></el-input>
</div>
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index f22e922..a019722 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,39 @@
});
},
methods: {
+ shanchu(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 +1144,10 @@
setTimeout(() => {
loading.close();
}, 3000);
- this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+ this.$message({
+ message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+ type: "error"
+ });
} else {
this.dialogVisible = true;
@@ -2345,7 +1749,7 @@
state: 1,
id: this.MsgId,
};
- getfiedState(data).then((res) => {});
+ getfiedState(data).then((res) => { });
this.submitForm();
});
} else {
@@ -2377,7 +1781,7 @@
// });
// }
// },
- change(vale) {},
+ change(vale) { },
// determine() {
// let tjNumber = this.tableAll.tjNumber;
@@ -2605,25 +2009,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 +2045,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 +2169,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 +2186,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 +2256,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 +2266,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/index.vue b/src/views/index.vue
index 8ccd4ef..8d43c82 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -92,103 +92,121 @@
getList() {
this.loading = true;
- // 鏌ヨ浠婃棩鐧昏
+
+ // 淇敼API璋冪敤鐨勯敊璇鐞�
getCustomer().then((response) => {
- this.Customer = response
- this.loading = false;
+ this.Customer = response || 0; // 娣诲姞榛樿鍊�
+ }).catch(error => {
+ console.error('鑾峰彇浠婃棩鐧昏鏁版嵁澶辫触:', error);
+ this.Customer = 0;
});
- // 鏌ヨ浠婃棩宸叉
+
getOrder().then((response) => {
- this.Order = response
- this.loading = false;
+ this.Order = response || 0;
+ }).catch(error => {
+ console.error('鑾峰彇浠婃棩宸叉鏁版嵁澶辫触:', error);
+ this.Order = 0;
});
- // 鏌ヨ浠婃棩鎶ュ憡
+
getReportToday().then((response) => {
- this.ReportToday = response
- this.loading = false;
+ this.ReportToday = response || 0;
+ }).catch(error => {
+ console.error('鑾峰彇浠婃棩鎶ュ憡鏁版嵁澶辫触:', error);
+ this.ReportToday = 0;
});
- // 鏌ヨ浠婃棩寰呮
+
getTobeToday().then((response) => {
- this.TobeToday = response
- this.loading = false;
+ this.TobeToday = response || 0;
+ }).catch(error => {
+ console.error('鑾峰彇浠婃棩寰呮鏁版嵁澶辫触:', error);
+ this.TobeToday = 0;
});
- // 鎶樼嚎鍥�
+
+ // 淇敼鎶樼嚎鍥炬暟鎹鐞�
getChart().then((response) => {
- response.data.forEach(item => {
- this.LineChart.push(item.date)
- this.reportNum.push(item.tdcoun);
- this.personYYNum.push(item.grcoun);
- this.teamYYNum.push(item.bgcoun);
+ if (response && response.data) {
+ this.LineChart = [];
+ this.reportNum = [];
+ this.personYYNum = [];
+ this.teamYYNum = [];
+
+ response.data.forEach(item => {
+ this.LineChart.push(item.date);
+ this.reportNum.push(item.tdcoun || 0);
+ this.personYYNum.push(item.grcoun || 0);
+ this.teamYYNum.push(item.bgcoun || 0);
+ });
+ let myChart = this.$echarts.init(document.getElementById('main'));
- });
- let myChart = this.$echarts.init(document.getElementById('main'));
-
- myChart.setOption({
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['姣忔棩浣撴鐧昏鏁�', '姣忔棩鍥綋鐧昏鏁�', '姣忔棩鍙戝竷鎶ュ憡鏁�']
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- axisLine: {
- show: true,
- lineStyle: {
- color: "blue",
- size: 12,
- width: 0,
- tyle: "solid"
+ myChart.setOption({
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['姣忔棩浣撴鐧昏鏁�', '姣忔棩鍥綋鐧昏鏁�', '姣忔棩鍙戝竷鎶ュ憡鏁�']
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
}
},
- data: this.LineChart
- },
- yAxis: {
- type: 'value',
- min: 0,
- max: 100,
- interval: 5
- },
- series: [
- {
- name: '姣忔棩浣撴鐧昏鏁�',
- type: 'line',
- stack: 'Total',
- data: this.personYYNum
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "blue",
+ size: 12,
+ width: 0,
+ tyle: "solid"
+ }
+ },
+ data: this.LineChart
},
- {
- name: '姣忔棩鍥綋鐧昏鏁�',
- type: 'line',
- stack: 'Total',
- data: this.reportNum
+ yAxis: {
+ type: 'value',
+ min: 0,
+ max: 100,
+ interval: 5
},
- {
- name: '姣忔棩鍙戝竷鎶ュ憡鏁�',
- type: 'line',
- stack: 'Total',
- data: this.teamYYNum
- },
- ]
+ series: [
+ {
+ name: '姣忔棩浣撴鐧昏鏁�',
+ type: 'line',
+ stack: 'Total',
+ data: this.personYYNum
+ },
+ {
+ name: '姣忔棩鍥綋鐧昏鏁�',
+ type: 'line',
+ stack: 'Total',
+ data: this.reportNum
+ },
+ {
+ name: '姣忔棩鍙戝竷鎶ュ憡鏁�',
+ type: 'line',
+ stack: 'Total',
+ data: this.teamYYNum
+ },
+ ]
- })
- let sizeFun = ()=> {
- myChart.resize()
+ })
+ let sizeFun = ()=> {
+ myChart.resize()
+ }
+ window.addEventListener("resize", sizeFun)
+
+ this.loading = false;
}
- window.addEventListener("resize", sizeFun)
-
- this.loading = false;
+ }).catch(error => {
+ console.error('鑾峰彇鍥捐〃鏁版嵁澶辫触:', error);
});
// 楗肩姸鍥�
diff --git a/src/views/login.vue b/src/views/login.vue
index 559e1a0..a87bc0f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="login">
<!-- <div style="padding-top: 130px;"> -->
- <div style="font-weight: 700;font-size: 50px;">鏅鸿兘鍋ュ悍浣撴绠＄悊绯荤粺</div>
+ <div style="font-weight: 700;font-size: 50px;">鏅鸿兘鍋ュ悍浣撴绠＄悊绯荤粺</div>
<!-- </div> -->
@@ -78,7 +78,7 @@
username: "",
password: "",
mobile: false,
- hospId:"",
+ hospId: "",
// username:"13800138008",
// password:"888888",
rememberMe: false,
@@ -151,9 +151,42 @@
})
},
- loadAll(){
- this.loginForm.hospId = this.$route.query.hospId
- Cookies.set("hospId", this.loginForm.hospId);
+ loadAll() {
+ const env = process.env.VUE_APP_ENV
+ if (env === 'development') {
+ this.loginForm.hospId = this.$route.query.hospId
+ Cookies.set("hospId", this.loginForm.hospId);
+ } else if (env === 'production') {
+ // 鑾峰彇褰撳墠URL鐨勭鍙ｅ彿
+ const port = window.location.port;
+
+ switch (port) {
+ case '9011':
+ this.loginForm.hospId = "chkwyy";
+ break;
+
+ case '9012':
+
+ this.loginForm.hospId = "xamjyy";
+ break;
+
+ case '8094':
+
+ this.loginForm.hospId = "pbkwyy";
+ break;
+ }
+ Cookies.set("hospId", this.loginForm.hospId);
+ }
+
+
+ // 瀛樺偍hospId鍒癈ookie
+
+
+ // 鏇存柊URL鍙傛暟
+ if (this.loginForm.hospId) {
+ const query = { ...this.$route.query, hospId: this.loginForm.hospId };
+ this.$router.replace({ query });
+ }
},
hide() {
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 8625a5e..2e9b8d3 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -289,6 +289,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
@@ -368,6 +370,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%" class="btntoleft">
@@ -455,6 +459,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 839dfd1..2af9a0f 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -698,7 +698,10 @@
</template>
</el-table-column>-->
</el-table>
- <!-- <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3> -->
+ <!-- 娣诲姞椤圭洰鎬绘暟鏄剧ず -->
+ <div style="margin-top: 10px; text-align: right;font-size: 14px">
+ 鍏辫 <span style="font-weight: bold;">{{ DataList.length }}</span> 鏉￠」鐩�
+ </div>
</div>
</el-col>
</el-row>
@@ -1302,68 +1305,6 @@
});
this.loading = false;
},
- // getDataList() {
- // this.loading = true;
-
- // getProParentIdDxList(this.queryParams).then((response) => {
- // this.Treedata = response.data.list;
- // /* if (this.form.tjProjectList) {
- // this.form.tjProjectList.forEach((item) => {
- // this.Treedata.forEach((item1) => {
- // if (item.proId == item1.proId) {
- // this.checkedkey.push(item1.proId);
-
- // this.DataList.push(item1);
-
- // this.DataList.forEach((item1) => {
- // item1.limits = 10;
- // if (item1.limits > 10) {
- // item1.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
- // } else if (item1.limits < 0) {
- // item1.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
- // }
- // this.updateProPrice(item1); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
- // });
-
- // }
- // });
- // });
- // } */ /* else {
- // this.checkedkey.push(this.Treedata[0].proId);
- // let proId = this.Treedata[0].proId;
- // this.TreedataList = this.Treedata.filter(
- // (item) => item.proId == proId
- // ); */
-
- // // 灏嗙涓�涓」鐩坊鍔犲埌 DataList
- // // this.TreedataList.forEach((item) => {
- // // this.checkedListkey.push(item.proId);
- // // this.DataList.push(item);
- // // });
- // /* getProSonDxList(proId).then((res) => {
- // this.TreedataList = res.data.list;
- // this.TreedataList.forEach((item) => {
- // item.disabled = true;
- // this.checkedListkey.push(item.proId);
- // this.DataList.push(item);
- // this.DataList.forEach((item) => {
- // item.propinName = this.Treedata[0].proName;
- // item.propinPrice = this.Treedata[0].proPrice;
- // });
- // this.pics = 0;
- // this.DataList.forEach((item) => {
- // this.pics += item.proPrice;
- // });
- // });
- // }); */
- // // }
- // this.pics = this.DataList.reduce(
- // (total, item) => total + item.priceOrd,
- // 0
- // );
- // this.loading = false;
- // });
- // },
handleFilterInput() {
this.queryParams1.page = 1; // 鎼滅储鏃堕噸缃负绗竴椤�
this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁
@@ -1531,71 +1472,6 @@
this.getList();
});
},
- /* submitForm() {
- if (this.form.pacName) {
- this.form.tjProjectList = [];
- if (this.DataList.length != 0) {
- this.treeList = JSON.parse(JSON.stringify(this.DataList));
- for (var i = 0; i < this.treeList.length; i++) {
- for (var j = i + 1; j < this.treeList.length; j++) {
- if (
- this.treeList[i].proParentId == this.treeList[j].proParentId
- ) {
- this.treeList.splice(j, 1);
- j--;
- }
- }
- }
- this.treeList.forEach((item) => {
- this.form.tjProjectList.push({
- // id: 0,
- proName: item.propinName,
- // allSonProName: item.proName + ",",
- proPrice: item.propinPrice,
- priceNow: item.propinPrice,
- proId: item.proParentId,
- });
- });
- }
- this.$refs["form"].validate((valid) => {
- if (valid) {
- if (this.form.pacId != null) {
- // if (this.form.pacStatus === "鍚敤") {
- // this.form.pacStatus = 0;
- // } else {
- // this.form.pacStatus = 1;
- // }
- if (this.keys) {
- this.form.keywords = this.keys;
- } else {
- this.form.keywords = this.form.keywords.toString();
- }
-
- updatePackage(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- this.form.keywords = this.keys;
- // if (this.form.pacStatus === "鍚敤") {
- // this.form.pacStatus = 0;
- // } else {
- // this.form.pacStatus = 1;
- // }
- // return;
- addPackage(this.form).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- } else {
- Message.warning("璇峰厛濉啓濂楅鍚嶇О");
- }
- }, */
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const pacIds = row.pacId || this.ids;
@@ -1627,43 +1503,6 @@
`package_${new Date().getTime()}.xlsx`
);
},
- // 濂楅璇︽儏
- // handleSeach(row) {
- // this.Seachopen = true;
- // this.loading = true;
- // const pacId = row.pacId;
- // this.pacId = row.pacId
- // let data = {
- // pacId: pacId,
- // };
- // getAllPackage(data).then((response) => {
- // this.allpackageList = response.data.tjProjectList;
- // this.loading = false;
- // let arr = [];
- // this.allpackageList.forEach((item) => {
- // arr.push(item.proName);
- // });
- // this.newproName = arr;
- // });
-
- // getAllPackageList().then((response) => {
- // this.allList = response.data;
- // this.loading = false;
- // });
- // },
- // // 鍏ㄩ��
- // handleCheckAllChange(val) {
- // this.newproName = val ? this.allList : [];
- // this.isIndeterminate = false;
- // },
-
- // handleCheckedCitiesChange(value) {
- // let checkedCount = value.length;
- // this.checkAll = checkedCount === this.allList.length;
- // this.isIndeterminate =
- // checkedCount > 0 && checkedCount < this.allList.length;
- // },
-
submitcheckbox() {
let _this = this;
let proIds = [];
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 1441feb..ed35288 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -742,15 +742,12 @@
getPackageListName,
getaddtTransition,
tuantiqueren,
- getTransitionList,
getTransitionList1,
- getByTeamNo,
delTbBycusCardIdAndProId,
getLoadFile,
getIsRequired,
getconfigKey,
getHistryTjOrderProByCusIdCard,
- readCertCardInfos,
gaibianzhekou,
} from "@/api/system/tijian";
import { addComp } from "@/api/system/comp";
@@ -1861,9 +1858,6 @@
websocket.onmessage = (event) => {
var resultObj = eval("(" + event.data + ")");
this.readCardWebSocket(resultObj);
- };
- websocket.onclose = function () {
- alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
};
} else if (res.msg == "Y") {
/* this.$refs.aaa.open = true;
--
Gitblit v1.8.0