From dacf3c6ae5ede1c0a8a8b4afb24e2a3b62f0e368 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 21 十一月 2023 15:39:28 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/followvisit/tasklist/FollowupDetails/index.vue | 913 ++++++++++++++++++++++++++-------------------------------
1 files changed, 417 insertions(+), 496 deletions(-)
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index f67a271..fb1809f 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -2,14 +2,10 @@
<div class="Questionnairemanagement">
<!-- 宸︿晶鏍� -->
<div class="sidecolumn">
- <div style="height: 400px">
+ <div style="height: 300px">
<el-steps direction="vertical" :active="Editprogress">
<el-step title="鍩虹淇℃伅"></el-step>
<el-step title="浠诲姟璇︽儏璁剧疆"></el-step>
- <el-step
- title="娲鹃�佹偅鑰呰缃�"
- description="杩欐槸涓�娈靛緢闀垮緢闀垮緢闀跨殑鎻忚堪鎬ф枃瀛�"
- ></el-step>
</el-steps>
</div>
</div>
@@ -92,179 +88,7 @@
}}</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</div>
- <!-- 闂嵎璁剧疆 -->
- <!-- <div v-if="Editprogress == 2">
- <div class="leftvlue-jbxx">
- <div class="examine-jic">
- <div class="headline">鏂规璁剧疆</div>
- <div class="jic-value">
- <el-form ref="form" :model="form" label-width="105px">
- <el-form-item label="鎮ｈ�呮潵婧�">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑洪櫌绉戝" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑洪櫌鐥呭尯" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="涓嶅寘鍚�"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎮ｈ�呮潵婧�" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="灏辫瘖绉戝" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閲嶅璁″垝澶勭悊:">
- <el-radio-group v-model="form.resource">
- <el-radio label="鏂拌鍒掕嚜鍔ㄧ粨妗�"></el-radio>
- <el-radio label="鍘熻鍒掕嚜鍔ㄧ粨妗�"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="杩囨湡浠诲姟澶勭悊:">
- <el-radio-group v-model="form.resource">
- <el-radio label="鑷姩鍏抽棴"></el-radio>
- <el-radio label="鑷姩鎵ц"></el-radio>
- <el-radio label="浜哄伐澶勭悊"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鎵�鏈変换鍔″畬鎴愯嚜鍔ㄧ粨妗�:" label-width="158px">
- <el-radio-group v-model="form.resource">
- <el-radio label="鏄�"></el-radio>
- <el-radio label="鍚�"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="">
- <el-row gutter="5">
- <el-col :span="8"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨鑷姩缁撴鏂瑰紡">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- <el-row gutter="5">
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨鎮ｈ�呯姸鎬�">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- <el-row type="flex" gutter="5">
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- </el-form-item>
- </el-form>
- </div>
- </div>
- </div>
- <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
- <el-button type="success" @click="submitForm('ruleForm')"
- >涓嬩竴姝�</el-button
- >
- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
- </div> -->
<!-- 浠诲姟璇︽儏 -->
<div v-if="Editprogress == 2">
<div class="leftvlue-jbxx">
@@ -314,7 +138,7 @@
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in topicoptions"
+ v-for="item in taskoptions"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -357,11 +181,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-select
- v-model="topqueryParams.topic"
+ v-model="tasktopic"
placeholder="璇烽�夋嫨鏂板绫诲瀷"
>
<el-option
- v-for="item in topicoptions"
+ v-for="item in taskoptions"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -375,23 +199,13 @@
plain
icon="el-icon-plus"
size="medium"
+ :disabled="!tasktopic"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>鏂板</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"
@@ -425,43 +239,37 @@
<el-table-column
label="搴忓彿"
align="center"
- key="userId"
- prop="userId"
+ key="id"
+ prop="id"
/>
<el-table-column
label="浠诲姟鍚嶇О"
align="center"
sortable
- key="userName"
- prop="userName"
+ key="name"
+ prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
label="鏈嶅姟妯℃澘"
align="center"
- key="types"
- prop="types"
+ key="impTemplate"
+ prop="impTemplate"
/>
<el-table-column
label="鍒涘缓鏃ユ湡"
align="center"
- key="nickName"
- prop="nickName"
+ key="create_time"
+ prop="create_time"
/>
<el-table-column
- label="寰呮墽琛�/鎬绘暟"
+ label="鎵ц鐘舵��"
align="center"
key="phonenumber"
prop="phonenumber"
width="120"
- >
- <template slot-scope="scope">
- <span style="margin-left: 10px"
- >{{ scope.row.date }}/{{ scope.row.data }}</span
- >
- </template>
- </el-table-column>
+ />
<el-table-column
label="鎵ц鐘舵��"
@@ -476,20 +284,20 @@
</template>
</el-table-column>
<el-table-column
- label="瀹℃牳浜�"
+ label="鏇存柊浜�"
align="center"
- key="topicnumberaa"
- prop="topicnumberaa"
+ key="update_by"
+ prop="update_by"
sortable
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="瀹℃牳鏃堕棿"
+ label="鏇存柊鏃堕棿"
sortable
align="center"
- prop="createTime"
+ prop="update_time"
width="160"
>
<template slot-scope="scope">
@@ -566,208 +374,8 @@
</div>
<el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
<el-button type="success" @click="submitForm('ruleForm')"
- >涓嬩竴姝�</el-button
- >
- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
- </div>
- <!-- 缁撴灉鍙嶉 -->
- <div v-if="Editprogress == 3">
- <div class="leftvlue-jbxx">
- <div class="examine-jic">
- <div class="headline">
- <div>娲鹃�佹偅鑰呭垪琛�</div>
- <div class="Add-details">+娣诲姞</div>
- </div>
- <div class="examine-jic">
- <div class="jic-value">
- <el-row :gutter="20">
- <!--鐢ㄦ埛鏁版嵁-->
-
- <el-form
- :model="topqueryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="98px"
- >
- <el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
-
- <el-form-item label="浠诲姟绫诲瀷" prop="status">
- <el-select
- v-model="topqueryParams.topic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="浠诲姟鐘舵��" prop="status">
- <el-select
- v-model="topqueryParams.topic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="medium"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="medium"
- @click="resetQuery"
- >閲嶇疆</el-button
- >
- </el-form-item>
- </el-form>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="medium"
- @click="handleAddpatient"
- v-hasPermi="['system:user:add']"
- >鏂板</el-button
- >
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="medium"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:user:remove']"
- >鍒犻櫎</el-button
- >
- </el-col>
- <!-- <el-col :span="1.5"> </el-col> -->
- </el-row>
-
- <el-table
- v-loading="loading"
- :data="userList"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
- type="selection"
- width="50"
- align="center"
- />
- <el-table-column
- label="搴忓彿"
- align="center"
- key="userId"
- prop="userId"
- />
-
- <el-table-column
- label="鎮ｈ�呭悕绉�"
- align="center"
- sortable
- key="userName"
- prop="userName"
- :show-overflow-tooltip="true"
- />
-
- <el-table-column
- label="鍏ラ櫌鏃ユ湡"
- align="center"
- key="nickName"
- prop="nickName"
- />
- <el-table-column
- label="鎵ц鐘舵��"
- align="center"
- key="topicnumber"
- prop="topicnumber"
- width="120"
- :show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <div>鎵ц瀹屾垚/鎵ц澶辫触</div>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="120"
- class-name="small-padding fixed-width"
- >
- <template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-zx"
- ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span
- ></el-button
- >
- </template>
- </el-table-column>
- <el-table-column
- label="浠诲姟璇︽儏"
- align="center"
- width="200"
- class-name="small-padding fixed-width"
- >
- <template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-xq"
- ><i class="el-icon-s-data"></i>璇︽儏</span
- ></el-button
- >
-
- <el-button
- size="medium"
- type="text"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-sc"
- ><i class="el-icon-delete"></i>鍒犻櫎</span
- ></el-button
- >
- </template>
- </el-table-column>
- </el-table>
- </el-row>
- </div>
- </div>
- </div>
- </div>
- <el-button type="success" @click="submitForm('ruleForm')"
>绔嬪嵆鍒涘缓</el-button
>
- <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</div>
</div>
@@ -776,7 +384,7 @@
title="浠诲姟璇︽儏"
:visible.sync="dialogVisible"
width="60%"
- :before-close="handleClose"
+ :before-close="handleCloserw"
>
<div class="jic-value">
<div class="details-jic">
@@ -1013,6 +621,201 @@
</div>
</div>
</div>
+ <div class="leftvlue-jbxx">
+ <div class="examine-jic">
+ <div class="headline">
+ <div>娲鹃�佹偅鑰呭垪琛�</div>
+ <div class="Add-details">+娣诲姞</div>
+ </div>
+ <div class="examine-jic">
+ <div class="jic-value">
+ <el-row :gutter="20">
+ <!--鐢ㄦ埛鏁版嵁-->
+
+ <el-form
+ :model="deliverytopqueryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="98px"
+ >
+ <el-form-item label="浠诲姟鍚嶇О">
+ <el-input v-model="deliverytopqueryParams.name"></el-input>
+ </el-form-item>
+
+ <el-form-item label="浠诲姟绫诲瀷" prop="status">
+ <el-select
+ v-model="deliverytopqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in topicoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="浠诲姟鐘舵��" prop="status">
+ <el-select
+ v-model="deliverytopqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in topicoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="medium"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button
+ icon="el-icon-refresh"
+ size="medium"
+ @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="medium"
+ @click="handleAddpatient"
+ v-hasPermi="['system:user:add']"
+ >鏂板</el-button
+ >
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="medium"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:user:remove']"
+ >鍒犻櫎</el-button
+ >
+ </el-col>
+ <!-- <el-col :span="1.5"> </el-col> -->
+ </el-row>
+
+ <el-table
+ v-loading="loading"
+ :data="sonuserList"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="50" align="center" />
+ <el-table-column
+ label="搴忓彿"
+ align="center"
+ key="userId"
+ prop="userId"
+ />
+
+ <el-table-column
+ label="鎮ｈ�呭悕绉�"
+ align="center"
+ sortable
+ key="userName"
+ prop="userName"
+ :show-overflow-tooltip="true"
+ />
+
+ <el-table-column
+ label="鍏ラ櫌鏃ユ湡"
+ align="center"
+ key="nickName"
+ prop="nickName"
+ />
+ <el-table-column
+ label="鎵ц鐘舵��"
+ align="center"
+ key="topicnumber"
+ prop="topicnumber"
+ width="120"
+ :show-overflow-tooltip="true"
+ />
+ <!-- <template slot-scope="scope">
+ <div>鎵ц瀹屾垚/鎵ц澶辫触</div>
+ </template>
+ </el-table-column> -->
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ width="120"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-zx"
+ ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span
+ ></el-button
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="浠诲姟璇︽儏"
+ align="center"
+ width="300"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-xq"
+ ><i class="el-icon-s-data"></i>璇︽儏</span
+ ></el-button
+ >
+
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-sc"
+ ><i class="el-icon-delete"></i>鍒犻櫎</span
+ ></el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-row>
+ <pagination
+ v-show="sontotal > 0"
+ :total="sontotal"
+ :page.sync="deliverytopqueryParams.pageNum"
+ :limit.sync="deliverytopqueryParams.pageSize"
+ @pagination="handleAdd"
+ />
+ </div>
+ </div>
+ </div>
+ </div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="dialogVisible = false"
@@ -1025,15 +828,14 @@
title="娣诲姞娲惧彂鎮ｈ��"
:visible.sync="dialogVisiblepatient"
width="70%"
- :before-close="handleClose"
+ :before-close="handleClosehz"
>
<div class="examine-jic">
<div class="jic-value">
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
-
<el-form
- :model="topqueryParams"
+ :model="patientqueryParams"
ref="queryForm"
size="small"
:inline="true"
@@ -1041,10 +843,13 @@
label-width="98px"
>
<el-form-item label="鎮ｈ�呭悕绉帮細">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-input v-model="patientqueryParams.name"></el-input>
</el-form-item>
<el-form-item label="鎮ｈ�呮潵婧�" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1055,7 +860,10 @@
</el-select>
</el-form-item>
<el-form-item label="鍑洪櫌绉戝" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1067,7 +875,10 @@
</el-form-item>
<el-form-item label="鍑洪櫌鐥呭尯" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1089,51 +900,47 @@
icon="el-icon-refresh"
size="medium"
@click="resetQuery"
- >閲嶇疆</el-button
+ >鍙栨秷鍒涘缓</el-button
>
</el-form-item>
</el-form>
<el-table
- v-loading="loading"
- :data="userList"
+ v-loading="patientloading"
+ :data="patientuserList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
label="搴忓彿"
align="center"
- key="userId"
- prop="userId"
+ key="patid"
+ prop="patid"
/>
<el-table-column
label="鎮ｈ�呭悕绉�"
align="center"
sortable
- key="userName"
- prop="userName"
+ key="name"
+ prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="鍏ラ櫌鏃ユ湡"
+ label="鎮ｈ�呮潵婧�"
align="center"
- key="nickName"
- prop="nickName"
+ key="source"
+ prop="source"
/>
<el-table-column
- label="鎵ц鐘舵��"
+ label="鎵嬫満鍙风爜"
align="center"
- key="topicnumber"
- prop="topicnumber"
+ key="telcode"
+ prop="telcode"
width="120"
:show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <div>鎵ц瀹屾垚/鎵ц澶辫触</div>
- </template>
- </el-table-column>
+ />
<el-table-column
label="浠诲姟璇︽儏"
@@ -1165,11 +972,18 @@
</el-table-column>
</el-table>
</el-row>
+ <pagination
+ v-show="patienttotal > 0"
+ :total="patienttotal"
+ :page.sync="patientqueryParams.pageNum"
+ :limit.sync="patientqueryParams.pageSize"
+ @pagination="handleAddpatient"
+ />
</div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisible = false"
+ <el-button @click="dialogVisiblepatient = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="AddDispatchpatients"
>纭畾娣诲姞</el-button
>
</span>
@@ -1178,17 +992,42 @@
</template>
<script>
+import {
+ listsvr_prjtask,
+ getsvr_prjtask,
+ addsvr_prjtask,
+ updatesvr_prjtask,
+ delsvr_prjtask,
+ Addpatienttask,
+} from "@/api/smartorpor/svr_prjtask";
+import { listpat_archive } from "@/api/smartorpor/pat_archive";
+import { listsvr_prjtaskline } from "@/api/smartorpor/svr_prjtaskline";
+
export default {
data() {
return {
Editprogress: 2, //缂栬緫杩涘害
loading: false, // 閬僵灞�
+ patientloading: false, // 閬僵灞�
dialogVisible: false, //浠诲姟璇︽儏寮规
dialogVisiblepatient: false, //娣诲姞鎮ｈ�呭脊妗�
- topqueryParams: {},
+ topqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
+ deliverytopqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
+ patientqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
topicoptions: [],
showSearch: true, //
total: 0, //
+ sontotal: 0, //
+ patienttotal: 0, //
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -1197,6 +1036,9 @@
multiple: true,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
+ patientuserList: null,
+ sonuserList: null,
+ tasktopic: null, //鏂板绫诲瀷
form: {
name: "",
region: "",
@@ -1229,11 +1071,33 @@
label: "鍖椾含鐑ら腑",
},
],
+ taskoptions: [
+ {
+ value: "1",
+ label: "閫氱煡",
+ },
+ {
+ value: "2",
+ label: "闅忚",
+ },
+ {
+ value: "3",
+ label: "闂嵎",
+ },
+ {
+ value: "4",
+ label: "瀹ｆ暀",
+ },
+ ],
quote: false,
};
},
- created() {},
+ created() {
+ this.Addsubtask();
+ this.Getsubtask();
+
+ },
methods: {
// 涓嬩竴姝�
@@ -1251,24 +1115,48 @@
// }
// });
},
+ // 瀛愪换鍔′竴绾у脊妗�
handleAdd() {
+ this.multiple = true;
+ listsvr_prjtaskline(this.deliverytopqueryParams).then((response) => {
+ console.log(response);
+ this.sonuserList = response.rows;
+ this.sontotal = response.total;
+ this.loading = false;
+ });
this.dialogVisible = true;
},
+ // 瀛愪换鍔′簩绾у脊妗�
handleAddpatient() {
+ console.log(this.multiple);
+ listpat_archive(this.patientqueryParams).then((response) => {
+ console.log(response);
+ this.patientuserList = response.rows;
+ this.patienttotal = response.total;
+ this.loading = false;
+ });
this.dialogVisiblepatient = true;
},
handleUpdate() {},
handleDelete() {},
handleExport() {},
- handleSelectionChange() {},
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = null;
+ this.ids = selection.map((item) => item.patid).join(",");
+ // let result = this.ids.join(",");
+ this.multiple = !selection.length;
+ console.log(this.ids);
+ },
getList() {},
handleQuery() {},
resetQuery() {},
- handleClose() {
+ handleCloserw() {
this.dialogVisible = false;
+ },
+ handleClosehz() {
this.dialogVisiblepatient = false;
},
-
// 涓婁竴姝�
laststep() {
this.Editprogress--;
@@ -1282,6 +1170,37 @@
Acknowledgereference() {
this.quote = true;
},
+ // 鏂板瀛愪换鍔�
+ Addsubtask() {
+ this.topqueryParams.pguid = 2;
+ // addsvr_prjtask(this.topqueryParams).then((res) => {
+ // console.log(res);
+ // });
+ },
+ // 鏂板娲鹃�佹偅鑰�
+ AddDispatchpatients() {
+ let objictpint = {};
+ objictpint.patientes = this.ids;
+ objictpint.pguid = 2;
+ Addpatienttask(objictpint).then((res) => {
+ console.log(res);
+ });
+ this.dialogVisiblepatient = false;
+ },
+
+ // 鏌ヨ瀛愪换鍔″垪琛�
+ Getsubtask() {
+ this.topqueryParams.pguid = 2;
+ console.log(this.topqueryParams);
+ // this.topqueryParams.pid = this.$route.query.id;
+ // console.log(this.topqueryParams.pid);
+ listsvr_prjtask(this.topqueryParams).then((res) => {
+ this.userList = res.rows;
+ this.total = res.total;
+ console.log(this.userList);
+ });
+ },
+ /** 鏌ヨ鎮ｈ�呭垪琛� */
},
};
</script>
@@ -1315,69 +1234,71 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
- .leftvlue-jbxx {
- margin-bottom: 50px;
- font-size: 20px;
- span {
- position: absolute;
- right: 80px;
- }
- .demo-cascader {
- margin-right: 20px;
- }
- .PreviewTemplate {
+}
+.examine-jic {
+ .headline {
+ font-size: 24px;
+ border-left: 5px solid #41a1be;
+ padding-left: 5px;
+ margin-bottom: 10px;
+ display: flex;
+ justify-content: space-between;
+ .Add-details {
+ font-size: 18px;
color: #02a7f0;
cursor: pointer;
- font-size: 20px;
- margin: 0 20px;
}
}
- .examine-jic {
- .headline {
- font-size: 24px;
- border-left: 5px solid #41a1be;
- padding-left: 5px;
- margin-bottom: 10px;
- display: flex;
- justify-content: space-between;
- .Add-details {
- font-size: 18px;
- color: #02a7f0;
- cursor: pointer;
+ .jic-value {
+ font-size: 20px;
+ border-top: 1px solid #a7abac;
+ padding: 10px;
+ margin-bottom: 10px;
+ .details-jic {
+ padding: 10px 15px;
+ border: 1px solid #dcdfe6;
+ -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+ 0 0 6px 0 rgba(0, 0, 0, 0.04);
+ .details-title {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px;
+ div:nth-child(2) {
+ color: #02a7f0;
+ cursor: pointer;
+ }
}
- }
- .jic-value {
- font-size: 20px;
- border-top: 1px solid #a7abac;
- padding: 10px;
- .details-jic {
- padding: 10px 15px;
- border: 1px solid #dcdfe6;
- -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
- 0 0 6px 0 rgba(0, 0, 0, 0.04);
- .details-title {
- display: flex;
- justify-content: space-between;
- margin-bottom: 10px;
- div:nth-child(2) {
- color: #02a7f0;
- cursor: pointer;
- }
- }
- .details-renw {
- background: #e4ebfc;
- padding: 15px 5px;
- border-radius: 5px;
- margin-bottom: 20px;
- }
+ .details-renw {
+ background: #e4ebfc;
+ padding: 15px 5px;
+ border-radius: 5px;
+ margin-bottom: 20px;
}
}
}
}
+// .leftvlue-jbxx {
+// margin-bottom: 50px;
+// font-size: 20px;
+// span {
+// position: absolute;
+// right: 80px;
+// }
+// .demo-cascader {
+// margin-right: 20px;
+// }
+// .PreviewTemplate {
+// color: #02a7f0;
+// cursor: pointer;
+// font-size: 20px;
+// margin: 0 20px;
+// }
+// }
.jic-value {
font-size: 20px;
border-top: 1px solid #a7abac;
padding: 10px;
+ margin-bottom: 10px;
.details-jic {
padding: 10px 15px;
border: 1px solid #dcdfe6;
--
Gitblit v1.9.3