From ad0ecacbc73d16c9b95b79ac3c82868cbff33e44 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 05 八月 2024 16:17:21 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/patient/outpatient.vue | 69 ++++++++--------------
src/views/knowledge/questionnaire/compilequer/index.vue | 24 +++++++
src/views/patient/patient/profile/index.vue | 23 +++++--
src/views/knowledge/questionnaire/index.vue | 12 ++--
src/views/repositoryai/templateku/index.vue | 4 +
5 files changed, 71 insertions(+), 61 deletions(-)
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 5c71303..736a78f 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -450,6 +450,19 @@
</el-select> </el-form-item
></el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item
+ label="棰樼洰鍒嗗��"
+ v-if="topicobj.scoretype == 1"
+ >
+ <el-input
+ v-model="topicobj.score"
+ placeholder="璇疯緭鍏ラ鍙�"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="鏄惁鐢遍�夐」閰嶇疆璺宠浆">
<el-radio-group v-model="topicobj.branchFlag">
<el-radio :label="1">鏄�</el-radio>
@@ -1132,6 +1145,13 @@
console.log(this.ruleForm.svyTemplateLibScripts, "搴忓墠鍊�");
this.ruleForm.svyTemplateLibScripts.forEach((item, index) => {
item.sort = Number(index) + 1;
+ console.log(this.ruleForm.svyTemplateLibScripts.length, "length");
+
+ if (item.sort == this.ruleForm.svyTemplateLibScripts.length) {
+ item.nextScriptno = "宸叉槸鏈�鍚庝竴棰�";
+ } else {
+ item.nextScriptno = item.sort + 1;
+ }
if (item.svyLibTemplateTargetoptions) {
item.svyLibTemplateTargetoptions.forEach((items) => {
items.nextQuestion = Number(item.sort) + 1;
@@ -1478,7 +1498,7 @@
margin: 20px 0;
display: flex;
.presentation-left {
- width: 50%;
+ width: 45%;
// height: 500px;
.button-textxg {
color: #024df0;
@@ -1498,7 +1518,7 @@
}
}
.presentation-right {
- width: 50%;
+ width: 55%;
max-height: 688px;
padding: 0 20px;
font-size: 18px;
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index 6d7cde1..fd050e1 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -79,8 +79,9 @@
</el-form-item>
<el-form-item label="閫傜敤闄㈠尯" prop="region">
<el-select
- v-model="queryParams.campus"
+ v-model="campus"
size="medium"
+ multiple
filterable
placeholder="璇烽�夋嫨鍒嗙被"
>
@@ -441,8 +442,7 @@
:key="index"
:label="index"
>
-
- {{ items.optioncontent }}
+ {{ items.optioncontent }}
</el-checkbox>
</el-checkbox-group>
</div>
@@ -517,7 +517,7 @@
courtyardlist: "",
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: [],
-
+ campus: [],
// 鏃ユ湡鑼冨洿
dateRange: [],
// 宀椾綅閫夐」
@@ -628,6 +628,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+ this.queryParams.campus = this.campus.join(",");
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -760,8 +761,7 @@
});
return;
}
- let calssvalue = {
- };
+ let calssvalue = {};
if (
this.classifyform.pid &&
this.classifyform.name &&
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index e17325d..f48528b 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -13,16 +13,16 @@
>
<el-form-item label="濮撳悕" prop="name">
<el-input
- v-model="queryParams.hospname"
+ v-model="queryParams.patname"
placeholder="璇疯緭鍏ュ鍚�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="idcardno">
+ <el-form-item label="鎮ｈ�呯紪鍙�" prop="patid">
<el-input
- v-model="queryParams.idcardno"
+ v-model="queryParams.patid"
placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
clearable
style="width: 250px"
@@ -31,11 +31,7 @@
</el-form-item>
<el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
- <el-select
- v-model="queryParams.Patientid"
- multiple
- placeholder="璇烽�夋嫨"
- >
+ <el-select v-model="queryParams.Patientid" placeholder="璇烽�夋嫨">
<el-option
v-for="item in Patientrange"
:key="item.id"
@@ -46,7 +42,7 @@
</el-select>
</el-form-item>
<el-row>
- <el-form-item label="鎮ｈ�呮爣绛�" prop="tagId">
+ <!-- <el-form-item label="鎮ｈ�呮爣绛�" prop="tagId">
<el-select
v-model="queryParams.tagIds"
multiple
@@ -61,11 +57,11 @@
>
</el-option>
</el-select>
- </el-form-item>
- <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
+ </el-form-item> -->
+ <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="createTime">
<el-date-picker
clearable
- v-model="queryParams.admitdate"
+ v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
@@ -176,17 +172,17 @@
prop="patname"
/>
<el-table-column
- label="闂ㄨ瘖缂栧彿"
+ label="鎮ｈ�呯紪鍙�"
align="center"
- key="outhospno"
- prop="outhospno"
+ key="patid"
+ prop="patid"
/>
<el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
<template slot-scope="scope">
<span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="骞撮緞锛堢己锛�"
align="center"
key="age"
@@ -199,8 +195,8 @@
key="telephone"
prop="telephone"
width="120"
- />
- <el-table-column
+ /> -->
+ <!-- <el-table-column
label="鎮ｈ�呮爣绛撅紙缂猴級"
align="center"
key="tagList"
@@ -211,14 +207,8 @@
<template slot-scope="scope">
<span v-for="item in scope.row.tagList">{{ item }} </span>
</template>
- </el-table-column>
- <el-table-column
- label="灏辫瘖绫诲埆锛堟湭瀹氾級"
- align="center"
- key="idcardtype"
- prop="idcardtype"
- width="120"
- />
+ </el-table-column> -->
+
<el-table-column
label="璇婃柇"
align="center"
@@ -226,7 +216,13 @@
prop="diagname"
width="190"
/>
-
+ <el-table-column
+ label="涓昏堪"
+ align="center"
+ key="mainsuit"
+ prop="mainsuit"
+ width="120"
+ />
<el-table-column
label="绉戝"
align="center"
@@ -241,13 +237,7 @@
prop="drname"
width="120"
/>
- <el-table-column
- label="鐘舵�侊紙鏈畾锛�"
- align="center"
- key="telcode"
- prop="telcode"
- width="120"
- />
+
<el-table-column
label="灏辫瘖鏃堕棿"
align="center"
@@ -259,16 +249,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column
- label="澶嶈瘖鏃堕棿"
- align="center"
- prop="updateTime"
- width="160"
- >
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.updateTime) }}</span>
- </template>
- </el-table-column>
+
<el-table-column
label="鎿嶄綔"
fixed="right"
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 0b947b4..9427432 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -433,15 +433,19 @@
</div>
<el-divider></el-divider>
<div style="margin-top: 10px">
- 闅忚鐘舵�侊細宸茬粓姝�<span style="color: #2775b6"
+ {{ item.name }}鐘舵�侊細宸茬粓姝�<span style="color: #2775b6"
>锛堢粓姝㈠師鍥狅細鎮ｈ�呯棅鎰堝洖璁跨粨鏉燂紝缁堟鏃堕棿锛�2023-12-18 12:00锛�</span
>
</div>
<div style="margin-top: 10px">
- 闅忚鍙戦�佹椂闂达細<span style="color: #2775b6">2023-11-23 12:00</span>
+ {{ item.name }}鍙戦�佹椂闂达細<span style="color: #2775b6"
+ >2023-11-23 12:00</span
+ >
</div>
<div style="margin-top: 10px">
- 闅忚瀹屾垚鏃堕棿锛�<span style="color: #2775b6">2023-12-18 12:00</span>
+ {{ item.name }}瀹屾垚鏃堕棿锛�<span style="color: #2775b6"
+ >2023-12-18 12:00</span
+ >
</div>
<div style="margin-top: 10px">
鐤肩棝绋嬪害锛�<span style="color: #2775b6">涓害</span>
@@ -454,16 +458,17 @@
border-left: 4px solid rgb(65, 161, 190);
"
>
- 浜哄伐闅忚璁板綍
+ 浜哄伐{{ item.name }}璁板綍
</div>
<div style="margin-top: 10px">
<el-row :gutter="20">
<el-col :span="6"
- >闅忚鏃ユ湡锛�
+ >{{ item.name }}鏃ユ湡锛�
<span style="color: #2775b6">2023-11-22 11:22</span></el-col
>
<el-col :span="6"
- >闅忚浜猴細 <span style="color: #2775b6">鍚村皬榫�</span></el-col
+ >{{ item.name }}浜猴細
+ <span style="color: #2775b6">鍚村皬榫�</span></el-col
>
<el-col :span="6"
>鎮ｈ�呴厤鍚堝害锛� <span style="color: #2775b6">楂�</span></el-col
@@ -471,10 +476,12 @@
</el-row>
</div>
<div style="margin-top: 10px">
- 闅忚缁撴灉锛� <span style="color: #2775b6">鎮ｈ�呯棅鎰堬紝韬綋鍊嶆</span>
+ {{ item.name }}缁撴灉锛�
+ <span style="color: #2775b6">鎮ｈ�呯棅鎰堬紝韬綋鍊嶆</span>
</div>
<div style="margin-top: 10px">
- 闅忚澶囨敞锛� <span style="color: #2775b6">鎻愰啋娉ㄦ剰楗鍋ュ悍</span>
+ {{ item.name }}澶囨敞锛�
+ <span style="color: #2775b6">鎻愰啋娉ㄦ剰楗鍋ュ悍</span>
</div>
</el-card>
</div>
diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue
index 75e0cd4..17d49f3 100644
--- a/src/views/repositoryai/templateku/index.vue
+++ b/src/views/repositoryai/templateku/index.vue
@@ -79,7 +79,7 @@
</el-form-item>
<el-form-item label="閫傜敤闄㈠尯" prop="region">
<el-select
- v-model="queryParams.campus"
+ v-model="campus"
size="medium"
multiple
filterable
@@ -557,6 +557,7 @@
pageNum: 1,
pageSize: 10,
},
+ campus: [],
// 琛ㄥ崟鏍￠獙
rules: {},
indexid: null,
@@ -603,6 +604,7 @@
methods: {
/** 鏌ヨ淇℃伅 */
getList() {
+ this.queryParams.campus = this.campus.join(",");
getFollowuplist(this.queryParams).then((res) => {
console.log(res);
console.log(this.userList);
--
Gitblit v1.9.3