From c3e7f99b9070230896865a7a0f805473aeed83ea Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 11 四月 2025 15:58:06 +0800
Subject: [PATCH] 1
---
src/views/doctor/inspectCheck/index.vue | 7 ++-
src/views/hosp/advicerules/index.vue | 36 +++++++++++++++++-
src/components/public/index.vue | 58 ++++++++++++++++++----------
3 files changed, 75 insertions(+), 26 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 98c8513..139adba 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -17,7 +17,7 @@
:inline="true"
label-width="68px"
> -->
- <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
+ <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
<el-input
v-model="queryParams.bingzhong"
placeholder="璇疯緭鍏ョ畝绉�"
@@ -44,14 +44,16 @@
>鎼滅储</el-button
>
</el-form-item> -->
- <!-- <el-form-item>
+ <!-- <el-form-item>
<h3 >{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h3>
</el-form-item> -->
- <!-- <el-form-item>
+ <!-- <el-form-item>
<h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
</el-form-item> -->
<!-- </el-form> -->
- <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
+ <h2 style="text-align: center; margin-top: -30px">
+ {{ queryParams.proName || "鏆傛棤椤圭洰鍚嶇О" }}
+ </h2>
<div style="display: flex; width: 100%">
<div style="width: 50%; margin-right: 40px">
<el-table
@@ -157,6 +159,10 @@
type: Array,
default: () => [],
},
+ proSex: {
+ type: String,
+ default: "2"
+ }
},
data() {
return {
@@ -164,7 +170,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
yxbx: "",
- proName:'',
+ proName: "",
// lastDesc: "",
total: 0,
dataList: [],
@@ -177,8 +183,8 @@
queryParams: {
bingzhong: "",
bzPinyin: "",
- proId:"",
- proName:"",
+ proId: "",
+ proSex: "2",
pageNum: 1,
pageSize: 10,
},
@@ -203,15 +209,24 @@
if (newVal && newVal.length > 0) {
const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
- this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
- this.proName = firstProject.proName
+ this.proName = firstProject.proName;
}
},
},
+ proSex: {
+ handler(newVal) {
+ this.queryParams.proSex = newVal;
+ this.getList();
+ },
+ immediate: true
+ }
},
mounted() {},
- created() {},
+ created() {
+ this.queryParams.proSex = this.proSex;
+ this.getList();
+ },
methods: {
async getList() {
try {
@@ -264,13 +279,12 @@
},
handleSelectionChange(selection) {
- this.list = selection;
+ // this.list = selection;
+ this.list = [...selection];
this.updateFormContent(selection);
},
updateFormContent(selection) {
- if (!selection.length) return;
-
// 濡傛灉澶勪簬妫�鏌ョ姸鎬侊紝浣跨敤浼犲叆鐨勫��
if (this.checkStatus === "1") {
this.updateData(this.proResult, this.conclusion);
@@ -282,15 +296,17 @@
this.form.jcsj = "";
// 浣跨敤map鍜宩oin鏇夸唬forEach鍜屽瓧绗︿覆鎷兼帴
- this.form.desc = selection
- .map((item) => item.bingzhong || item.ruleStr)
- .filter(Boolean)
- .join(",");
+ if (selection.length > 0) {
+ this.form.desc = selection
+ .map((item) => item.bingzhong || item.ruleStr)
+ .filter(Boolean)
+ .join(",");
- this.form.jcsj = selection
- .map((item) => item.yxbx)
- .filter(Boolean)
- .join(",");
+ this.form.jcsj = selection
+ .map((item) => item.yxbx)
+ .filter(Boolean)
+ .join(",");
+ }
},
handleOk() {
diff --git a/src/views/doctor/inspectCheck/index.vue b/src/views/doctor/inspectCheck/index.vue
index 4733eb7..aa03824 100644
--- a/src/views/doctor/inspectCheck/index.vue
+++ b/src/views/doctor/inspectCheck/index.vue
@@ -122,8 +122,9 @@
align="center"
prop="examinationDate"
width="150px"
- :formatter="formatDate"
+
/>
+ <!-- :formatter="formatDate" -->
<el-table-column
label="闂ㄨ瘖鍙�"
@@ -435,7 +436,7 @@
}
console.log("Query Params:", this.queryParams);
},
- formatDate(row) {
+ /* formatDate(row) {
if (!row.examinationDate) return "";
// 浣跨敤 moment 瑙ｆ瀽鎸囧畾鏍煎紡鐨勬棩鏈熷瓧绗︿覆
@@ -445,7 +446,7 @@
// 鏍煎紡鍖栦负鎵�闇�鏍煎紡
return date.format("YYYY-MM-DD HH:mm");
- },
+ }, */
// isSelectable(row) {
// return !!row.mzh;
// },
diff --git a/src/views/hosp/advicerules/index.vue b/src/views/hosp/advicerules/index.vue
index a4c9279..3f305a6 100644
--- a/src/views/hosp/advicerules/index.vue
+++ b/src/views/hosp/advicerules/index.vue
@@ -145,6 +145,7 @@
width="200"
prop="jynr"
/>
+ <el-table-column label="鎬у埆" align="center" prop="xb" :formatter="formatSex" />
<el-table-column label="鑼冨洿" align="center" prop="fwz" />
<el-table-column label="鑼冨洿鏈�灏忓��" align="center" prop="fwzxz" />
<el-table-column label="鑼冨洿鏈�澶у��" align="center" prop="fwzdz" />
@@ -268,6 +269,7 @@
placeholder="璇疯緭鍏ュ紓甯告爣蹇�"
/>
</el-form-item>
+
<el-form-item label="鐤剧梾" prop="sfjb">
<el-checkbox v-model="form.sfjb" true-label="鏄�" false-label="鍚�">
</el-checkbox>
@@ -292,6 +294,21 @@
true-label="鏄�"
false-label=""
></el-checkbox>
+ </el-form-item>
+ <el-form-item label="鎬у埆" prop="xb">
+ <el-select
+ v-model="form.xb"
+ placeholder="璇烽�夋嫨浣撴浜烘�у埆"
+ style="width: 200px"
+ clearable
+ >
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="寤鸿鍚嶇О" prop="jymc" style="display: block">
<el-input
@@ -476,6 +493,7 @@
export default {
name: "Advicerules",
+ dicts: ["sys_user_sex"],
data() {
return {
// 閬僵灞�
@@ -517,6 +535,7 @@
sfcjb: null,
sfmxb: null,
sfzdjb: null,
+ sfzdjb: null,
},
queryParam1: {
page: 1,
@@ -529,7 +548,9 @@
pageSize: 10,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ xb: "2",
+ },
// 琛ㄥ崟鏍￠獙
rules: {},
upload: {
@@ -599,8 +620,11 @@
createBy: null,
updateBy: null,
deleted: null,
+ xb: "2",
};
- this.resetForm("form");
+ if (this.$refs.form) {
+ this.$refs.form.resetFields();
+ }
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -614,6 +638,13 @@
clearForm() {
this.queryParam.bt = ""; // 娓呯┖鏍囬
this.queryParam.nr = ""; // 娓呯┖寤鸿鍐呭
+ },
+
+ formatSex(row) {
+ const dictItem = this.dict.type.sys_user_sex.find(
+ (item) => item.value === row.xb
+ );
+ return dictItem ? dictItem.label : "";
},
handleSelectionChange1(selection) {
@@ -689,6 +720,7 @@
this.open = true;
this.title = "淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃";
});
+
deptTreeSelect().then((response) => {
this.departmentOptions = response.data[0].children;
});
--
Gitblit v1.8.0