From fe7f65e63714807890ab103fbc84cf5f634ae8d8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 09 八月 2024 11:33:25 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 131 ++++----
src/views/patient/patient/PatientChart.vue | 23 -
src/components/Regular/index.vue | 2
src/views/knowledge/questionbank/particulars/index.vue | 104 +++++-
src/utils/ruoyi.js | 132 +++++----
src/views/patient/patient/index.vue | 39 +-
src/store/modules/permission.js | 2
src/api/patient/homepage.js | 38 ++
src/views/patient/subsequent/index.vue | 86 +++--
src/views/repositoryai/intention/index.vue | 51 ++
src/views/followvisit/discharge/index.vue | 64 ++-
src/views/patient/follow/index.vue | 122 +++-----
12 files changed, 464 insertions(+), 330 deletions(-)
diff --git a/src/api/patient/homepage.js b/src/api/patient/homepage.js
index 82592c9..a28b945 100644
--- a/src/api/patient/homepage.js
+++ b/src/api/patient/homepage.js
@@ -136,3 +136,41 @@
method: 'get',
})
};
+// 鎮ｈ�呰繃婊ゅ垪琛�
+export function listfiltration(data) {
+ return request({
+ url: '/smartor/filterlist/list',
+ method: 'get',
+ params:data
+ })
+};
+// 鍒犻櫎鎮ｈ�呰繃婊�
+export function delfiltration(userId) {
+ return request({
+ url: '/smartor/filterlist/remove/'+userId,
+ method: 'get',
+ })
+};
+// 淇敼杩囨护鎮ｈ��
+export function editfiltration(data) {
+ return request({
+ url: '/smartor/filterlist/edit',
+ method: 'post',
+ data:data
+ })
+};
+// 淇敼杩囨护鎮ｈ��
+export function addfiltration(data) {
+ return request({
+ url: '/smartor/filterlist/add',
+ method: 'post',
+ data:data
+ })
+};
+// 鏌ヨ杩囨护鎮ｈ�呰鎯�
+export function infofiltration(userId) {
+ return request({
+ url: '/smartor/filterlist/getInfo/'+userId,
+ method: 'get',
+ })
+};
diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index 55a1010..0d81968 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="topicxq" v-for="item in TargetoptionList">
- <el-form :model="ruleForm" :rules="rules">
+ <el-form :rules="rules">
<el-row :gutter="10">
<el-col :span="12"
><el-form-item prop="targetvalue" label="閫夐」鍚嶇О">
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 2287665..a88584c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -46,6 +46,8 @@
commit('SET_DEFAULT_ROUTES', sidebarRoutes)
commit('SET_TOPBAR_ROUTES', sidebarRoutes)
resolve(rewriteRoutes)
+ console.log(res.data,'璺敱鏁版嵁');
+
})
})
}
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 8aae64f..b42d95d 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -1,30 +1,31 @@
-
-
/**
* 閫氱敤js鏂规硶灏佽澶勭悊
* Copyright (c) 2019 ruoyi
*/
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
// 鏃ユ湡鏍煎紡鍖�
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {
- return null
+ return null;
}
- const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
- let date
- if (typeof time === 'object') {
- date = time
+ const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
+ let date;
+ if (typeof time === "object") {
+ date = time;
} else {
- if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
- time = parseInt(time)
- } else if (typeof time === 'string') {
- time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+ time = parseInt(time);
+ } else if (typeof time === "string") {
+ time = time
+ .replace(new RegExp(/-/gm), "/")
+ .replace("T", " ")
+ .replace(new RegExp(/\.[\d]{3}/gm), "");
}
- if ((typeof time === 'number') && (time.toString().length === 10)) {
- time = time * 1000
+ if (typeof time === "number" && time.toString().length === 10) {
+ time = time * 1000;
}
- date = new Date(time)
+ date = new Date(time);
}
const formatObj = {
y: date.getFullYear(),
@@ -33,23 +34,29 @@
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
- a: date.getDay()
- }
+ a: date.getDay(),
+ };
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
- let value = formatObj[key]
+ let value = formatObj[key];
// Note: getDay() returns 0 on Sunday
- if (key === 'a') { return ['鏃�', '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'][value] }
- if (result.length > 0 && value < 10) {
- value = '0' + value
+ if (key === "a") {
+ return ["鏃�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�"][value];
}
- return value || 0
- })
- return time_str
+ if (result.length > 0 && value < 10) {
+ value = "0" + value;
+ }
+ return value || 0;
+ });
+ return time_str;
}
// 杩囨护鍣�
-export function formatTime(val){
- return dayjs(val).format('YYYY-MM-DD')
+export function formatTime(val) {
+ if (val) {
+ return dayjs(val).format("YYYY-MM-DD");
+ } else {
+ return "";
}
+}
// 琛ㄥ崟閲嶇疆
export function resetForm(refName) {
@@ -61,14 +68,19 @@
// 娣诲姞鏃ユ湡鑼冨洿
export function addDateRange(params, dateRange, propName) {
let search = params;
- search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+ search.params =
+ typeof search.params === "object" &&
+ search.params !== null &&
+ !Array.isArray(search.params)
+ ? search.params
+ : {};
dateRange = Array.isArray(dateRange) ? dateRange : [];
- if (typeof (propName) === 'undefined') {
- search.params['beginTime'] = dateRange[0];
- search.params['endTime'] = dateRange[1];
+ if (typeof propName === "undefined") {
+ search.params["beginTime"] = dateRange[0];
+ search.params["endTime"] = dateRange[1];
} else {
- search.params['begin' + propName] = dateRange[0];
- search.params['end' + propName] = dateRange[1];
+ search.params["begin" + propName] = dateRange[0];
+ search.params["end" + propName] = dateRange[1];
}
return search;
}
@@ -80,20 +92,20 @@
}
var actions = [];
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + value)) {
+ if (datas[key].value == "" + value) {
actions.push(datas[key].label);
return true;
}
- })
+ });
if (actions.length === 0) {
actions.push(value);
}
- return actions.join('');
+ return actions.join("");
}
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆銆佹暟缁勶級
export function selectDictLabels(datas, value, separator) {
- if (value === undefined || value.length ===0) {
+ if (value === undefined || value.length === 0) {
return "";
}
if (Array.isArray(value)) {
@@ -105,30 +117,32 @@
Object.keys(value.split(currentSeparator)).some((val) => {
var match = false;
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + temp[val])) {
+ if (datas[key].value == "" + temp[val]) {
actions.push(datas[key].label + currentSeparator);
match = true;
}
- })
+ });
if (!match) {
actions.push(temp[val] + currentSeparator);
}
- })
- return actions.join('').substring(0, actions.join('').length - 1);
+ });
+ return actions.join("").substring(0, actions.join("").length - 1);
}
// 瀛楃涓叉牸寮忓寲(%s )
export function sprintf(str) {
- var args = arguments, flag = true, i = 1;
+ var args = arguments,
+ flag = true,
+ i = 1;
str = str.replace(/%s/g, function () {
var arg = args[i++];
- if (typeof arg === 'undefined') {
+ if (typeof arg === "undefined") {
flag = false;
- return '';
+ return "";
}
return arg;
});
- return flag ? str : '';
+ return flag ? str : "";
}
// 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负""
@@ -153,7 +167,7 @@
}
}
return source;
-};
+}
/**
* 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
@@ -164,9 +178,9 @@
*/
export function handleTree(data, id, parentId, children) {
let config = {
- id: id || 'id',
- parentId: parentId || 'parentId',
- childrenList: children || 'children'
+ id: id || "id",
+ parentId: parentId || "parentId",
+ childrenList: children || "children",
};
var childrenListMap = {};
@@ -207,19 +221,23 @@
}
/**
-* 鍙傛暟澶勭悊
-* @param {*} params 鍙傛暟
-*/
+ * 鍙傛暟澶勭悊
+ * @param {*} params 鍙傛暟
+ */
export function tansParams(params) {
- let result = ''
+ let result = "";
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
- if (value !== null && value !== "" && typeof (value) !== "undefined") {
- if (typeof value === 'object') {
+ if (value !== null && value !== "" && typeof value !== "undefined") {
+ if (typeof value === "object") {
for (const key of Object.keys(value)) {
- if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
- let params = propName + '[' + key + ']';
+ if (
+ value[key] !== null &&
+ value[key] !== "" &&
+ typeof value[key] !== "undefined"
+ ) {
+ let params = propName + "[" + key + "]";
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
}
@@ -229,7 +247,7 @@
}
}
}
- return result
+ return result;
}
// 楠岃瘉鏄惁涓篵lob鏍煎紡
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 7c7e0cf..ba40e15 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -300,33 +300,49 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="followupvisit(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-bb"
- ><i class="el-icon-s-promotion"></i>閲嶆柊闅忚</span
- ></el-button
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="閲嶆柊闅忚"
+ placement="top"
>
- <el-button
- size="medium"
- type="text"
- @click="handlestop(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-sc"
- ><i class="el-icon-delete"></i>鍋滄</span
- ></el-button
+ <el-button
+ size="medium"
+ type="text"
+ @click="followupvisit(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-bb"
+ ><i class="el-icon-s-promotion"></i></span
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鍋滄"
+ placement="top"
>
- <el-button
- size="medium"
- type="text"
- @click="Seedetails(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-zx"
- ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
- ></el-button
+ <el-button
+ size="medium"
+ type="text"
+ @click="handlestop(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-sc"><i class="el-icon-delete"></i></span
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鏌ョ湅浠诲姟璇︽儏"
+ placement="top"
>
+ <el-button
+ size="medium"
+ type="text"
+ @click="Seedetails(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-zx"><i class="el-icon-s-order"></i></span
+ ></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 356ca4a..d1a480b 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -205,18 +205,10 @@
><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
></el-button
>
- <el-button
- v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
- size="medium"
- type="text"
- @click="immediateExecution(scope.row)"
- ><span class="button-lj"
- ><i class="el-icon-s-promotion"></i>绔嬪嵆鎵ц</span
- ></el-button
- >
+
<el-button size="medium" type="text" @click="newAdd(scope.row)"
><span class="button-xj"
- ><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
+ ><i class="el-icon-circle-plus-outline"></i>浠诲姟缁堟</span
></el-button
>
<el-button
@@ -271,49 +263,59 @@
width="50%"
:before-close="handleClose"
>
- <div style="font-size: 20px; color: red; margin-bottom: 20px">
- 璇风‘璁や换鍔�"{{ taskform.taskName }}"鐨勬墽琛屾椂闂�
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showDate"
- >
- 鎵ц鏃ユ湡锛�<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showDate[0] }} 鑷� {{ taskform.showDate[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeMorn[0]"
- >
- 绗竴鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeMorn[0] }} 鑷�
- {{ taskform.showTimeMorn[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeNight[0]"
- >
- 绗簩鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeNight[0] }} 鑷�
- {{ taskform.showTimeNight[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeNoon[0]"
- >
- 绗笁鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeNoon[0] }} 鑷�
- {{ taskform.showTimeNoon[1] }}</span
- >
- </div>
- <div style="text-align: right">
+ <el-tabs type="border-card" v-model="activname">
+ <el-tab-pane>
+ <span slot="label"><i class="el-icon-date"></i> 姝ｅ父鍙戣捣</span>
+ <div style="font-size: 20px; color: red; margin-bottom: 20px">
+ 璇风‘璁や换鍔�"{{ taskform.taskName }}"鐨勬墽琛屾椂闂�
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showDate"
+ >
+ 鎵ц鏃ユ湡锛�<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showDate[0] }} 鑷� {{ taskform.showDate[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeMorn[0]"
+ >
+ 绗竴鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeMorn[0] }} 鑷�
+ {{ taskform.showTimeMorn[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeNight[0]"
+ >
+ 绗簩鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeNight[0] }} 鑷�
+ {{ taskform.showTimeNight[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeNoon[0]"
+ >
+ 绗笁鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeNoon[0] }} 鑷�
+ {{ taskform.showTimeNoon[1] }}</span
+ >
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="绔嬪嵆鎵ц">
+ <div style="font-size: 20px; color: red; margin-bottom: 20px">
+ 姝ゆ搷浣滃皢绔嬪嵆鍙戣捣骞舵墽琛屼换鍔�:{{ taskform.taskName }}锛岃璋ㄦ厧鎿嶄綔锛�
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ <div style="text-align: right; margin: 20px 0">
<el-button style="margin-right: 20px" @click="taskformVisible = false"
>鍙� 娑�</el-button
>
@@ -436,6 +438,7 @@
},
],
tasktopic: "2", //鏂板绫诲瀷
+ activname: "",
value: [],
list: [],
loading: false,
@@ -841,15 +844,19 @@
},
// 纭鍙戣捣
confirmSponsor(row) {
- this.TaskOperation.taskId = row.taskid;
- this.TaskOperation.sendState = 2;
- TaskTemplateSendExecution(this.TaskOperation).then((res) => {
- if (res.code == 200) {
- this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
- this.taskformVisible = false;
- this.getList();
- }
- });
+ if (this.activname == 0) {
+ this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.sendState = 2;
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
+ this.taskformVisible = false;
+ this.getList();
+ }
+ });
+ } else if (this.activname == 1) {
+ this.immediateExecution(row);
+ }
},
// 绔嬪嵆鎵ц
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
index 0f60b5b..9d0809d 100644
--- a/src/views/knowledge/questionbank/particulars/index.vue
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -174,6 +174,44 @@
placeholder="璇疯緭鍏ラ鐩唴瀹�"
></el-input>
</el-form-item>
+ <el-form-item
+ label=""
+ prop="scriptContent"
+ v-if="topicobj.scriptType == 3"
+ >
+ <div style="display: flex; margin-bottom: 10px">
+ <div class="tsgnames" @click="tsgnametos">鎻掑叆濉┖</div>
+ </div>
+ </el-form-item>
+ <el-row>
+ <el-col :span="20">
+ <el-form-item label="鏀堕泦淇℃伅" v-if="topicobj.scriptType == 3">
+ <el-card class="box-card" style="width: 200%">
+ <div
+ v-for="item in topicobj.svyLibScriptOptions"
+ style="margin-bottom: 10px"
+ >
+ <el-input
+ type="text"
+ placeholder="濉叆鍐呭淇℃伅"
+ v-model="item.aaa"
+ >
+ <el-button
+ slot="append"
+ @click="deletexuanx(item)"
+ type="danger"
+ icon="el-icon-delete"
+ circle
+ ></el-button>
+ <span slot="prepend">{{
+ "(" + item.orderno + ")"
+ }}</span>
+ </el-input>
+ </div>
+ </el-card>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="棰樼洰璇存槑">
<el-input
style="width: 40vw"
@@ -705,6 +743,7 @@
this.dynamicTags = this.topicobj.svyLibScriptTagList.map(
this.processElement
);
+ this.scriptTypels = this.topicobj.scriptType;
this.variablelist = JSON.parse(this.topicobj.otherdata)
? JSON.parse(this.topicobj.otherdata)
: this.variablelist;
@@ -837,7 +876,12 @@
},
// 鍒ゆ柇鎸囨爣
changefn(item) {
- if (this.topicobj.targetname) {
+ console.log(item);
+
+ if (
+ this.topicobj.targetname ||
+ this.topicobj.svyLibScriptOptions[0].optioncontent
+ ) {
this.$modal
.confirm("鏇存敼绫诲瀷鍚庨�夐」灏嗘竻绌烘槸鍚︾户缁紵")
.then(() => {
@@ -1022,21 +1066,16 @@
};
this.gettargetInfo();
},
- // 渚挎嵎鏍囩
- tsgnameto(row) {
+
+ // 渚挎嵎鏍囩鎻掑叆濉┖
+ tsgnametos(row) {
let inputValueArr = "";
+ let value = this.testuserList.length + 1;
+
let el = document.querySelector("#" + this.currentInputId);
//el.selectionStart; 杩欏氨鏄綋鍓嶅厜鏍囨墍鍦ㄧ殑浣嶇疆锛堝瓧绗︿覆涓瓧绗︾殑index锛�
- if (this.currentInputId == "scriptContent") {
- inputValueArr = this.topicobj.scriptContent.split("");
- } else if (this.currentInputId == "nomatchtext") {
- inputValueArr = this.topicobj.nomatchtext.split("");
- } else if (this.currentInputId == "sliencetext") {
- inputValueArr = this.topicobj.sliencetext.split("");
- } else if (this.currentInputId == "noclearlytext") {
- inputValueArr = this.topicobj.noclearlytext.split("");
- } else if (this.currentInputId == "submoduletext") {
- inputValueArr = this.topicobj.submoduletext.split("");
+ if (this.currentInputId == "targetdesc") {
+ inputValueArr = this.indexform.targetdesc.split("");
} else {
return;
}
@@ -1045,20 +1084,22 @@
// 鎷垮埌閫変腑鏂囧瓧鐨勯暱搴︼紙鍚庣画鍙互鐢ㄦ潵鏇挎崲閫変腑鐨勬枃瀛楋級
let selectLength = el.selectionEnd - el.selectionStart;
// 灏嗚鎻掑叆/鏇挎崲鐨勬枃瀛楁彃鍏�/鏇挎崲锛坴alue.name鏄鎻掑叆/鏇挎崲鐨勫瓧绗︿覆锛�
- inputValueArr.splice(el.selectionStart, selectLength, `${row.variate}`);
+ inputValueArr.splice(
+ el.selectionStart,
+ selectLength,
+ "__" + value + "__"
+ );
+ this.testuserList.push({
+ orderno: value,
+ optiondesc: "",
+ isoperation: 1,
+ });
// 鎶婃暟缁勯噸鏂拌浆鎹负瀛楃涓插苟璧嬪��
inputValueArr = inputValueArr.join("");
+
console.log(inputValueArr);
- if (this.currentInputId == "scriptContent") {
- this.topicobj.scriptContent = inputValueArr;
- } else if (this.currentInputId == "nomatchtext") {
- this.topicobj.nomatchtext = inputValueArr;
- } else if (this.currentInputId == "sliencetext") {
- this.topicobj.sliencetext = inputValueArr;
- } else if (this.currentInputId == "noclearlytext") {
- this.topicobj.noclearlytext = inputValueArr;
- } else if (this.currentInputId == "submoduletext") {
- this.topicobj.submoduletext = inputValueArr;
+ if (this.currentInputId == "targetdesc") {
+ this.indexform.targetdesc = inputValueArr;
} else {
return;
}
@@ -1220,6 +1261,21 @@
.tsgname:hover {
background: #3366f5;
}
+.tsgnames {
+ width: 90px;
+ margin-right: 10px;
+ text-align: center;
+ cursor: pointer;
+ height: 40px;
+ line-height: 40px;
+ background: #66c18c;
+ color: #ffff;
+ font-size: 18px;
+ border-radius: 5px;
+}
+.tsgnames:hover {
+ background: #20894d;
+}
.preview-left {
margin: 20px;
// margin: 20px;
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index 6f7bbe8..c7f2588 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -107,18 +107,7 @@
>鏂板</el-button
>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="medium"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:user:edit']"
- >淇敼</el-button
- >
- </el-col>
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -142,60 +131,43 @@
<el-table-column
label="搴忓彿"
align="center"
- key="patid"
- prop="patid"
+ key="id"
+ prop="id"
/>
- <el-table-column label="濮撳悕" align="center" key="name" prop="name" />
+ <el-table-column label="濮撳悕锛堢己锛�" align="center" key="name" prop="name" />
<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
- label="骞撮緞"
+ label="瀹℃牳浜�"
align="center"
- key="age"
- prop="age"
+ key="checkBy"
+ prop="checkBy"
+ width="120"
+ />
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ align="center"
+ key="checkFlag"
+ prop="checkFlag"
width="120"
/>
<el-table-column
- label="璇佷欢缂栧彿"
- align="center"
- key="age"
- prop="age"
- width="120"
- />
- <el-table-column
label="杩囨护绫诲瀷"
align="center"
- key="age"
- prop="age"
- 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="璇佷欢绫诲瀷"
- align="center"
- key="idcardtype"
- prop="idcardtype"
+ key="filterdesc"
+ prop="filterdesc"
width="120"
/><el-table-column
- label="璇佷欢缂栧彿"
+ label="杩囨护鐢宠璇存槑"
align="center"
- key="idcardno"
- prop="idcardno"
+ key="filternotes"
+ prop="filternotes"
width="190"
/>
<el-table-column
@@ -213,19 +185,31 @@
width="190"
/>
<el-table-column
- label="鎿嶄綔鏃ユ湡"
+ label="鐢宠鏃ユ湡"
align="center"
- key="archivetime"
- prop="archivetime"
+ key="applyTime"
+ prop="applyTime"
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.applyTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ key="checkTime"
+ prop="checkTime"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span>{{ formatTime(scope.row.checkTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
align="center"
+ fixed="right"
width="190"
class-name="small-padding fixed-width"
>
@@ -247,7 +231,7 @@
<el-button
size="medium"
type="text"
- @click="handleUpdate(scope.row)"
+ @click="handleDelete(scope.row)"
v-hasPermi="['system:user:edit']"
><span class="button-textxga"
><i class="el-icon-edit"></i>鍙栨秷杩囨护</span
@@ -392,11 +376,11 @@
import { delUser } from "@/api/system/user";
import {
- messagelistpatient,
- alterpatient,
- addpatient,
+ listfiltration,
+ editfiltration,
+ addfiltration,
particularpatient,
- deletepatient,
+ delfiltration,
Exporterrorpatient,
toleadpatient,
} from "@/api/patient/homepage";
@@ -538,7 +522,7 @@
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
this.loading = true;
- messagelistpatient(this.queryParams).then((response) => {
+ listfiltration(this.queryParams).then((response) => {
console.log(response);
this.userList = response.rows;
this.total = response.total;
@@ -624,22 +608,12 @@
this.Labelchange = true;
this.amendtag = false;
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- console.log(row);
- const userIds = row.patid || this.ids;
- particularpatient(userIds).then((response) => {
- console.log(response);
- this.form = response.data;
- });
- this.amendtag = true;
- this.Labelchange = true;
- },
+
//淇敼/鏂板鎮ｈ��
submitForm() {
if (this.amendtag) {
- alterpatient(this.form)
+ editfiltration(this.form)
.then((response) => {
console.log(response);
})
@@ -648,7 +622,7 @@
this.$modal.msgSuccess("淇敼鎴愬姛");
});
} else {
- addpatient(this.form)
+ addfiltration(this.form)
.then((response) => {
console.log(response);
})
@@ -664,11 +638,11 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- const userIds = row.userId || this.ids;
+ const userIds = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
.then(function () {
- return deletepatient(userIds);
+ return delfiltration(userIds);
})
.then(() => {
this.getList();
diff --git a/src/views/patient/patient/PatientChart.vue b/src/views/patient/patient/PatientChart.vue
index 615b771..554f4dc 100644
--- a/src/views/patient/patient/PatientChart.vue
+++ b/src/views/patient/patient/PatientChart.vue
@@ -674,28 +674,7 @@
},
],
- cardlist: [
- {
- name: "鎮ｈ�呮�绘暟",
- value: 123,
- },
- {
- name: "鍦ㄩ櫌鎮ｈ��",
- value: 23,
- },
- {
- name: "绂婚櫌鎮ｈ��",
- value: 41,
- },
- {
- name: "璇婄枟鎮ｈ��",
- value: 56,
- },
- {
- name: "绂讳笘鎮ｈ��",
- value: 0,
- },
- ],
+
// 琛ㄥ崟鍙傛暟
form: {
name: "",
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index c55f71a..d248b18 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -25,8 +25,11 @@
<div>
<el-row :gutter="10">
<el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
- <el-card shadow="hover">
- <div style="padding: 8px">
+ <el-card
+ shadow="hover"
+ :body-style="item.router ? ' cursor: pointer' : 'cursor: default'"
+ >
+ <div style="padding: 8px" @click="$router.push(item.router)">
<span>{{ item.name }}</span>
<div
style="
@@ -315,10 +318,10 @@
"
v-hasPermi="['system:user:edit']"
><span class="button-textsc"
- ><i class="el-icon-zoom-in"></i>鏌ョ湅</span
+ ><i class="el-icon-zoom-in"></i>璇︽儏缂栬緫</span
></el-button
>
- <el-button
+ <!-- <el-button
size="medium"
type="text"
@click="handleUpdate(scope.row)"
@@ -326,7 +329,7 @@
><span class="button-textxga"
><i class="el-icon-edit"></i>淇敼</span
></el-button
- >
+ > -->
<el-button
size="medium"
type="text"
@@ -627,14 +630,16 @@
</el-dialog>
<!-- 璺宠浆鏈嶅姟瀵硅瘽妗� -->
<el-dialog title="閫夋嫨鏈嶅姟绫诲瀷" :visible.sync="serviceVisible">
- <el-radio-group v-model="serviceradio">
- <el-radio :label="1">瀹ｆ暀闅忚</el-radio>
- <el-radio :label="2">闂ㄨ瘖鏈嶅姟</el-radio>
- <el-radio :label="3">鍑洪櫌鏈嶅姟</el-radio>
- <el-radio :label="4">澶嶈瘖鏈嶅姟</el-radio>
- <el-radio :label="5">浣撴閫氱煡</el-radio>
- <el-radio :label="6">闂嵎鏈嶅姟</el-radio>
- </el-radio-group>
+ <el-card class="box-card">
+ <el-radio-group v-model="serviceradio">
+ <el-radio :label="1">瀹ｆ暀闅忚</el-radio>
+ <el-radio :label="2">闂ㄨ瘖鏈嶅姟</el-radio>
+ <el-radio :label="3">鍑洪櫌鏈嶅姟</el-radio>
+ <el-radio :label="4">澶嶈瘖鏈嶅姟</el-radio>
+ <el-radio :label="5">浣撴閫氱煡</el-radio>
+ <el-radio :label="6">闂嵎鏈嶅姟</el-radio>
+ </el-radio-group>
+ </el-card>
<div slot="footer" class="dialog-footer">
<el-button @click="serviceVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="CreateService">鍒涘缓鏈嶅姟</el-button>
@@ -734,14 +739,17 @@
{
name: "鍦ㄩ櫌鎮ｈ��",
value: 23,
+ router: "/patient/inpatient",
},
{
- name: "绂婚櫌鎮ｈ��",
+ name: "鍑洪櫌鎮ｈ��",
value: 41,
+ router: "/patient/hospital",
},
{
- name: "璇婄枟鎮ｈ��",
+ name: "闂ㄨ瘖鎮ｈ��",
value: 56,
+ router: "/patient/outpatient",
},
{
name: "绂讳笘鎮ｈ��",
@@ -1125,6 +1133,7 @@
}
::v-deep.leftvlue .el-card__body:hover {
background: #8dc8f8;
+ cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
}
.leftvlue {
width: 80%;
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index b6ea13b..229ea32 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -167,13 +167,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="搴忓彿"
- fixed
- align="center"
- key="id"
- prop="id"
- />
+ <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
<el-table-column
label="濮撳悕"
fixed
@@ -293,33 +287,50 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="followupvisit(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-bb"
- ><i class="el-icon-s-promotion"></i>閲嶆柊閫氱煡</span
- ></el-button
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="閲嶆柊閫氱煡"
+ placement="top"
>
- <el-button
- size="medium"
- type="text"
- @click="handlestop(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-sc"
- ><i class="el-icon-delete"></i>鍋滄</span
- ></el-button
+ <el-button
+ size="medium"
+ type="text"
+ @click="followupvisit(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-bb"
+ ><i class="el-icon-s-promotion"></i></span
+ ></el-button
+ >
+ </el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鍋滄"
+ placement="top"
>
- <el-button
- size="medium"
- type="text"
- @click="Seedetails(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-zx"
- ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
- ></el-button
+ <el-button
+ size="medium"
+ type="text"
+ @click="handlestop(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-sc"><i class="el-icon-delete"></i></span
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鏌ョ湅浠诲姟璇︽儏"
+ placement="top"
>
+ <el-button
+ size="medium"
+ type="text"
+ @click="Seedetails(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-zx"><i class="el-icon-s-order"></i></span
+ ></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -636,7 +647,6 @@
message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
trigger: "blur",
},
-
],
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
@@ -692,13 +702,11 @@
/** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
getList() {
this.loading = true;
- getTaskservelist(this.topqueryParams).then(
- (response) => {
- this.userList = response.rows;
- this.total = response.total;
- this.loading = false;
- }
- );
+ getTaskservelist(this.topqueryParams).then((response) => {
+ this.userList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
Referencequestion(row) {
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 8091499..42db8bd 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -536,13 +536,20 @@
<div v-if="indexform.scriptType == 3">
<el-form-item label="鏀堕泦淇℃伅">
<el-card class="box-card">
- <div v-for="item in indexform.targetoptionList">
- <span>{{ "(" + item.orderno + ")" }}</span>
+ <div v-for="item in testuserList" style="margin-bottom: 10px">
<el-input
type="text"
placeholder="濉叆鏀堕泦淇℃伅"
v-model="indexform.optiondesc"
>
+ <el-button
+ slot="append"
+ @click="deloption(item)"
+ type="danger"
+ icon="el-icon-delete"
+ circle
+ ></el-button>
+ <span slot="prepend">{{ "(" + item.orderno + ")" }}</span>
</el-input>
</div>
</el-card>
@@ -722,7 +729,7 @@
radio: "涓诲垎绫�",
testvalue: "",
testgovalue: "",
- creatype:'',//鎸囨爣涓存椂绫诲瀷
+ creatype: "", //鎸囨爣涓存椂绫诲瀷
hasValue: true,
classifyform: {
categoryname: "",
@@ -765,6 +772,7 @@
mode: [],
optionstag: [],
targetoptionList: [],
+ Temporarytype: "",
// 鏌ヨ鍙傛暟
queryParams: {
@@ -806,7 +814,7 @@
this.valuetypelb = store.getters.askvaluetype;
this.languagelist = store.getters.languagelist;
this.qyoptions = store.getters.askvaluetype;
- this.usable = store.getters.usable;
+ this.usable = store.getters.usable;
},
methods: {
/** 鏌ヨ鎸囨爣鍒楄〃 */
@@ -848,10 +856,10 @@
this.deletefenl = row.title;
}
},
- // 渚挎嵎鏍囩
+ // 渚挎嵎鏍囩鎻掑叆濉┖
tsgnameto(row) {
let inputValueArr = "";
- let value = indexform.targetoptionList.length + 1;
+ let value = this.testuserList.length + 1;
let el = document.querySelector("#" + this.currentInputId);
//el.selectionStart; 杩欏氨鏄綋鍓嶅厜鏍囨墍鍦ㄧ殑浣嶇疆锛堝瓧绗︿覆涓瓧绗︾殑index锛�
@@ -870,9 +878,10 @@
selectLength,
"__" + value + "__"
);
- this.indexform.targetoptionList.push({
+ this.testuserList.push({
orderno: value,
optiondesc: "",
+ isoperation: 1,
});
// 鎶婃暟缁勯噸鏂拌浆鎹负瀛楃涓插苟璧嬪��
inputValueArr = inputValueArr.join("");
@@ -885,16 +894,25 @@
}
},
Changtype(item) {
+ console.log(this.testuserList);
console.log(item, "閫夐」鍙樻洿鐨勫鐞�");
- if (item==3) {
- this.$modal
- .confirm('鏇存敼绫诲瀷涓哄～绌哄悗閫夐」灏嗘竻绌烘槸鍚︾户缁紵')
- .then(() => {
+ if (item == 3 && this.testuserList[0].targetvalue) {
+ this.$modal
+ .confirm("鏇存敼绫诲瀷涓哄～绌哄悗閫夐」灏嗘竻绌烘槸鍚︾户缁紵")
+ .then(() => {
+ this.testuserList = [];
+ this.Temporarytype = this.indexform.scriptType;
})
.catch(() => {
-
+ this.indexform.scriptType = this.Temporarytype;
});
+ } else if (item == 3) {
+ this.testuserList = [];
+ this.Temporarytype = this.indexform.scriptType;
+ }
+ {
+ this.Temporarytype = this.indexform.scriptType;
}
},
// 鐤剧梾-----------------------
@@ -1047,10 +1065,17 @@
console.log(this.targetoptionList, "aaaa.targetoptionList");
this.testuserList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
this.sortFn();
+
+ if (this.indexform.scriptType == 3) {
+ this.$modal.msgWarning(
+ "濉┖椤瑰凡鍒犻櫎璇锋墜鍔ㄥ垹闄ら鐩唴瀹逛腑瀵瑰簲鐨勫～绌洪」"
+ );
+ }
} else {
console.log("鏈壘鍒拌瀵硅薄");
}
},
+
syioption(row) {
const index = this.getIndexInArray(this.testuserList, row);
const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
@@ -1254,6 +1279,7 @@
this.indexform = {};
this.indexform = row;
this.indexform.scriptType = Number(row.scriptType);
+ this.Temporarytype = this.indexform.scriptType;
if (!row.targetoptionList[0]) {
row.targetoptionList = [
{
@@ -1262,6 +1288,7 @@
targetregex: "",
targetregex2: "",
isoperation: 1,
+ orderno: 1,
dynamiccruxs: [],
nodynamiccruxs: [],
dynamiccruxsJson: "",
--
Gitblit v1.9.3