From 8aca82344ce82cf90f3357b8ba5abe35a0e3a74f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 八月 2024 09:42:38 +0800
Subject: [PATCH] 测试完成
---
src/views/repositoryai/verbaltrick/index.vue | 3
src/views/repositoryai/verbaltrick/particulars/index.vue | 38 +++++
src/views/knowledge/questionbank/particulars/index.vue | 10 +
src/views/knowledge/questionnaire/compilequer/index.vue | 15 +-
src/views/patient/patient/behospitalized.vue | 21 ---
src/views/patient/patient/profile/index.vue | 204 +++++++++++++++++++++++++--------
src/views/knowledge/questionbank/index.vue | 10 -
src/views/knowledge/questionnaire/index.vue | 1
src/views/patient/propaganda/particty.vue | 4
9 files changed, 209 insertions(+), 97 deletions(-)
diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue
index 2b6348f..84182cd 100644
--- a/src/views/knowledge/questionbank/index.vue
+++ b/src/views/knowledge/questionbank/index.vue
@@ -567,7 +567,7 @@
compileUpdate(row) {
this.$router.push({
path: "/knowledge/questionbank/particulars/",
- query: { id: row.id },
+ query: { id: row.id, categoryid: this.queryParams.categoryid },
});
},
// 鐤剧梾-----------------------
@@ -779,13 +779,7 @@
this.single = selection.length != 1;
this.multiple = !selection.length;
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.$router.push({
- path: "/knowledge/verbaltrick/particulars/",
- query: { id: "" },
- });
- },
+
// 淇敼鍒嗙被寮规
popoveramend(tagcategoryid) {
this.idds = tagcategoryid;
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
index b6da7c2..8a9a4b3 100644
--- a/src/views/knowledge/questionbank/particulars/index.vue
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -188,7 +188,8 @@
<el-form-item
label="濉┖淇℃伅"
v-if="
- topicobj.scriptType == 3 && topicobj.svyLibScriptOptions.length
+ topicobj.scriptType == 3 &&
+ topicobj.svyLibScriptOptions.length
"
>
<el-card class="box-card" style="width: 200%">
@@ -297,7 +298,7 @@
</div>
</el-form-item>
</el-row>
-
+
<el-form-item label="閫変腑鎸囨爣锛�">
<span style="margin-left: 30px"
><el-tag type="success" effect="dark">{{
@@ -694,6 +695,11 @@
// 鑾峰彇鏁版嵁
getissueinfo() {
this.id = this.$route.query.id;
+ this.topicobj.categoryid = Number(this.$route.query.categoryid);
+ console.log(this.topicobj.categoryid);
+
+ this.topicobj.isavailable = "1";
+ this.topicobj.language = "鏅�氳瘽";
// 鍒嗙被
getissueclassify({}).then((res) => {
this.classifylist = res.rows;
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 736a78f..7c2d806 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -162,7 +162,10 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="鐗堟湰鍙�" prop="name">
- <el-input v-model="ruleForm.version"></el-input> </el-form-item
+ <el-input
+ v-model="ruleForm.version"
+ placeholder="榛樿1.0"
+ ></el-input> </el-form-item
></el-col>
<el-col :span="9">
<el-form-item label="鍙敤鐘舵��" prop="region">
@@ -987,6 +990,8 @@
item.icdname = item.icd10name;
});
});
+ } else {
+ this.ruleForm.isenable = "1";
}
listDept(this.queryParams).then((response) => {
@@ -999,20 +1004,20 @@
},
submitForm(formName) {
this.$modal.loading("姝ｅ湪涓婁紶鏁版嵁锛岃绋嶅��...");
-
this.ruleForm.suitway = this.ruleForm.suitway.join(",");
-
+ if (condition) {
+ }
if (this.id) {
this.ruleForm.isoperation = 2;
compileQtemplate(this.ruleForm).then((res) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.confirmillness();
this.$modal.closeLoading();
-
this.$router.go(-1);
});
} else {
this.ruleForm.isoperation = 1;
+ this.ruleForm.version = this.ruleForm.version ? ruleForm : "1.0";
compileQtemplate(this.ruleForm).then((res) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.confirmillness(res.data);
@@ -1026,10 +1031,8 @@
// 绉戝澶勭悊
Departmenttreatment() {
this.ruleForm.deptNames = JSON.stringify(this.tempDetpRelevanceslist);
- console.log(this.tempDetpRelevanceslist);
this.ruleForm.svyTemplateLibScripts =
this.ruleForm.svyTemplateLibScripts.concat(this.delScriptVOList);
- console.log(this.tempDetpRelevanceslist, "this.tempDetpRelevanceslist");
const result = this.tempDetpRelevanceslist.map(
(subArr) => subArr[subArr.length - 1]
);
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index fd050e1..be1a330 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -649,6 +649,7 @@
handleAdd() {
this.$router.push({
path: "/knowledge/questionnaire/compilequer/",
+ query: { categoryid: this.queryParams.categoryid },
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 60beeb6..e0c54a2 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -202,18 +202,7 @@
prop="telephone"
width="120"
/>
- <!-- <el-table-column
- label="鎮ｈ�呮爣绛撅紙缂猴級"
- align="center"
- key="tagList"
- prop="tagList"
- width="160"
- :show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <span v-for="item in scope.row.tagList">{{ item }} </span>
- </template>
- </el-table-column> -->
+
<el-table-column
label="鍏ラ櫌璇婃柇"
@@ -223,13 +212,7 @@
width="190"
/>
- <!-- <el-table-column
- label="涓昏堪"
- align="center"
- key="mainsuit"
- prop="mainsuit"
- width="120"
- /> -->
+
<el-table-column
label="鐥呭尯"
align="center"
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index e0936bd..3c3304d 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -346,22 +346,71 @@
<!-- 闂ㄨ瘖 -->
<div v-if="sonactiveName == 'outpatient'">
<el-table :data="serviceData" style="width: 100%">
- <el-table-column prop="daya" label="灏辫瘖鏃ユ湡" width="180">
+ <el-table-column
+ label="灏辫瘖鏃堕棿"
+ align="center"
+ key="createTime"
+ prop="createTime"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
</el-table-column>
- <el-table-column prop="administrative" label="灏辫瘖绉戝" width="180">
+
+ <el-table-column
+ label="闂ㄨ瘖鍙�"
+ align="center"
+ key="patid"
+ prop="patid"
+ />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ key="patname"
+ prop="patname"
+ />
+ <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 prop="doctor" label="鍖荤敓"> </el-table-column>
- <el-table-column prop="result" label="鐤剧梾璇婃柇"> </el-table-column>
- <el-table-column prop="administrative" label="妫�楠�">
- </el-table-column>
- <el-table-column prop="administrative" label="妫�鏌�">
- </el-table-column>
- <el-table-column prop="administrative" label="鎵嬫湳">
- </el-table-column>
- <el-table-column prop="administrative" label="鐢ㄨ嵂">
- </el-table-column>
- <el-table-column prop="columcz" label="鍖诲槺" width="200">
- </el-table-column>
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ key="age"
+ prop="age"
+ width="120"
+ />
+ <el-table-column
+ label="鑱旂郴鐢佃瘽"
+ align="center"
+ key="telephone"
+ prop="telephone"
+ width="120"
+ />
+ <el-table-column
+ label="璇婃柇"
+ align="center"
+ key="diagname"
+ prop="diagname"
+ width="190"
+ />
+
+ <el-table-column
+ label="灏辫瘖绉戝"
+ align="center"
+ key="deptname"
+ prop="deptname"
+ width="120"
+ />
+ <el-table-column
+ label="鎺ヨ瘖鍖荤敓"
+ align="center"
+ key="drname"
+ prop="drname"
+ width="120"
+ />
</el-table>
<pagination
@@ -374,30 +423,80 @@
</div>
<!-- 浣忛櫌 -->
<div v-if="sonactiveName == 'inhospital'">
- <el-table :data="serviceData" style="width: 100%">
- <el-table-column prop="godaya" label="鍏ラ櫌鏃ユ湡"> </el-table-column>
- <el-table-column prop="hospitalname" label="鍑洪櫌鏃堕棿">
+ <el-table :data="serviceDatary" style="width: 100%">
+ <el-table-column
+ label="浣忛櫌鍙�"
+ align="center"
+ key="patid"
+ prop="patid"
+ />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ key="patname"
+ prop="patname"
+ />
+ <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 prop="administrative" label="鐥呭尯">
- </el-table-column>
- <el-table-column prop="result" label="涓绘不鍖诲笀"> </el-table-column>
- <el-table-column prop="bed" label="绠″簥鎶ゅ＋"> </el-table-column>
- <el-table-column prop="doctor" label="鍑洪櫌鐤剧梾璇婃柇">
- </el-table-column>
- <el-table-column prop="today" label="妫�楠�"> </el-table-column>
- <el-table-column prop="administrative" label="妫�鏌�">
- </el-table-column>
- <el-table-column prop="administrative" label="鎵嬫湳">
- </el-table-column>
- <el-table-column prop="administrative" label="鐢ㄨ嵂">
- </el-table-column>
- <el-table-column prop="columcz" label="鍑洪櫌灏忕粨" width="200">
- </el-table-column>
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ key="age"
+ prop="age"
+ width="120"
+ />
+ <el-table-column
+ label="鑱旂郴鐢佃瘽"
+ align="center"
+ key="telephone"
+ prop="telephone"
+ width="120"
+ />
+
+ <el-table-column
+ label="鍏ラ櫌璇婃柇"
+ align="center"
+ key="diagname"
+ prop="diagname"
+ width="190"
+ />
+
+ <el-table-column
+ label="鐥呭尯"
+ align="center"
+ key="deptname"
+ prop="deptname"
+ width="120"
+ />
+ <el-table-column
+ label="搴婁綅鍙�"
+ align="center"
+ key="bedNo"
+ prop="bedNo"
+ width="120"
+ />
+ <el-table-column
+ label="涓绘不鍖荤敓"
+ align="center"
+ key="drname"
+ prop="drname"
+ width="120"
+ />
+ <el-table-column
+ label="璐ｄ换鎶ゅ＋"
+ align="center"
+ key="Sister"
+ prop="Sister"
+ width="120"
+ />
</el-table>
</div>
- <!-- 浣撴 -->
+ <!-- 鍑洪櫌 -->
<div v-if="sonactiveName == 'checkout'">
- <el-table :data="serviceData" style="width: 100%">
+ <el-table :data="serviceDatacy" style="width: 100%">
<el-table-column prop="godaya" label="浣撴绫诲瀷"> </el-table-column>
<el-table-column prop="hospitalname" label="浣撴濂楅鍚嶇О">
</el-table-column>
@@ -712,15 +811,9 @@
address: "89",
},
],
- serviceData: [
- {
- daya: "2023-12-12",
- hospitalname: "鍗忓拰",
- result: "闊у甫鎷変激",
- administrative: "楠ㄧ",
- doctor: "鍚村ぇ榫�",
- },
- ],
+ serviceData: [],
+ serviceDatary: [],
+ serviceDatacy: [],
options: [
{
value: "1",
@@ -794,18 +887,24 @@
// 鏌ヨ鍖荤枟妗ｆ鍚勫垪琛ㄤ俊鎭�
getList(type) {
this.loading = true;
- if (type == 1) {
+ if (type == 0) {
// 闂ㄨ瘖璁板綍
listPatouthosp({ patid: this.id }).then((response) => {
- console.log(response);
+ if (response.code == 200) {
+ this.serviceData = response.rows;
+ }
+ });
+ } else if (type == 1) {
+ listpatient({ patid: this.id }).then((response) => {
+ if (response.code == 200) {
+ this.serviceDatary = response.rows;
+ }
});
} else if (type == 2) {
listpatient({ patid: this.id }).then((response) => {
- console.log(response);
- });
- } else if (type == 3) {
- listpatient({ patid: this.id }).then((response) => {
- console.log(response);
+ if (response.code == 200) {
+ this.serviceDatacy = response.rows;
+ }
});
}
},
@@ -960,11 +1059,12 @@
},
// tab鍒囨崲
handleClick(tab, event) {
- this.getList(tab.index);
+ if (tab.index == "1") {
+ this.getList(0);
+ }
},
handleClickson(tab, event) {
console.log(tab.index, "son");
-
this.getList(tab.index);
},
// 鑱旂郴鏂瑰紡鏂板
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index bc7e42a..8d0b0e2 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -411,8 +411,6 @@
<el-input v-model="patientqueryParams.name"></el-input>
</el-form-item>
-
-
<el-form-item>
<el-button
type="primary"
@@ -896,7 +894,7 @@
},
// 淇濆瓨
submitForm(formName) {
- // this.form.preachform = this.checkList.join(",");
+ this.form.preachform = this.checkList.join(",");
this.formatFn(1);
if (!this.form.patTaskRelevances[0]) {
this.$modal.msgError("璇烽�夋嫨鐥呬汉");
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index 67ab960..ad73d02 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -13,7 +13,6 @@
class="input-with-select"
size="medium "
>
-
</el-input>
</div>
<div class="head-container" style="margin-top: 20px">
@@ -631,7 +630,7 @@
handleAdd() {
this.$router.push({
path: "/knowledge/verbaltrick/particulars/",
- query: { id: "" },
+ query: { id: "", categoryid: this.queryParams.categoryid },
});
},
// 鍒嗙被鏍�-----------------------------------------
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index ee9c433..fa34236 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -504,7 +504,10 @@
<el-row>
<el-col :span="24">
<el-form-item label="鍊肩被鍨�">
- <el-radio-group disabled v-model="indexform.valueType">
+ <el-radio-group
+ :disabled="indexform.targetid"
+ v-model="indexform.valueType"
+ >
<el-radio :label="1">閫夐」</el-radio>
<el-radio :label="2">鏂囨湰</el-radio>
<el-radio :label="3">鏁板��</el-radio>
@@ -512,16 +515,19 @@
</el-form-item>
<el-form-item label="棰樼洰绫诲瀷">
- <el-radio-group disabled v-model="indexform.scriptType">
+ <el-radio-group
+ @input="typeselection"
+ :disabled="indexform.targetid"
+ v-model="indexform.scriptType"
+ >
<el-radio :label="1">鍗曢��</el-radio>
- <el-radio :label="2">澶氶��</el-radio>
- <el-radio :label="3">濉┖</el-radio>
+ <!-- <el-radio :label="2">澶氶��</el-radio> -->
<el-radio :label="4">闂瓟</el-radio>
</el-radio-group>
</el-form-item>
</el-col></el-row
>
- <div v-if="indexform.valueType == 1">
+ <div v-if="indexform.scriptType == 1 || indexform.scriptType == 2">
<el-card class="box-card" style="margin-bottom: 20px">
<Regular
:TargetoptionList="indexform.ivrLibaScriptTargetoptionList"
@@ -764,6 +770,9 @@
// 鑾峰彇璇︽儏鏁版嵁
getverbaltrick() {
let id = this.$route.query.id;
+ this.indexform.language = "鏅�氳瘽";
+ this.indexform.isAvailable = "1";
+
if (id) {
getverbaltrick({ id: id }).then((res) => {
this.indexform = res.data;
@@ -892,6 +901,25 @@
this.gettargetInfo();
},
+ // 棰樼洰绫诲瀷鏇存崲
+ typeselection(row) {
+ if (
+ (row == 1 || row == 2) &&
+ !this.indexform.ivrLibaScriptTargetoptionList.length
+ ) {
+ this.indexform.ivrLibaScriptTargetoptionList.push({
+ guid: 1,
+ isoperation: 1,
+ targetvalue: "",
+ targetregex: "",
+ targetregex2: "",
+ dynamiccruxs: [],
+ nodynamiccruxs: [],
+ dynamiccruxsJson: "",
+ nodynamiccruxsJson: "",
+ });
+ }
+ },
// 涓嬩竴姝�
nextstep() {
if (this.Editprogress <= 1) {
--
Gitblit v1.9.3