From 2c4c416bf7950c72ffa2543a218e4fd993ee2af2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 九月 2024 12:04:32 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 40 +-
src/views/system/user/index.vue | 39 +++
src/api/system/user.js | 10
src/views/outsideChainwt.vue | 178 ++++++++-------
interior.zip | 0
src/api/AiCentre/Qtemplate.js | 8
src/views/knowledge/questionnaire/compilequer/index.vue | 131 +++++------
external.zip | 0
src/views/followvisit/discharge/index.vue | 125 ++++++----
src/views/patient/propaganda/QuestionnaireTask.vue | 81 ++++--
10 files changed, 348 insertions(+), 264 deletions(-)
diff --git a/external.zip b/external.zip
new file mode 100644
index 0000000..876f214
--- /dev/null
+++ b/external.zip
Binary files differ
diff --git a/interior.zip b/interior.zip
new file mode 100644
index 0000000..b1b12fd
--- /dev/null
+++ b/interior.zip
Binary files differ
diff --git a/src/api/AiCentre/Qtemplate.js b/src/api/AiCentre/Qtemplate.js
index ffd5fbd..5047e02 100644
--- a/src/api/AiCentre/Qtemplate.js
+++ b/src/api/AiCentre/Qtemplate.js
@@ -112,6 +112,14 @@
data: data,
});
}
+ // 鏌ヨ闂嵎浠诲姟璇︽儏
+ export function Questionnairetaskgetson(data) {
+ return request({
+ url: "/smartor/serviceSubtask/queryTaskByCondition",
+ method: "post",
+ data: data,
+ });
+ }
// 闂嵎浠诲姟妯℃澘鏂板淇敼
export function TaskQuestioncomit(data) {
return request({
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 6bb7965..87aaf6c 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -120,7 +120,7 @@
// 淇濆瓨鎺堟潈瑙掕壊
export function updateAuthRole(data) {
return request({
- url: '/system/user/authRole/edit',
+ url: '/system/user/authRole',
method: 'post',
params: data
})
@@ -133,3 +133,11 @@
method: 'get'
})
}
+// 鏂板绉戝/鐥呭尯
+export function adduserdept(data) {
+ return request({
+ url: '/smartor/userdept/add',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index a8d9bf0..6b568b6 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -13,9 +13,9 @@
<el-form-item label="浠诲姟鍚嶇О">
<el-input v-model="topqueryParams.taskName"></el-input>
</el-form-item>
- <el-form-item label="鍙戣捣浜�">
+ <!-- <el-form-item label="鍙戣捣浜�">
<el-input v-model="topqueryParams.createBy"></el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="瀹℃牳鏃堕棿">
<el-date-picker
v-model="dateRange"
@@ -41,7 +41,7 @@
<el-form-item label="妯℃澘鍚嶇О" prop="status">
<el-input v-model="topqueryParams.templatename"></el-input>
</el-form-item>
- <el-form-item label="鍑洪櫌闅忚鐘舵��" prop="status">
+ <el-form-item label="闅忚鐘舵��" prop="status">
<el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
<el-option
v-for="item in topicoptions"
@@ -173,44 +173,6 @@
@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="sendname"
- prop="sendname"
- />
- <el-table-column
- label="鐥呭巻鍙�"
- align="center"
- sortable
- key="medicalRecordNo"
- prop="medicalRecordNo"
- width="120"
- />
-
- <el-table-column label="骞撮緞" align="center" key="age" prop="age" />
- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" />
- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" />
- <el-table-column
- label="鐥呭尯"
- align="center"
- key="deptname"
- prop="deptname"
- width="120"
- >
- </el-table-column>
-
- <el-table-column
- label="鐤剧梾鍚嶇О"
- align="center"
- key="icdName"
- prop="icdName"
- width="120"
- :show-overflow-tooltip="true"
- >
- </el-table-column>
<el-table-column
label="浠诲姟鍚嶇О"
align="center"
@@ -218,33 +180,88 @@
prop="taskName"
width="120"
/>
+ <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
+ <el-table-column
+ label="濮撳悕"
+
+ align="center"
+ key="sendname"
+ prop="sendname"
+ />
+ <el-table-column
+ label="韬唤璇佸彿鐮�"
+
+ width="200"
+ align="center"
+ key="sfzh"
+ prop="sfzh"
+ />
+ <!-- <el-table-column
+ label="鐥呭巻鍙�"
+ align="center"
+ sortable
+ key="medicalRecordNo"
+ prop="medicalRecordNo"
+ width="120"
+ /> -->
+
+ <!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
+ <!-- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" /> -->
+ <!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
+ <!-- <el-table-column
+ label="绉戝"
+ align="center"
+ key="deptname"
+ prop="deptname"
+ width="120"
+ >
+ </el-table-column> -->
+ <el-table-column
+ label="鐥呭尯"
+ align="center"
+ key="leavehospitaldistrictname"
+ prop="leavehospitaldistrictname"
+ width="120"
+ >
+ </el-table-column>
+
+ <!-- <el-table-column
+ label="鐤剧梾鍚嶇О"
+ align="center"
+ key="icdName"
+ prop="icdName"
+ width="120"
+ :show-overflow-tooltip="true"
+ >
+ </el-table-column> -->
<el-table-column
- label="闅忚鏂瑰紡锛堥渶璋冩暣鏍煎紡锛�"
+ label="妯℃澘鍚嶇О"
align="center"
- key="serviceform"
- prop="serviceform"
- width="120"
+ key="templatename"
+ prop="templatename"
+ width="200"
/>
+
<el-table-column
label="闅忚浜哄憳"
align="center"
- key="operator"
- prop="operator"
+ key="createBy"
+ prop="createBy"
width="120"
/>
- <el-table-column
- label="灏辫瘖鏃堕棿"
+ <!-- <el-table-column
+ label="鍑洪櫌鏃堕棿"
sortable
align="center"
- prop="admindate"
+ prop="createTime"
width="160"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.admindate) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column
label="闅忚鏃堕棿"
sortable
@@ -270,7 +287,7 @@
<span>{{ formatTime(scope.row.finishtime) }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="闅忚鐘舵��"
fixed="right"
align="center"
@@ -282,7 +299,7 @@
<template slot-scope="scope">
<dict-tag :options="serviceState" :value="scope.row.sendstate" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 8435edd..1ebd6f8 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -154,6 +154,22 @@
<span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
</template>
</el-table-column>
+
+ <el-table-column
+ label="鐘舵��"
+ align="center"
+ key="sendState"
+ prop="sendState"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.task_status"
+ :value="scope.row.sendState"
+ />
+ </template>
+ </el-table-column>
+
<el-table-column
label="鍒涘缓浜�"
align="center"
@@ -173,26 +189,12 @@
<span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鐘舵��"
- fixed="right"
- align="center"
- key="sendState"
- prop="sendState"
- width="120"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.task_status"
- :value="scope.row.sendState"
- />
- </template>
- </el-table-column>
+
<el-table-column
label="鎿嶄綔"
fixed="right"
align="center"
- width="120"
+ width="180"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -202,13 +204,13 @@
type="text"
@click="sponsor(scope.row)"
><span class="button-zx"
- ><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
+ ><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
@@ -217,7 +219,7 @@
type="text"
@click="stop(scope.row)"
><span class="button-zt"
- ><i class="el-icon-circle-plus-outline"></i>鏆傚仠浠诲姟</span
+ ><i class="el-icon-circle-plus-outline"></i>鏆傚仠</span
></el-button
>
</template>
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 7d0fc22..4c9e463 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -81,15 +81,37 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="20">
+ <el-col :span="10">
+ <el-form-item label="鍙敤鐘舵��" prop="isAvailable">
+ <el-radio-group v-model="ruleForm.isAvailable">
+ <el-radio
+ v-for="(item, index) in usable"
+ :label="item.value"
+ >{{ item.label }}</el-radio
+ >
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鐗堟湰鍙�" prop="name">
+ <el-input
+ v-model="ruleForm.version"
+ placeholder="榛樿1.0"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="闂嵎鏍囬" prop="svyname">
- <div style="width: 30%">
+ <div style="width: 55vw">
<el-input v-model="ruleForm.svyname"></el-input>
</div>
</el-form-item>
<el-form-item label="闂嵎鎻忚堪" prop="description">
<el-input
- style="width: 40vw"
+ style="width: 55vw"
type="textarea"
+ :rows="5"
autosize
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="ruleForm.description"
@@ -98,19 +120,19 @@
></el-form-item>
<el-row>
- <el-form-item prop="dynamicTags" >
+ <el-form-item prop="dynamicTags">
<template #label>
- 鏍囩
- <el-tooltip
- class="item"
- effect="light"
- content="鍑嗙‘銆佹壖瑕併�佸閲嶇殑鏍囩锛屽彲浠ヨ鎮ㄥ湪绯荤粺浣跨敤涓柟渚跨殑鏌ユ壘鍒拌妯＄増銆�"
- placement="top-start"
- >
- <i class="el-icon-warning-outline"></i>
- </el-tooltip>
- <!-- 鍦ㄦ爣绛惧悗鎻掑叆绾㈣壊鏄熷彿 -->
- </template>
+ 鏍囩
+ <el-tooltip
+ class="item"
+ effect="light"
+ content="鍑嗙‘銆佹壖瑕併�佸閲嶇殑鏍囩锛屽彲浠ヨ鎮ㄥ湪绯荤粺浣跨敤涓柟渚跨殑鏌ユ壘鍒拌妯＄増銆�"
+ placement="top-start"
+ >
+ <i class="el-icon-warning-outline"></i>
+ </el-tooltip>
+ <!-- 鍦ㄦ爣绛惧悗鎻掑叆绾㈣壊鏄熷彿 -->
+ </template>
<div class="xinz-inf">
<el-tag
:key="tag.tagname"
@@ -154,7 +176,7 @@
</el-form-item>
</el-row>
<div class="xinz-infs">
- <el-form-item >
+ <el-form-item>
<template #label>
閫傜敤鐤剧梾
<el-tooltip
@@ -166,6 +188,13 @@
<i class="el-icon-warning-outline"></i>
</el-tooltip>
</template>
+ <div style="margin-bottom: 10px">
+ <el-button
+ type="warning"
+ @click="$refs.child.handleAddpatient()"
+ >娣诲姞鐤剧梾璇婃柇</el-button
+ >
+ </div>
<el-tag
v-for="tag in displayedTags"
:key="tag.icdid"
@@ -177,34 +206,11 @@
<el-tag v-if="hasMore" type="info">+{{ remaining }} more</el-tag>
</el-form-item>
</div>
- <div style="margin-left: 120px; margin-bottom: 10px">
- <el-button type="warning" @click="$refs.child.handleAddpatient()"
- >鐤剧梾璇︽儏</el-button
- >
- </div>
- <el-row :gutter="20">
- <el-col :span="6">
- <el-form-item label="鐗堟湰鍙�" prop="name">
- <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="isAvailable">
- <el-radio-group v-model="ruleForm.isAvailable">
- <el-radio
- v-for="(item, index) in usable"
- :label="item.value"
- >{{ item.label }}</el-radio
- >
- </el-radio-group>
- </el-form-item></el-col
- >
- </el-row>
+
<el-form-item label="闂嵎鏂瑰紡" prop="suitway">
<el-select
v-model="ruleForm.suitway"
+ style="width: 55vw"
size="medium"
multiple
filterable
@@ -222,28 +228,10 @@
</el-form-item>
<el-row>
- <el-col :span="10"
- ><el-form-item label="閫傜敤闄㈠尯" prop="region">
- <el-select
- v-model="ruleForm.campus"
- size="medium"
- filterable
- placeholder="璇烽�夋嫨鍒嗙被"
- >
- <el-option
- class="ruleFormaa"
- v-for="item in courtyardlist"
- :key="item.label"
- :label="item.label"
- :value="item.label"
- >
- </el-option>
- </el-select> </el-form-item
- ></el-col>
- <el-col :span="12"
+ <el-col :span="20"
><el-form-item label="閫傜敤绉戝" prop="region">
<el-cascader
- style="width: 400px;"
+ style="width: 55vw"
v-model="tempDetpRelevanceslist"
:options="deptList"
:props="props"
@@ -262,8 +250,9 @@
</el-row>
<el-form-item label="闂嵎缁撴潫璇�" prop="conclusion">
<el-input
- style="width: 40vw"
+ style="width: 55vw; line-height: 80px"
type="textarea"
+ :rows="5"
autosize
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="ruleForm.conclusion"
@@ -314,7 +303,7 @@
>{{ !Operateit ? "缂栬緫棰樼洰" : "瀹屾暣淇℃伅灞曠ず" }}</el-button
>
</div>
- <div style="display: flex">
+ <div style="display: flex" v-if="ruleForm.scoreType==1">
<span
style="
width: 180px;
@@ -1231,14 +1220,14 @@
svyTemplateLibScripts: [],
tempDetpRelevances: [],
svyLibTemplateTagList: [],
- scoreType:'4',
- isAvailable:'0'
+ scoreType: "4",
+ isAvailable: "0",
},
indexform: {
svyLibTemplateTargetoptions: [],
},
- // 琛ㄥ崟鏍￠獙
- rules: {
+ // 琛ㄥ崟鏍￠獙
+ rules: {
categoryid: [
{ required: true, message: "闂嵎鍒嗙被涓嶈兘涓虹┖", trigger: "blur" },
],
@@ -1434,14 +1423,14 @@
// 鑾峰彇鏁版嵁
getissueinfo() {
this.id = this.$route.query.id;
- this.ruleForm= {
+ (this.ruleForm = {
svyTemplateLibScripts: [],
tempDetpRelevances: [],
svyLibTemplateTagList: [],
- scoreType:'4',
- isAvailable:'0'
- },
- this.topicobj = {};
+ scoreType: "4",
+ isAvailable: "0",
+ }),
+ (this.topicobj = {});
if (this.id) {
getQtemplateobj({ svyid: this.id }).then((res) => {
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index 56d0f30..14aa4b4 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -36,7 +36,11 @@
<el-radio
border
v-for="(items, index) in item.svyLibTemplateTargetoptions"
- :class="items.isabnormal ? 'red-star' : ''"
+ :class="
+ items.isabnormal && item.scriptResult == items.optioncontent
+ ? 'red-star'
+ : ''
+ "
:key="index"
:label="items.optioncontent"
>{{ items.optioncontent }}</el-radio
@@ -65,7 +69,6 @@
border
@change="$forceUpdate()"
v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
- :class="items.isabnormal ? 'red-star' : ''"
:key="indexs"
:label="items.optioncontent"
>
@@ -73,6 +76,7 @@
</el-checkbox>
</el-checkbox-group>
</div>
+ <!-- :class="items.isabnormal ? 'red-star' : ''" -->
<div v-show="item.prompt && item.scriptResult[0]">
<el-alert :title="item.prompt" type="warning"> </el-alert>
</div>
@@ -156,91 +160,91 @@
patid: 265823,
kcb: "",
questionList: [
- {
- scriptType: 1,
- scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
- scriptResult: null,
- svyLibTemplateTargetoptions: [
- { optioncontent: "18-25", value: "18-25", isabnormal: true },
- { optioncontent: "26-35", value: "26-35" },
- { optioncontent: "36-45", value: "36-45" },
- { optioncontent: "46-55", value: "46-55" },
- { optioncontent: "56+", value: "56+" },
- ],
- required: true,
- },
- {
- scriptType: 1,
- scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- scriptResult: null,
- svyLibTemplateTargetoptions: [
- { optioncontent: "瀛︾敓", value: "student" },
- { optioncontent: "鏁欏笀", value: "teacher" },
- { optioncontent: "宸ョ▼甯�", value: "engineer" },
- { optioncontent: "鍖荤敓", value: "doctor" },
- { optioncontent: "鍏朵粬", value: "other" },
- ],
- required: false,
- },
- {
- scriptType: 2,
- scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
- scriptResult: [],
- svyLibTemplateTargetoptions: [
- { optioncontent: "鏃呮父", value: "travel", isabnormal: true },
- { optioncontent: "闃呰", value: "reading", isabnormal: true },
- { optioncontent: "杩愬姩", value: "sports", isabnormal: true },
- { optioncontent: "闊充箰", value: "music" },
- { optioncontent: "鐢靛奖", value: "movies" },
- ],
- required: false,
- },
- {
- scriptType: 1,
- scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- scriptResult: null,
- svyLibTemplateTargetoptions: [
- { optioncontent: "瀛︾敓", value: "student" },
- { optioncontent: "鏁欏笀", value: "teacher" },
- { optioncontent: "宸ョ▼甯�", value: "engineer" },
- { optioncontent: "鍖荤敓", value: "doctor" },
- { optioncontent: "鍏朵粬", value: "other" },
- ],
- required: false,
- },
- {
- scriptType: 1,
- scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- scriptResult: null,
- svyLibTemplateTargetoptions: [
- { optioncontent: "瀛︾敓", value: "student" },
- { optioncontent: "鏁欏笀", value: "teacher" },
- { optioncontent: "宸ョ▼甯�", value: "engineer", isabnormal: true },
- { optioncontent: "鍖荤敓", value: "doctor" },
- { optioncontent: "鍏朵粬", value: "other" },
- ],
- required: false,
- },
- {
- scriptType: 1,
- scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- scriptResult: null,
- svyLibTemplateTargetoptions: [
- { optioncontent: "瀛︾敓", value: "student" },
- { optioncontent: "鏁欏笀", value: "teacher" },
- { optioncontent: "宸ョ▼甯�", value: "engineer" },
- { optioncontent: "鍖荤敓", value: "doctor" },
- { optioncontent: "鍏朵粬", value: "other" },
- ],
- required: false,
- },
- {
- scriptType: 4,
- scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
- scriptResult: "name",
- required: true,
- scriptResult: null,
- },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "18-25", value: "18-25", isabnormal: true },
+ // { optioncontent: "26-35", value: "26-35" },
+ // { optioncontent: "36-45", value: "36-45" },
+ // { optioncontent: "46-55", value: "46-55" },
+ // { optioncontent: "56+", value: "56+" },
+ // ],
+ // required: true,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 2,
+ // scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
+ // scriptResult: [],
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "鏃呮父", value: "travel", isabnormal: true },
+ // { optioncontent: "闃呰", value: "reading", isabnormal: true },
+ // { optioncontent: "杩愬姩", value: "sports", isabnormal: true },
+ // { optioncontent: "闊充箰", value: "music" },
+ // { optioncontent: "鐢靛奖", value: "movies" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer", isabnormal: true },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 4,
+ // scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
+ // scriptResult: "name",
+ // required: true,
+ // scriptResult: null,
+ // },
],
jsy: null,
dialogVisible: false,
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 3f8df23..c9a50bf 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -338,7 +338,7 @@
@details="detailhz"
@handleUpdate="handleUpdate"
:currentList="overallCase"
- :tableLabel="tableLabelhz"
+ :tableLabel="tableLabelhzwb"
:serialnumber="false"
:searchTrue="true"
:multiplechoice="false"
@@ -597,7 +597,7 @@
getQtemplatelist,
getQtemplateobj,
TaskQuestioncomit,
- Questionnairetaskget,
+ Questionnairetaskgetson,
gethetaskinfo,
delhetaskinfo,
Editsingletask,
@@ -630,13 +630,25 @@
questionList: [],
// 鎮ｈ�呰〃鍗�
tableLabelhz: [
- { label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
- { label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
- { label: "鍖荤敓", width: "", prop: "drname" },
- { label: "绉戝", width: "", prop: "deptName" },
- { label: "灏辫瘖/鍑洪櫌鏃ユ湡", width: "280", prop: "inhosptime" },
+ { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+ { label: "鎮ｈ��", width: "", prop: "name" },
+ { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "鍖荤敓", width: "", prop: "drname" },
+ { label: "绉戝", width: "240", prop: "deptname" },
+ { label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
+ ],
+ // 鎮ｈ�呰〃鍗�
+ tableLabelhzwb: [
+ { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+ { label: "鎮ｈ��", width: "", prop: "name" },
+ { label: "韬唤璇�", width: "200", prop: "sfzh" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "鍖荤敓", width: "", prop: "drname" },
+ { label: "绉戝", width: "180", prop: "deptName" },
+ { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
],
tableLabelwj: [
@@ -753,7 +765,7 @@
templateid: null,
libtemplateid: null,
kcb:'浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�',
- jsy:'鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
+ jsy:'璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
},
taskoptions: [
{
@@ -1013,6 +1025,8 @@
},
// 淇濆瓨
submitForm(formName) {
+ console.log(this.form.patTaskRelevances,'1.patTaskRelevances');
+ console.log(this.overallCase,'this.form.overallCase');
if (this.time4 && this.form.sendType == 3)
this.form.showTimeMorn = this.time4;
this.form.sendTimeslot = [
@@ -1041,7 +1055,7 @@
} else {
return this.$modal.msgError("鏃堕棿淇℃伅缂哄け");
}
-
+ console.log(this.form.patTaskRelevances,'2.patTaskRelevances');
const filteredArray = this.variableList.filter(
(item) =>
item.name !== "濮撳悕" && item.name !== "鐢佃瘽" && item.name !== "鍦板潃"
@@ -1141,13 +1155,14 @@
});
if (this.patientqueryParams.allhosp == 1) {
this.tableLabelhz = [
+ { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "鍖荤敓", width: "", prop: "drname" },
- { label: "绉戝", width: "", prop: "deptName" },
- { label: "灏辫瘖/鍑洪櫌鏃ユ湡", width: "280", prop: "inhosptime" },
+ { label: "绉戝", width: "180", prop: "deptname" },
+ { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
} else if (this.patientqueryParams.allhosp == 2) {
this.tableLabelhz = [
@@ -1155,7 +1170,8 @@
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
{ label: "璇婃柇", width: "", prop: "diagname" },
- { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+ { label: "绉戝", width: "", prop: "deptname" },
+ { label: "鐥呭尯", width: "", prop: "leavehospitaldistrictname" },
{ label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
{ label: "鍒涘缓浜�", width: "", prop: "createBy" },
];
@@ -1181,8 +1197,8 @@
handleExport() {},
// 閫夋嫨鎮ｈ�呰〃鏁版嵁
handleSelectionChange(selection) {
- console.log("澶氶�夋偅鑰�");
- this.SelectPatientslist = selection;
+ console.log("澶氶�夋偅鑰�",selection);
+ this.SelectPatientslist = structuredClone(selection);
this.multiple = !selection.length;
// 璧嬪�肩粰鏁翠綋閫変腑鏁扮粍
@@ -1192,8 +1208,15 @@
item.isoperation = 1;
item.patid = item.id;
item.hospType = this.patientqueryParams.allhosp;
+ item.sfzh = item.idcardno;
+ item.deptCode = item.deptcode;
+ item.deptName = item.deptname;
+ item.admindate = item.inhosptime;
+ item.sfzh = item.idcardno;
+ console.log(item);
this.overallCase.push(item);
this.form.patTaskRelevances.push(item);
+ console.log(this.form.patTaskRelevances,'patTaskRelevances');
}
});
},
@@ -1239,18 +1262,18 @@
},
getList() {},
handleQuery() {
- if (this.patientqueryParams.topica == 0) {
- this.patientqueryParams.leavehospitaldistrictcodes =
- store.getters.leavehospitaldistrictcodes;
- this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
- } else if (topica == 1) {
- this.patientqueryParams.leavehospitaldistrictcodes = null;
- this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
- } else if (topica == 2) {
- this.patientqueryParams.leavehospitaldistrictcodes =
- store.getters.leavehospitaldistrictcodes;
- this.patientqueryParams.leaveldeptcodes = null;
- }
+ // if (this.patientqueryParams.topica == 0) {
+ // this.patientqueryParams.leavehospitaldistrictcodes =
+ // store.getters.leavehospitaldistrictcodes;
+ // this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+ // } else if (this.patientqueryParams.topica == 1) {
+ // this.patientqueryParams.leavehospitaldistrictcodes = null;
+ // this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+ // } else if (this.patientqueryParams.topica == 2) {
+ // this.patientqueryParams.leavehospitaldistrictcodes =
+ // store.getters.leavehospitaldistrictcodes;
+ // this.patientqueryParams.leaveldeptcodes = null;
+ // }
this.handleAddpatient();
},
resetQuery() {},
@@ -1289,7 +1312,7 @@
};
this.questionList = [];
if (this.id) {
- Questionnairetaskget({ taskid: this.id }).then((res) => {
+ Questionnairetaskgetson({ taskid: this.id }).then((res) => {
let filteredArray = "";
if (res.code == 200) {
this.form = res.data;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 23cce5e..70a1b6d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -189,14 +189,14 @@
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
- <el-table-column
+ <!-- <el-table-column
label="閮ㄩ棬"
align="center"
key="deptName"
prop="dept.deptName"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
- />
+ /> -->
<el-table-column
label="鎵嬫満鍙风爜"
align="center"
@@ -532,6 +532,7 @@
addUser,
updateUser,
resetUserPwd,
+ adduserdept,
changeUserStatus,
deptTreeSelect,
} from "@/api/system/user";
@@ -582,7 +583,7 @@
children: "children",
label: "label",
},
- props: { multiple: true, value: "id", label: "label" },
+ props: { multiple: true, value: "deptCode", label: "label" },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -789,8 +790,12 @@
const userId = row.userId || this.ids;
getUser(userId).then((response) => {
this.form = response.data;
+
this.form.leaveldeptcodes = JSON.parse(this.form.hospInfo);
this.form.leavehospitaldistrictcodes = JSON.parse(this.form.deptInfo);
+ console.log(this.form.leavehospitaldistrictcodes,'leavehospitaldistrictcodes');
+ console.log(this.form.leaveldeptcodes,'leaveldeptcodes');
+
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
@@ -831,6 +836,9 @@
this.form.leavehospitaldistrictcodes = this.form.leavehospitaldistrictcodes.map(
(subArr) => subArr[subArr.length - 1]
);
+ console.log(this.form.leavehospitaldistrictcodes,'leavehospitaldistrictcodes');
+ console.log(this.form.leaveldeptcodes,'leaveldeptcodes');
+
this.$refs["form"].validate((valid) => {
if (valid) {
@@ -850,6 +858,31 @@
}
});
},
+ // 鏂板鏁版嵁
+ adduserdept(){
+ if (this.form.leavehospitaldistrictcodes[0]) {
+ this.form.leavehospitaldistrictcodes.forEach((dept) => {
+ adduserdept({deptCode:dept,deptType:2,userId:this.form.userId}).then((response) => {
+ this.open = false;
+ this.getList();
+ });
+ })
+ }
+ if (this.form.leaveldeptcodes[0]) {
+ this.form.leaveldeptcodes.forEach((dept) => {
+ adduserdept({deptCode:dept,deptType:1,userId:this.form.userId}).then((response) => {
+ this.open = false;
+ this.getList();
+ });
+ })
+ }
+
+ adduserdept(this.form).then((response) => {
+ this.$modal.msgSuccess("娣诲姞鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const userIds = row.userId || this.ids;
--
Gitblit v1.9.3