处理上报管理页面时间范围

acupuncture-后台/src/api/followupFile.js

@@ -36,7 +36,7 @@ export function followupDel(data) {
 // 查看随访对象
 export function queryPatient(data) {
   return request({
-    url: "/followup/queryPatient",
+    url: "/admin/followup/queryPatient",
     method: "post",
     data: data,
   });
@@ -44,7 +44,7 @@ export function queryPatient(data) {
 // 修改随访对象 队列信息
 export function updPatient(data) {
   return request({
-    url: "/followup/updPatient",
+    url: "/admin/followup/updPatient",
     method: "post",
     data: data,
   });
@@ -52,7 +52,7 @@ export function updPatient(data) {
 // 随访工单
 export function queryTask(data) {
   return request({
-    url: "/followup/queryTask",
+    url: "/admin/followup/queryTask",
     method: "post",
     data: data,
   });
@@ -60,7 +60,7 @@ export function queryTask(data) {
 // 失访
 export function updStatus(data) {
   return request({
-    url: "/followup/updStatus",
+    url: "/admin/followup/updStatus",
     method: "post",
     data: data,
   });
@@ -68,7 +68,7 @@ export function updStatus(data) {
 // 患者随访
 export function followPatient(data) {
   return request({
-    url: "/followup/followPatient",
+    url: "/admin/followup/followPatient",
     method: "post",
     data: data,
   });
@@ -76,7 +76,7 @@ export function followPatient(data) {
 // 修改随访状态
 export function followStatus(data) {
   return request({
-    url: "/followup/status",
+    url: "/admin/followup/status",
     method: "post",
     data: data,
   });

acupuncture-后台/src/views/report/manage.vue

@@ -25,8 +25,7 @@
 		<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column fixed label="标题" align="center" prop="name" min-width="100" />
-			<el-table-column fixed label="类型" align="center" prop="contactPhone" show-overflow-tooltip
-				min-width="100">
+			<el-table-column fixed label="类型" align="center" prop="contactPhone" show-overflow-tooltip min-width="100">
 			</el-table-column>
 			<el-table-column fixed label="开始时间" align="center" prop="contactPhone" show-overflow-tooltip
 				min-width="100">
@@ -63,21 +62,23 @@
 				</el-form-item>
 				<el-form-item label="上报类型" prop="reportType">
 					<el-select v-model="form.reportType" placeholder="请选择">
-						<el-option v-for="item in reporTypeList" :key="item.id" :label="item.dataSourceKey"
-							:value="item.id">
+						<el-option v-for="item in reporTypeList" :key="item.id" :label="item.typeName" :value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="开始时间" prop="timeRangeStart">
-					<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.timeRangeStart" type="date"
-						placeholder="选择日期">
+					<!-- <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.timeRangeStart"
+						type="date" placeholder="选择日期">
+					</el-date-picker> -->
+					<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.time" type="daterange"
+						range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 					</el-date-picker>
 				</el-form-item>
-				<el-form-item label="结束时间" prop="timeRangeEnd">
+				<!-- <el-form-item label="结束时间" prop="timeRangeEnd">
 					<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.timeRangeEnd" type="date"
 						placeholder="选择日期">
 					</el-date-picker>
-				</el-form-item>
+				</el-form-item> -->
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -125,16 +126,21 @@
 						message: "类型不能为空",
 						trigger: "blur",
 					}],
-					timeRangeStart: [{
+					time: [{
 						required: true,
-						message: "开始时间不能为空",
-						trigger: "blur",
-					}],
-					timeRangeEnd: [{
-						required: true,
-						message: "结束时间不能为空",
-						trigger: "blur"
-					}],
+						message: "时间范围不能为空",
+						trigger: "change",
+					}]
+					// timeRangeStart: [{
+					// 	required: true,
+					// 	message: "开始时间不能为空",
+					// 	trigger: "blur",
+					// }],
+					// timeRangeEnd: [{
+					// 	required: true,
+					// 	message: "结束时间不能为空",
+					// 	trigger: "blur"
+					// }],
 				},
 			};
 		},
@@ -170,6 +176,7 @@
 				this.form = {
 					"reportTitle": "",
 					"reportType": "",
+					time:[],
 					"timeRangeStart": "",
 					"timeRangeEnd": "",
 				};
@@ -204,19 +211,24 @@
 				this.open = true;
 				this.title = "修改上报";
 				this.form = JSON.parse(JSON.stringify(row))
+				this.form.time = [this.form.timeRangeStart,this.form.timeRangeEnd]
 			},
 			/** 诊疗档案 */
 			submitForm: function() {
 				this.$refs["form"].validate((valid) => {
 					if (valid) {
-						if (this.form.id != undefined) {
-							managerUpd(this.form).then((response) => {
+						let data = JSON.parse(JSON.stringify(this.form))
+						let time = data.time
+						data.timeRangeStart = data.time[0]
+						data.timeRangeEnd = data.time[1]
+						if (data.id != undefined) {
+							managerUpd(data).then((response) => {
 								this.$modal.msgSuccess("修改成功");
 								this.open = false;
 								this.getList();
 							});
 						} else {
-							managerAdd(this.form).then((response) => {
+							managerAdd(data).then((response) => {
 								this.$modal.msgSuccess("新增成功");
 								this.open = false;
 								this.getList();

acupuncture-后台/src/views/report/type.vue

@@ -2,7 +2,7 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 			label-width="80px">
-			<el-form-item label="组织名称" prop="typeName">
+			<el-form-item label="类型名称" prop="typeName">
 				<el-input v-model="queryParams.param.typeName" placeholder="请输入" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
@@ -24,7 +24,7 @@
 
 		<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column fixed label="类型名称" align="center" prop="name" min-width="100" />
+			<el-table-column fixed label="类型名称" align="center" prop="typeName" min-width="100" />
 			<el-table-column label="创建人/创建时间" align="center" min-width="140">
 				<template slot-scope="scope">
 					<div>{{scope.row.createBy}}</div>