~yxh/smartor-web.git

			@@ -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>
			@@ -414,7 +410,7 @@
			></right-toolbar> -->
			<el-table
			v-loading="loading"
			:data="userList"
			:data="sonuserList"
			@selection-change="handleSelectionChange"
			>
			<el-table-column
			@@ -425,43 +421,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 +466,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 +556,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 +566,7 @@
			title="任务详情"
			:visible.sync="dialogVisible"
			width="60%"
			:before-close="handleClose"
			:before-close="handleCloserw"
			>
			<div class="jic-value">
			<div class="details-jic">
			@@ -1013,6 +803,194 @@
			</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="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="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>
			</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,13 +1003,12 @@
			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"
			ref="queryForm"
			@@ -1089,7 +1066,7 @@
			icon="el-icon-refresh"
			size="medium"
			@click="resetQuery"
			>重置</el-button
			>取消创建</el-button
			>
			</el-form-item>
			</el-form>
			@@ -1168,8 +1145,8 @@
			</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="dialogVisiblepatient = false"
			>确定添加</el-button
			>
			</span>
			@@ -1178,6 +1155,14 @@
			</template>

			<script>
			import {
			listsvr_prjtask,
			getsvr_prjtask,
			addsvr_prjtask,
			updatesvr_prjtask,
			delsvr_prjtask,
			} from "@/api/smartorpor/svr_prjtask";

			export default {
			data() {
			return {
			@@ -1197,6 +1182,7 @@
			multiple: true,
			// 用户表格数据
			userList: null,
			sonuserList: null,
			form: {
			name: "",
			region: "",
			@@ -1233,7 +1219,10 @@
			};
			},

			created() {},
			created() {
			this.Addsubtask();
			this.Getsubtask();
			},

			methods: {
			// 下一步
			@@ -1264,11 +1253,12 @@
			getList() {},
			handleQuery() {},
			resetQuery() {},
			handleClose() {
			handleCloserw() {
			this.dialogVisible = false;
			},
			handleClosehz() {
			this.dialogVisiblepatient = false;
			},

			// 上一步
			laststep() {
			this.Editprogress--;
			@@ -1281,6 +1271,24 @@
			PreviewTemplate() {},
			Acknowledgereference() {
			this.quote = true;
			},
			// 新增子任务
			Addsubtask() {
			this.topqueryParams.pguid = 2;
			addsvr_prjtask(this.topqueryParams).then((res) => {
			console.log(res);
			});
			},
			// 查询子任务列表
			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.sonuserList = res.rows;
			console.log(this.sonuserList);
			});
			},
			},
			};
			@@ -1315,69 +1323,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;