From 95075418735842f54c116c2dc2d18199d4408e50 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 09 一月 2025 16:36:13 +0800
Subject: [PATCH] 无锡提交
---
src/views/outsideChainxj.vue | 6 +-
dist.zip | 0
vue.config.js | 2
src/api/system/role.js | 4
src/views/repositoryai/templateku/configurat/index.vue | 2
src/assets/logo/logoxh.png | 0
src/views/outsideChainnew.vue | 2
src/views/patient/propaganda/QuestionnaireTask.vue | 37 ++++++++----
.env.staging | 4
src/views/register.vue | 2
src/layout/components/Sidebar/Logo.vue | 2
src/views/outsideChainwt.vue | 2
src/views/outsideChainxjnew.vue | 6 +-
src/assets/images/profile1.jpg | 0
src/views/patient/propaganda/Missioncreation.vue | 4
src/views/outsideChainwtnew.vue | 2
src/views/followvisit/tasklist/index.vue | 2
src/assets/images/profile.jpg | 0
src/assets/logo/logoxh1.png | 0
src/views/repositoryai/templateku/configurat/taskub.vue | 2
.env.development | 4
/dev/null | 0
src/views/system/user/index.vue | 12 +++
src/views/login.vue | 2
package.json | 2
.env.production | 4
src/views/patient/propaganda/particty.vue | 67 ++++++++++++---------
src/views/patient/follow/index.vue | 2
28 files changed, 101 insertions(+), 71 deletions(-)
diff --git a/.env.development b/.env.development
index 2f7877d..784dbd2 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
-# 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴/寮�鍙戠幆澧�
+# 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
# 璺敱鎳掑姞杞�
diff --git a/.env.production b/.env.production
index 5564ef3..67e1e72 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
-# 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴/鐢熶骇鐜
+# 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index bb69148..1a44016 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴
NODE_ENV = production
# 娴嬭瘯鐜閰嶇疆
ENV = 'staging'
-# 娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴/娴嬭瘯鐜
+# 鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴/娴嬭瘯鐜
VUE_APP_BASE_API = '/stage-api'
diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip"
deleted file mode 100644
index 0218ec5..0000000
--- "a/dist \0502\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/dist \0503\051.zip" "b/dist \0503\051.zip"
deleted file mode 100644
index 95a60ff..0000000
--- "a/dist \0503\051.zip"
+++ /dev/null
Binary files differ
diff --git a/dist.zip b/dist.zip
index 1c3e2e0..c6f993e 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/package.json b/package.json
index afe63cb..fac081a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.5",
- "description": "娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴",
+ "description": "鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴",
"author": "鏉柊",
"license": "MIT",
"scripts": {
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 1df8e40..17914bf 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -38,7 +38,7 @@
// 瑙掕壊鏁版嵁鏉冮檺
export function dataScope(data) {
return request({
- url: '/system/role/dataScope/edit',
+ url: '/system/role/dataScope',
method: 'post',
data: data
})
@@ -104,7 +104,7 @@
// 鎺堟潈鐢ㄦ埛閫夋嫨
export function authUserSelectAll(data) {
return request({
- url: '/system/role/authUser/selectAll/edit',
+ url: '/system/role/authUser/selectAll',
method: 'post',
params: data
})
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
index b3a940b..77d3c32 100644
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
Binary files differ
diff --git a/src/assets/images/profile1.jpg b/src/assets/images/profile1.jpg
new file mode 100644
index 0000000..b3a940b
--- /dev/null
+++ b/src/assets/images/profile1.jpg
Binary files differ
diff --git a/src/assets/logo/logoxh.png b/src/assets/logo/logoxh.png
index c0760d3..77d3c32 100644
--- a/src/assets/logo/logoxh.png
+++ b/src/assets/logo/logoxh.png
Binary files differ
diff --git a/src/assets/logo/logoxh1.png b/src/assets/logo/logoxh1.png
new file mode 100644
index 0000000..c0760d3
--- /dev/null
+++ b/src/assets/logo/logoxh1.png
Binary files differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index c8834c8..6bf506c 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -70,7 +70,7 @@
},
data() {
return {
- title: "娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴",
+ title: "鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴",
logo: logoImg,
};
},
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e466c64..8771aff 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -604,7 +604,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 1,
+ type: 2,
userName: undefined,
tagid: undefined,
topic: undefined,
diff --git a/src/views/login.vue b/src/views/login.vue
index 23bab52..95cbc53 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- <h3 class="title">娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴</h3>
+ <h3 class="title">鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
diff --git a/src/views/outsideChainnew.vue b/src/views/outsideChainnew.vue
index 347ad7d..b8b6074 100644
--- a/src/views/outsideChainnew.vue
+++ b/src/views/outsideChainnew.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index 6311a42..58ed3ff 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 863e8f8..8e35a4d 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue
index 41b35b4..4ba6dd1 100644
--- a/src/views/outsideChainxj.vue
+++ b/src/views/outsideChainxj.vue
@@ -1,7 +1,7 @@
<template>
<div class="questionnaire">
<!-- <div class="CONTENT">
- <div class="title">娴欎腑鍖诲ぇ浜岄櫌鍖绘姢鐭ヨ瘑瀹ｆ暀</div>
+ <div class="title">鏃犻敗鍎跨鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀</div>
<div class="preview-left">
<div v-html="richText"></div>
</div>
@@ -10,12 +10,12 @@
<div class="CONTENT" >
<div class="preview-left">
<div class="toptitle">
- <div class="title">{{ taskname ? taskname : "娴欎腑鍖诲ぇ浜岄櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
+ <div class="title">{{ taskname ? taskname : "鏃犻敗鍎跨鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
<div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5">
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainxjnew.vue b/src/views/outsideChainxjnew.vue
index 7a3e97b..754ba39 100644
--- a/src/views/outsideChainxjnew.vue
+++ b/src/views/outsideChainxjnew.vue
@@ -1,7 +1,7 @@
<template>
<div class="questionnaire">
<!-- <div class="CONTENT">
- <div class="title">娴欎腑鍖诲ぇ浜岄櫌鍖绘姢鐭ヨ瘑瀹ｆ暀</div>
+ <div class="title">鏃犻敗鍎跨鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀</div>
<div class="preview-left">
<div v-html="richText"></div>
</div>
@@ -10,12 +10,12 @@
<div class="CONTENT" >
<div class="preview-left">
<div class="toptitle">
- <div class="title">{{ taskname ? taskname : "娴欎腑鍖诲ぇ浜岄櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
+ <div class="title">{{ taskname ? taskname : "鏃犻敗鍎跨鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
<div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5">
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index f036990..e6276e5 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -180,7 +180,7 @@
@click="
$router.push({
path: '/patient/patient/profile/',
- query: { id: scope.row.patid },
+ query: { id: scope.row.id },
})
"
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index e50cc2b..b436a44 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -921,7 +921,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
+ kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1350,7 +1350,7 @@
templateid: null,
libtemplateid: null,
serviceType: Number(this.$route.query.serviceType),
- kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+ kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a5d2b0a..ed13b14 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -652,7 +652,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="20"
><el-form-item label="閫傜敤鐥呭尯" prop="region">
<el-select
@@ -673,7 +673,7 @@
</el-option>
</el-select> </el-form-item
></el-col>
- </el-row>
+ </el-row> -->
<div class="xinz-infs">
<el-form-item>
@@ -999,6 +999,8 @@
pageNum: 1, //
pageSize: 10,
topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
+ leavehospitaldistrictcodes:[],
+ leaveldeptcodes:[],
},
topicoptions: [{ children: [{ children: [] }] }],
showSearch: true, //
@@ -1071,7 +1073,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1167,9 +1169,9 @@
deptcode: [
{ required: true, message: "閫傜敤绉戝涓嶈兘涓虹┖", trigger: "blur" },
],
- leavehospitaldistrictcode: [
- { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ // leavehospitaldistrictcode: [
+ // { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" },
+ // ],
},
// 绉戝闄㈠尯鏌ヨ鍏ュ弬
queryParamsdept: {
@@ -1258,7 +1260,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled:true,
},
{
value: "5",
@@ -1275,7 +1277,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled:true,
},
{
value: "5",
@@ -1308,7 +1310,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled:true,
},
{
value: "5",
@@ -1332,7 +1334,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled:true,
},
{
value: "5",
@@ -1696,7 +1698,11 @@
let indexa = this.overallCase.indexOf(row);
let indexb = this.form.patTaskRelevances.indexOf(row);
this.overallCase.splice(indexa, 1);
- this.form.patTaskRelevances[indexb].isoperation = 3;
+ if (!this.form.taskid) {
+ this.form.patTaskRelevances.splice(indexa, 1);
+ } else {
+ this.form.patTaskRelevances[indexb].isoperation = 3;
+ }
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
},
@@ -1714,6 +1720,13 @@
store.getters.leavehospitaldistrictcodes;
this.patientqueryParams.leaveldeptcodes = null;
}
+ console.log(this.patientqueryParams.leavehospitaldistrictcodes);
+ console.log(this.patientqueryParams.leaveldeptcodes);
+
+ if (!this.patientqueryParams.leavehospitaldistrictcodes||!this.patientqueryParams.leavehospitaldistrictcodes[0])
+ this.patientqueryParams.leavehospitaldistrictcodes = null;
+ if (!this.patientqueryParams.leaveldeptcodes||!this.patientqueryParams.leaveldeptcodes[0])
+ this.patientqueryParams.leaveldeptcodes = null;
this.handleAddpatient();
},
resetQuery() {},
@@ -1747,7 +1760,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index c109b37..58e9b7f 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -399,18 +399,15 @@
</el-col>
<el-col :span="1.5">
-
-
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="medium"
- :disabled="!patientqueryParams.allhosp"
- @click="handleQuery"
- >鏂板</el-button
- >
-
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="medium"
+ :disabled="!patientqueryParams.allhosp"
+ @click="handleQuery"
+ >鏂板</el-button
+ >
</el-col>
<!-- <el-col :span="1.5">
@@ -661,7 +658,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="20"
><el-form-item label="閫傜敤鐥呭尯" prop="region">
<el-select
@@ -670,7 +667,7 @@
size="medium"
multiple
filterable
- placeholder="璇烽�夋嫨绉戝"
+ placeholder="璇烽�夋嫨鐥呭尯"
>
<el-option
class="ruleFormaa"
@@ -682,7 +679,7 @@
</el-option>
</el-select> </el-form-item
></el-col>
- </el-row>
+ </el-row> -->
<div class="xinz-infs">
<el-form-item>
@@ -1033,6 +1030,8 @@
pageNum: 1, //
pageSize: 10,
topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
topicoptions: [{ children: [{ children: [] }] }],
showSearch: true, //
@@ -1105,7 +1104,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1200,16 +1199,16 @@
deptcode: [
{ required: true, message: "閫傜敤绉戝涓嶈兘涓虹┖", trigger: "blur" },
],
- leavehospitaldistrictcode: [
- { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ // leavehospitaldistrictcode: [
+ // { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" },
+ // ],
},
// 绉戝闄㈠尯鏌ヨ鍏ュ弬
queryParamsdept: {
tempid: "",
type: 2,
},
- belongDepts:[],
+ belongDepts: [],
quote: false,
serviceType: null,
};
@@ -1324,7 +1323,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled: true,
},
{
value: "5",
@@ -1340,7 +1339,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled: true,
},
{
value: "5",
@@ -1373,7 +1372,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled: true,
},
{
value: "5",
@@ -1397,7 +1396,7 @@
{
value: "4",
label: "鐭俊",
-
+ disabled: true,
},
{
value: "5",
@@ -1516,9 +1515,9 @@
this.objyl.isoperation = 2;
this.objyl.taskid = data.taskId;
if (!this.objyl.sendDa) {
- this.objyl.sendDay='5';
+ this.objyl.sendDay = "5";
}
- console.log(this.objyl.sendDay,'this.objyl.sendDay');
+ console.log(this.objyl.sendDay, "this.objyl.sendDay");
Taskparticty(this.objyl).then((response) => {
this.previewtf = false;
@@ -1759,10 +1758,16 @@
this.$modal
.confirm('鏄惁纭鍒犻櫎鎮ｈ��"' + row.name + '"鐨勬湇鍔￠」锛�')
.then(() => {
+ console.log();
+
let indexa = this.overallCase.indexOf(row);
let indexb = this.form.patTaskRelevances.indexOf(row);
this.overallCase.splice(indexa, 1);
- this.form.patTaskRelevances[indexb].isoperation = 3;
+ if (!this.form.taskid) {
+ this.form.patTaskRelevances.splice(indexa, 1);
+ } else {
+ this.form.patTaskRelevances[indexb].isoperation = 3;
+ }
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
},
@@ -1780,6 +1785,10 @@
store.getters.leavehospitaldistrictcodes;
this.patientqueryParams.leaveldeptcodes = null;
}
+ if (!this.patientqueryParams.leavehospitaldistrictcodes||!this.patientqueryParams.leavehospitaldistrictcodes[0])
+ this.patientqueryParams.leavehospitaldistrictcodes = null;
+ if (!this.patientqueryParams.leaveldeptcodes||!this.patientqueryParams.leaveldeptcodes[0])
+ this.patientqueryParams.leaveldeptcodes = null;
this.handleAddpatient();
},
resetQuery() {},
@@ -1813,7 +1822,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
@@ -1998,7 +2007,7 @@
this.objyl.taskid = this.form.id;
}
if (!this.objyl.sendDay) {
- this.objyl.sendDay='5';
+ this.objyl.sendDay = "5";
}
if (this.form.templateid) {
deleteTaskparticty(this.form.templateid).then((res) => {
diff --git a/src/views/register.vue b/src/views/register.vue
index 5e735ee..560dcea 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -6,7 +6,7 @@
:rules="registerRules"
class="register-form"
>
- <h3 class="title">娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴</h3>
+ <h3 class="title">鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴</h3>
<el-form-item prop="username">
<el-input
v-model="registerForm.username"
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index a7023e7..bfd949a 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -1510,7 +1510,7 @@
ruleForm: {
templateName: "",
revisitBefore:
- "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
revisitAfter:
"璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
ivrLibaTemplateTagList: [],
diff --git a/src/views/repositoryai/templateku/configurat/taskub.vue b/src/views/repositoryai/templateku/configurat/taskub.vue
index d3807f1..2421f41 100644
--- a/src/views/repositoryai/templateku/configurat/taskub.vue
+++ b/src/views/repositoryai/templateku/configurat/taskub.vue
@@ -1508,7 +1508,7 @@
ruleForm: {
templateName: "",
revisitBefore:
- "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
revisitAfter:
"璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
ivrLibaTemplateTagList: [],
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 19c4bf8..6fb0d9f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -763,6 +763,8 @@
remark: undefined,
postIds: [],
roleIds: [],
+ deptCodes:[],
+ wardCodes:[],
};
this.resetForm("form");
},
@@ -820,10 +822,16 @@
this.form = response.data;
this.belongDepts = response.belongDepts;
this.belongWards = response.belongWards;
- if (this.form.hospInfo)
+ if (this.form.hospInfo){
this.form.deptCodes = JSON.parse(this.form.hospInfo);
- if (this.form.deptInfo)
+ }else{
+ this.form.deptCodes = [];
+ }
+ if (this.form.deptInfo){
this.form.wardCodes = JSON.parse(this.form.deptInfo);
+ }else{
+ this.form.wardCodes = [];
+ }
console.log(this.form.wardCodes, "wardCodes");
console.log(this.form.deptCodes, "deptCodes");
diff --git a/vue.config.js b/vue.config.js
index 7e0400f..b905fd1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴' // 缃戦〉鏍囬
+const name = process.env.VUE_APP_TITLE || '鏃犻敗鍎跨鍖婚櫌鏅烘収闅忚骞冲彴' // 缃戦〉鏍囬
const port = process.env.port || process.env.npm_config_port || 8093 // 绔彛
--
Gitblit v1.9.3