From 854002335cbce613e0b62fbc9a034ba82976a155 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 17:52:55 +0800
Subject: [PATCH] qxtj
---
src/views/hosp/hzlog/index.vue | 65 ++++++++++++++++-----
src/views/hosp/rules/index.vue | 5 +
src/views/hosp/harmType/index.vue | 36 ++++++++++++
src/views/hosp/ruleAdvice/index.vue | 16 +++++
src/views/hosp/project/index.vue | 28 ++++++---
5 files changed, 124 insertions(+), 26 deletions(-)
diff --git a/src/views/hosp/harmType/index.vue b/src/views/hosp/harmType/index.vue
index 2e48918..5b82429 100644
--- a/src/views/hosp/harmType/index.vue
+++ b/src/views/hosp/harmType/index.vue
@@ -117,6 +117,17 @@
export default {
name: "HarmType",
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ console.log(value)
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback('');
+ } else if (value != undefined && value != "") {
+ return callback();
+ } else if (!patter.test(value)) {
+ return callback('');
+ }
+ };
return {
// 閬僵灞�
loading: true,
@@ -153,6 +164,31 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ sort: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+ harmCode: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+
+ harmPinYin: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+
+ harmType: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+
+ harmInfo: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+
+ protection: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" }
+ ],
+
+
+
}
};
},
diff --git a/src/views/hosp/hzlog/index.vue b/src/views/hosp/hzlog/index.vue
index 9a2937e..898a2c3 100644
--- a/src/views/hosp/hzlog/index.vue
+++ b/src/views/hosp/hzlog/index.vue
@@ -13,7 +13,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['hosp:hzlog:add']">鏂板
@@ -35,27 +35,34 @@
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ </el-row> -->
- <el-table v-loading="loading" :data="hzlogList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="hzlogList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浼氳瘖id" align="center" prop="id" />
- <el-table-column label="浼氳瘖璁㈠崟id" align="center" prop="orderId" />
- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" />
+ <!-- <el-table-column label="浼氳瘖id" align="center" prop="id" /> -->
+ <!-- <el-table-column label="浼氳瘖璁㈠崟" align="center" prop="orderId" /> -->
+ <!-- <el-table-column label="鐢ㄦ埛" align="center" prop="userId" /> -->
<el-table-column label="浣撴鍙�" align="center" prop="tjNumber" />
<el-table-column label="鐢ㄦ埛鍚�" align="center" prop="userName" />
- <el-table-column label="浼氳瘖绫诲瀷0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖" align="center" prop="hzType" />
- <el-table-column label="浼氳瘖绉戝[]" align="center" prop="hzDeptId" />
- <el-table-column label="浼氳瘖鐢宠浜篿d" align="center" prop="hzDoctorId" />
- <el-table-column label="浼氳瘖鐢宠浜哄悕" align="center" prop="hzDoctorName" />
+ <el-table-column label="浼氳瘖绫诲瀷" align="center" prop="hzType">
+ <template slot-scope="scope">
+ <span v-if="scope.row.hzType == '0'">鍏ㄩ櫌浼氳瘖</span>
+ <span v-if="scope.row.hzType == '1'">绉戝浼氳瘖</span>
+
+ </template>
+ </el-table-column>
+ <!-- 0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖 -->
+ <el-table-column label="浼氳瘖绉戝" align="center" prop="hzDeptName" />
+ <!-- <el-table-column label="浼氳瘖鐢宠浜�" align="center" prop="hzDoctorId" /> -->
+ <el-table-column label="浼氳瘖鐢宠浜�" align="center" prop="hzDoctorName" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:hzlog:edit']">淇敼
+ <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:hzlog:edit']">鏌ョ湅鍥炲
</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['hosp:hzlog:remove']">鍒犻櫎
- </el-button>
+ </el-button> -->
</template>
</el-table-column>
</el-table>
@@ -63,9 +70,23 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
+ <el-drawer title="浼氳瘖鍥炲璁板綍" :visible.sync="drawer" :before-close="handleClose" >
+ <div class="block">
+ <el-timeline >
+ <el-timeline-item v-for="(item,index) in hzReplyLogsList" :key="index" :timestamp=item.createTime placement="top">
+ <el-card>
+ <h2>绉戝锛歿{ item.replyDeptName}}</h2>
+ <h3>鍥炲鍐呭锛歿{ item.replyContent}}</h3>
+ <p>{{ item.replyDoctorName}} 鎻愪氦浜� {{item.createTime}}</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </div>
+ </el-drawer>
+
<!-- 娣诲姞鎴栦慨鏀逛細璇婄敵璇疯褰�
瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="浼氳瘖璁㈠崟id" prop="orderId">
<el-input v-model="form.orderId" placeholder="璇疯緭鍏ヤ細璇婅鍗昳d" />
@@ -93,7 +114,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </el-dialog> -->
</div>
</template>
@@ -125,6 +146,8 @@
// 浼氳瘖鐢宠璁板綍
// 琛ㄦ牸鏁版嵁
hzlogList: [],
+ hzReplyLogsList:[],
+ drawer: false,
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -163,6 +186,10 @@
this.open = false;
this.reset();
},
+ handleClose() {
+ this.drawer = false;
+ this.reset();
+ },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -199,6 +226,12 @@
this.single = selection.length !== 1
this.multiple = !selection.length
},
+ handleUpdate(row) {
+ this.reset();
+ this.drawer = true;
+ this.hzReplyLogsList = row.hzReplyLogsList
+
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
// handleAdd() {
// this.reset();
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 9e59571..53b27e3 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -685,16 +685,26 @@
let data = {
deptId: this.queryParams.deptId,
};
+ this.loading = true
ProjectTree(data).then((response) => {
- this.projectList = this.handleTree(response.data.list, "proId");
- this.ListId.push(this.projectList[0].proId)
- this.key = response.data.key
- // if (this.key == "Y") {
- // this.key = response.data.key
- // } else if (response.data.key == "N") {
- // this.key = response.data.key
- // }
- this.loading = false;
+ if (response.code == 200) {
+ if (response.data.list.length >= 1) {
+ this.projectList = this.handleTree(response.data.list, "proId");
+ this.ListId.push(this.projectList[0].proId)
+ this.key = response.data.key
+ } else {
+ this.projectList = []
+ }
+
+
+ // if (this.key == "Y") {
+ // this.key = response.data.key
+ // } else if (response.data.key == "N") {
+ // this.key = response.data.key
+ // }
+ this.loading = false;
+ }
+
});
},
selectSingleRow({ row, rowIndex }) {
diff --git a/src/views/hosp/ruleAdvice/index.vue b/src/views/hosp/ruleAdvice/index.vue
index 85018f8..df98819 100644
--- a/src/views/hosp/ruleAdvice/index.vue
+++ b/src/views/hosp/ruleAdvice/index.vue
@@ -183,7 +183,21 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- deleted: [
+ bzmc: [
+ {
+ required: true,
+ validator: checkPhoneNum,
+ trigger: "blur",
+ },
+ ],
+ zjf: [
+ {
+ required: true,
+ validator: checkPhoneNum,
+ trigger: "blur",
+ },
+ ],
+ jy: [
{
required: true,
validator: checkPhoneNum,
diff --git a/src/views/hosp/rules/index.vue b/src/views/hosp/rules/index.vue
index c24178c..0ae9504 100644
--- a/src/views/hosp/rules/index.vue
+++ b/src/views/hosp/rules/index.vue
@@ -249,6 +249,7 @@
loading: true,
// 閫変腑鏁扮粍
ids: [],
+ formIn:{},
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -350,6 +351,8 @@
},
// 鑺傜偣鍗曞嚮浜嬩欢
handleNodeClick(data) {
+ this.formIn = data
+ console.log(this.formIn)
this.queryParams.proId = data.id;
this.getListByXmId()
},
@@ -416,6 +419,8 @@
this.reset();
this.open = true;
this.title = "娣诲姞瑙勫垯+鐥呯";
+ this.form.proId = this.formIn.id;
+ this.form.proName = this.formIn.label
getSonsList().then((response) => {
this.proList = response.data;
});
--
Gitblit v1.8.0