diff --git a/src/api/health/activity.js b/src/api/health/activity.js
deleted file mode 100644
index 00ea5cf..0000000
--- a/src/api/health/activity.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询活动记录列表
-export function listActivity(query) {
-  return request({
-    url: '/health/activity/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询活动记录详细
-export function getActivity(id) {
-  return request({
-    url: '/health/activity/' + id,
-    method: 'get'
-  })
-}
-
-// 新增活动记录
-export function addActivity(data) {
-  return request({
-    url: '/health/activity',
-    method: 'post',
-    data
-  })
-}
-
-// 修改活动记录
-export function updateActivity(data) {
-  return request({
-    url: '/health/activity',
-    method: 'put',
-    data
-  })
-}
-
-// 删除活动记录
-export function delActivity(id) {
-  return request({
-    url: '/health/activity/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/doctorRecord.js b/src/api/health/doctorRecord.js
deleted file mode 100644
index 055d389..0000000
--- a/src/api/health/doctorRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询就医记录列表
-export function listDoctorRecord(query) {
-  return request({
-    url: '/health/doctorRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询就医记录详细
-export function getDoctorRecord(id) {
-  return request({
-    url: '/health/doctorRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增就医记录
-export function addDoctorRecord(data) {
-  return request({
-    url: '/health/doctorRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改就医记录
-export function updateDoctorRecord(data) {
-  return request({
-    url: '/health/doctorRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除就医记录
-export function delDoctorRecord(id) {
-  return request({
-    url: '/health/doctorRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/healthRecord.js b/src/api/health/healthRecord.js
deleted file mode 100644
index 8997827..0000000
--- a/src/api/health/healthRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询健康档案列表
-export function listHealthRecord(query) {
-  return request({
-    url: '/health/healthRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询健康档案详细
-export function getHealthRecord(id) {
-  return request({
-    url: '/health/healthRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增健康档案
-export function addHealthRecord(data) {
-  return request({
-    url: '/health/healthRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改健康档案
-export function updateHealthRecord(data) {
-  return request({
-    url: '/health/healthRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除健康档案
-export function delHealthRecord(id) {
-  return request({
-    url: '/health/healthRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/heightWeightRecord.js b/src/api/health/heightWeightRecord.js
deleted file mode 100644
index 8bf1e83..0000000
--- a/src/api/health/heightWeightRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询身高体重记录列表
-export function listHeightWeightRecord(query) {
-  return request({
-    url: '/health/heightWeightRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询身高体重记录详细
-export function getHeightWeightRecord(id) {
-  return request({
-    url: '/health/heightWeightRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增身高体重记录
-export function addHeightWeightRecord(data) {
-  return request({
-    url: '/health/heightWeightRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改身高体重记录
-export function updateHeightWeightRecord(data) {
-  return request({
-    url: '/health/heightWeightRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除身高体重记录
-export function delHeightWeightRecord(id) {
-  return request({
-    url: '/health/heightWeightRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/marRecord.js b/src/api/health/marRecord.js
deleted file mode 100644
index ddb437f..0000000
--- a/src/api/health/marRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询用药记录列表
-export function listMarRecord(query) {
-  return request({
-    url: '/health/marRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用药记录详细
-export function getMarRecord(id) {
-  return request({
-    url: '/health/marRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增用药记录
-export function addMarRecord(data) {
-  return request({
-    url: '/health/marRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改用药记录
-export function updateMarRecord(data) {
-  return request({
-    url: '/health/marRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除用药记录
-export function delMarRecord(id) {
-  return request({
-    url: '/health/marRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/medicineBasic.js b/src/api/health/medicineBasic.js
deleted file mode 100644
index 0e13201..0000000
--- a/src/api/health/medicineBasic.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询药品基础信息列表
-export function listMedicineBasic(query) {
-  return request({
-    url: '/health/medicineBasic/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询药品基础信息详细
-export function getMedicineBasic(id) {
-  return request({
-    url: '/health/medicineBasic/' + id,
-    method: 'get'
-  })
-}
-
-// 新增药品基础信息
-export function addMedicineBasic(data) {
-  return request({
-    url: '/health/medicineBasic',
-    method: 'post',
-    data
-  })
-}
-
-// 修改药品基础信息
-export function updateMedicineBasic(data) {
-  return request({
-    url: '/health/medicineBasic',
-    method: 'put',
-    data
-  })
-}
-
-// 删除药品基础信息
-export function delMedicineBasic(id) {
-  return request({
-    url: '/health/medicineBasic/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/medicineStock.js b/src/api/health/medicineStock.js
deleted file mode 100644
index eaff3d0..0000000
--- a/src/api/health/medicineStock.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询药品实时库存列表
-export function listMedicineStock(query) {
-  return request({
-    url: '/health/medicineStock/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询药品实时库存详细
-export function getMedicineStock(id) {
-  return request({
-    url: '/health/medicineStock/' + id,
-    method: 'get'
-  })
-}
-
-// 新增药品实时库存
-export function addMedicineStock(data) {
-  return request({
-    url: '/health/medicineStock',
-    method: 'post',
-    data
-  })
-}
-
-// 修改药品实时库存
-export function updateMedicineStock(data) {
-  return request({
-    url: '/health/medicineStock',
-    method: 'put',
-    data
-  })
-}
-
-// 删除药品实时库存
-export function delMedicineStock(id) {
-  return request({
-    url: '/health/medicineStock/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/medicineStockIn.js b/src/api/health/medicineStockIn.js
deleted file mode 100644
index aaa7706..0000000
--- a/src/api/health/medicineStockIn.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询药品入库清单列表
-export function listMedicineStockIn(query) {
-  return request({
-    url: '/health/medicineStockIn/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询药品入库清单详细
-export function getMedicineStockIn(id) {
-  return request({
-    url: '/health/medicineStockIn/' + id,
-    method: 'get'
-  })
-}
-
-// 新增药品入库清单
-export function addMedicineStockIn(data) {
-  return request({
-    url: '/health/medicineStockIn',
-    method: 'post',
-    data
-  })
-}
-
-// 修改药品入库清单
-export function updateMedicineStockIn(data) {
-  return request({
-    url: '/health/medicineStockIn',
-    method: 'put',
-    data
-  })
-}
-
-// 删除药品入库清单
-export function delMedicineStockIn(id) {
-  return request({
-    url: '/health/medicineStockIn/' + id,
-    method: 'delete'
-  })
-}
-
-// 查询药品入库清单列表
-export function listMedicineRealtimeStock(query) {
-  return request({
-    url: '/health/medicineStockIn/realTimeList',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/src/api/health/person.js b/src/api/health/person.js
deleted file mode 100644
index 3f92fe1..0000000
--- a/src/api/health/person.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询成员管理列表
-export function listPerson(query) {
-  return request({
-    url: '/health/person/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询成员管理详细
-export function getPerson(id) {
-  return request({
-    url: '/health/person/' + id,
-    method: 'get'
-  })
-}
-
-// 新增成员管理
-export function addPerson(data) {
-  return request({
-    url: '/health/person',
-    method: 'post',
-    data
-  })
-}
-
-// 修改成员管理
-export function updatePerson(data) {
-  return request({
-    url: '/health/person',
-    method: 'put',
-    data
-  })
-}
-
-// 删除成员管理
-export function delPerson(id) {
-  return request({
-    url: '/health/person/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/processRecord.js b/src/api/health/processRecord.js
deleted file mode 100644
index 3a024d8..0000000
--- a/src/api/health/processRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询档案过程记录列表
-export function listProcessRecord(query) {
-  return request({
-    url: '/health/processRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询档案过程记录详细
-export function getProcessRecord(id) {
-  return request({
-    url: '/health/processRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增档案过程记录
-export function addProcessRecord(data) {
-  return request({
-    url: '/health/processRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改档案过程记录
-export function updateProcessRecord(data) {
-  return request({
-    url: '/health/processRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除档案过程记录
-export function delProcessRecord(id) {
-  return request({
-    url: '/health/processRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/health/statisticAnalysis.js b/src/api/health/statisticAnalysis.js
deleted file mode 100644
index 2b39859..0000000
--- a/src/api/health/statisticAnalysis.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-
-export function getMarAnalysis(query) {
-  return request({
-    url: '/health/analysis/marAnalysis',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getTemperatureAnalysis(query) {
-  return request({
-    url: '/health/analysis/temperatureAnalysis',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/src/api/health/temperatureRecord.js b/src/api/health/temperatureRecord.js
deleted file mode 100644
index 77355b1..0000000
--- a/src/api/health/temperatureRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询体温记录列表
-export function listTemperatureRecord(query) {
-  return request({
-    url: '/health/temperatureRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询体温记录详细
-export function getTemperatureRecord(id) {
-  return request({
-    url: '/health/temperatureRecord/' + id,
-    method: 'get'
-  })
-}
-
-// 新增体温记录
-export function addTemperatureRecord(data) {
-  return request({
-    url: '/health/temperatureRecord',
-    method: 'post',
-    data
-  })
-}
-
-// 修改体温记录
-export function updateTemperatureRecord(data) {
-  return request({
-    url: '/health/temperatureRecord',
-    method: 'put',
-    data
-  })
-}
-
-// 删除体温记录
-export function delTemperatureRecord(id) {
-  return request({
-    url: '/health/temperatureRecord/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/imaotai/iitem.js b/src/api/imaotai/iitem.js
new file mode 100644
index 0000000..bc2d9fe
--- /dev/null
+++ b/src/api/imaotai/iitem.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询预约项目列表
+export function listIitem(query) {
+  return request({
+    url: '/investprod/iitem/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询预约项目详细
+export function getIitem(itemId) {
+  return request({
+    url: '/investprod/iitem/' + itemId,
+    method: 'get'
+  })
+}
+
+// 新增预约项目
+export function addIitem(data) {
+  return request({
+    url: '/investprod/iitem',
+    method: 'post',
+    data
+  })
+}
+
+// 修改预约项目
+export function updateIitem(data) {
+  return request({
+    url: '/investprod/iitem',
+    method: 'put',
+    data
+  })
+}
+
+// 删除预约项目
+export function delIitem(itemId) {
+  return request({
+    url: '/investprod/iitem/' + itemId,
+    method: 'delete'
+  })
+}
+
+// 刷新i茅台预约商品列表
+export function refreshItem(itemId) {
+  return request({
+    url: '/investprod/iitem/refresh',
+    method: 'get'
+  })
+}
diff --git a/src/api/imaotai/ilog.js b/src/api/imaotai/ilog.js
new file mode 100644
index 0000000..6614054
--- /dev/null
+++ b/src/api/imaotai/ilog.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询操作日志列表
+export function listIlog(query) {
+  return request({
+    url: '/investprod/ilog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询操作日志详细
+export function getIlog(logId) {
+  return request({
+    url: '/investprod/ilog/' + logId,
+    method: 'get'
+  })
+}
+
+// 新增操作日志
+export function addIlog(data) {
+  return request({
+    url: '/investprod/ilog',
+    method: 'post',
+    data
+  })
+}
+
+// 修改操作日志
+export function updateIlog(data) {
+  return request({
+    url: '/investprod/ilog',
+    method: 'put',
+    data
+  })
+}
+
+// 删除操作日志
+export function delIlog(logId) {
+  return request({
+    url: '/investprod/ilog/' + logId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/imaotai/ishop.js b/src/api/imaotai/ishop.js
new file mode 100644
index 0000000..b4db90d
--- /dev/null
+++ b/src/api/imaotai/ishop.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询门店列表列表
+export function listIshop(query) {
+  return request({
+    url: '/investprod/ishop/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询门店列表详细
+export function getIshop(shopId) {
+  return request({
+    url: '/investprod/ishop/' + shopId,
+    method: 'get'
+  })
+}
+
+// 新增门店列表
+export function addIshop(data) {
+  return request({
+    url: '/investprod/ishop',
+    method: 'post',
+    data
+  })
+}
+
+// 修改门店列表
+export function updateIshop(data) {
+  return request({
+    url: '/investprod/ishop',
+    method: 'put',
+    data
+  })
+}
+
+// 删除门店列表
+export function delIshop(shopId) {
+  return request({
+    url: '/investprod/ishop/' + shopId,
+    method: 'delete'
+  })
+}
+// i茅台商品
+export function refreshShop() {
+  return request({
+    url: '/investprod/ishop/refresh',
+    method: 'get'
+  })
+}
+
+// 查询省份列表
+export function listProvince(query) {
+  return request({
+    url: '/investprod/ishop/provinceList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询城市列表
+export function listCity(query) {
+  return request({
+    url: '/investprod/ishop/cityList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询区域列表列表
+export function listDistrict(query) {
+  return request({
+    url: '/investprod/ishop/districtList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/imaotai/iuser.js b/src/api/imaotai/iuser.js
new file mode 100644
index 0000000..45c5047
--- /dev/null
+++ b/src/api/imaotai/iuser.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request'
+
+// 查询用户管理列表
+export function listIuser(query) {
+  return request({
+    url: '/investprod/iuser/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户管理详细
+export function getIuser(mobile) {
+  return request({
+    url: '/investprod/iuser/' + mobile,
+    method: 'get'
+  })
+}
+
+// 新增用户管理
+export function addIuser(data) {
+  return request({
+    url: '/investprod/iuser',
+    method: 'post',
+    data
+  })
+}
+
+// 修改用户管理
+export function updateIuser(data) {
+  return request({
+    url: '/investprod/iuser',
+    method: 'put',
+    data
+  })
+}
+
+// 删除用户管理
+export function delIuser(mobile) {
+  return request({
+    url: '/investprod/iuser/' + mobile,
+    method: 'delete'
+  })
+}
+
+// reservation
+export function reservation(mobile) {
+  return request({
+    url: '/investprod/iuser/reservation',
+    method: 'get',
+    params: { mobile }
+  })
+}
+//travelReward
+export function travelReward(mobile) {
+  return request({
+    url: '/investprod/iuser/travelReward',
+    method: 'get',
+    params: { mobile }
+  })
+}
+
+// 发送验证码
+export function sendCode(mobile, deviceId) {
+  return request({
+    url: '/investprod/iuser/sendCode',
+    method: 'get',
+    params: { mobile, deviceId }
+  })
+}
+
+// 查询I茅台用户列表
+export function login(mobile, code, deviceId) {
+  return request({
+    url: '/investprod/iuser/login',
+    method: 'get',
+    params: { mobile, code, deviceId }
+  })
+}
+
+// 新增账号管理
+export function loginIUser(data) {
+  return request({
+    url: '/investprod/iuser/loginIUser',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/my-selectCheckbox/my-selectCheckbox.vue b/src/components/my-selectCheckbox/my-selectCheckbox.vue
new file mode 100644
index 0000000..193d3fe
--- /dev/null
+++ b/src/components/my-selectCheckbox/my-selectCheckbox.vue
@@ -0,0 +1,760 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :style="{height:multiple?'100%':' 35px;'}"
+				:class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" :style="{height:multiple?'100%':'35px;'}" @click="toggleSelector">
+					<view class="" style="display: flex;flex-wrap: wrap;width: 100%;" v-if="multiple&&current.length>0">
+						<view class="tag-calss"
+							v-for="(item,index) in collapseTags?current.slice(0,collapseTagsNum):current"
+							:key="item[dataValue]">
+							<span class="text">{{item[dataKey]}}</span>
+							<view class="" @click.stop="delItem(item)">
+								<uni-icons type="clear" style="margin-left: 4px;" color="#c0c4cc" />
+							</view>
+						</view>
+						<view v-if="current.length>collapseTagsNum&&collapseTags" class="tag-calss">
+							<span class="text">+{{current.length-collapseTagsNum}}</span>
+						</view>
+					</view>
+					<view v-else-if="current&&current.length>0&&!filterable" class="uni-select__input-text">{{current}}
+					</view>
+					<input v-else-if="filterable" class="uni-select__input-text" type="text" style="font-size: 12px;"
+						:placeholder="placeholderOld" v-model="current">
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<uni-icons v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
+					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="filterMixinDatacomResData.length === 0">
+							<span>{{emptyTips}}</span>
+						</view>
+						<view v-else class="uni-select__selector-item"
+							style="display: flex;justify-content: space-between;align-items: center;"
+							v-for="(item,index) in filterMixinDatacomResData" :key="index" @click="change(item)">
+							<span
+								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</span>
+							<uni-icons v-if="multiple&&currentArr.includes(item[dataValue])" type="checkmarkempty"
+								color="#007aff" />
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+ 
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+ 
+	export default {
+		name: "my-selectCheckbox",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			collapseTagsNum: {
+				type: Number,
+				default: 1
+			},
+			collapseTags: {
+				type: Boolean,
+				default: false
+			},
+			dataKey: {
+				type: [String],
+				default: 'text'
+			},
+			dataValue: {
+				type: [String],
+				default: 'value'
+			},
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			filterable: {
+				type: Boolean,
+				default: false
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number, Array],
+				default: ''
+			},
+			// #endif
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: [],
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+				placeholderOld: "",
+				currentArr: []
+			};
+		},
+		created() {
+			if (this.multiple) {
+				// #ifndef VUE3
+				this.currentArr = this.value || []
+				// #endif
+				// #ifdef VUE3
+				this.currentArr = this.modelValue || []
+				// #endif
+				if (!this.current) {
+					this.current = []
+				}
+				// #ifndef VUE3
+				if (this.value && this.value.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.value.forEach(item => {
+						let current = this.filterMixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						this.current.push(current)
+					})
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue && this.modelValue.length > 0 && this.filterMixinDatacomResData.length > 0) {
+					this.modelValue.forEach(item => {
+						let current = this.filterMixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						this.current.push(current)
+					})
+				}
+				// #endif
+ 
+			} else {
+ 
+				// #ifndef VUE3
+				if (this.value) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.value
+					))
+				}
+				// #endif
+				// #ifdef VUE3
+				if (this.modelValue) {
+					this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+						e[this.dataValue] == this.modelValue
+					))
+				}
+				// #endif
+			}
+			this.placeholderOld = this.placeholder
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			filterMixinDatacomResData() {
+				if (this.filterable && this.current) {
+					return this.mixinDatacomResData.filter(e => e[this.dataKey].includes(this.current))
+				} else {
+					return this.mixinDatacomResData
+				}
+			},
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+ 
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+			// modelValue(val) {
+			// 	if (this.multiple && val && val.length > 0) {
+			// 		this.currentArr = val
+			// 		if (!this.current) {
+			// 			this.current = []
+			// 		}
+			// 		val.forEach(item => {
+			// 			let current = this.filterMixinDatacomResData.find(e =>
+			// 				e[this.dataValue] == item
+			// 			)
+			// 			this.current.push(current)
+			// 		})
+			// 	} else {
+			// 		if (val) {
+			// 			this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+			// 				e[this.dataValue] == val
+			// 			))
+			// 		}
+			// 	}
+ 
+			// },
+			// value(val) {
+			// 	if (this.multiple && val && val.length > 0) {
+			// 		this.currentArr = val
+			// 		if (!this.current) {
+			// 			this.current = []
+			// 		}
+			// 		val.forEach(item => {
+			// 			let current = this.filterMixinDatacomResData.find(e =>
+			// 				e[this.dataValue] == item
+			// 			)
+			// 			this.current.push(current)
+			// 		})
+			// 	} else {
+			// 		if (val) {
+			// 			this.current = this.formatItemName(this.filterMixinDatacomResData.find(e =>
+			// 				e[this.dataValue] == val
+			// 			))
+			// 		}
+			// 	}
+ 
+			// }
+		},
+		methods: {
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1][this.dataValue]
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				if (this.multiple) {
+					this.current = []
+					defValue.forEach(item => {
+						let current = this.filterMixinDatacomResData.find(e =>
+							e[this.dataValue] == item
+						)
+						this.current.push(current)
+					})
+				} else {
+					const def = this.mixinDatacomResData.find(item => item[this.dataValue] === defValue)
+					this.current = def ? this.formatItemName(def) : ''
+				}
+			},
+ 
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+ 
+				this.mixinDatacomResData.forEach(item => {
+					if (item[this.dataValue] === value) {
+						isDisabled = item.disable
+					}
+				})
+ 
+				return isDisabled;
+			},
+ 
+			clearVal() {
+				if (this.multiple) {
+					this.current = []
+					this.currentArr = []
+					this.emit([])
+				} else {
+					this.current = ""
+					this.currentArr = []
+					this.emit('')
+				}
+				if (this.collection) {
+					this.removeCache()
+				}
+				this.placeholderOld = this.placeholder
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					if (this.multiple) {
+						if (!this.current) {
+							this.current = []
+						}
+						if (!this.currentArr) {
+							this.currentArr = []
+						}
+						if (this.currentArr.includes(item[this.dataValue])) {
+							let index = this.current.findIndex(e => {
+								return e[this.dataValue] == item[this.dataValue]
+							})
+							this.current.splice(index, 1)
+							this.currentArr.splice(index, 1)
+							this.emit(this.current)
+						} else {
+							this.current.push(item)
+							this.currentArr.push(item[this.dataValue])
+							this.emit(this.current)
+						}
+					} else {
+						this.current = this.formatItemName(item)
+						this.emit(item[this.dataValue])
+					}
+				}
+			},
+			delItem(item) {
+				if (this.currentArr.includes(item[this.dataValue])) {
+					let index = this.current.findIndex(e => {
+						return e[this.dataValue] == item[this.dataValue]
+					})
+					this.current.splice(index, 1)
+					this.currentArr.splice(index, 1)
+					this.emit(this.current)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				if (this.multiple) {
+					this.$emit('input', this.currentArr)
+					this.$emit('update:modelValue', this.currentArr)
+				} else {
+					this.$emit('input', val)
+					this.$emit('update:modelValue', val)
+				}
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+				if (this.filterable && this.current && this.mixinDatacomResData.findIndex(e => {
+						return e[this.dataKey] == this
+							.current
+					}) < 0) {
+					this.current = ""
+				}
+				this.showSelector = !this.showSelector
+				if (this.filterable && this.current && this.showSelector) {
+					this.placeholderOld = this.current
+					this.current = ""
+				} else if (this.filterable && !this.current && !this.showSelector) {
+					if (this.placeholderOld != this.placeholder) {
+						this.current = this.placeholderOld
+					}
+				}
+ 
+			},
+			formatItemName(item) {
+				if (!item) {
+					return ""
+				}
+				let text = item[this.dataKey]
+				let value = item[this.dataValue]
+				let {
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+ 
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+ 
+ 
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+ 
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		cursor: pointer;
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+ 
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+ 
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+ 
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+ 
+	.uni-select {
+		font-size: 14px;
+		border: 0px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 0px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+		min-height: 35px;
+ 
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+ 
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		min-height: 35px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+ 
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+ 
+		.tag-calss {
+			font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+			font-weight: 400;
+			-webkit-font-smoothing: antialiased;
+			-webkit-tap-highlight-color: transparent;
+			font-size: 12px;
+			border: 1px solid #d9ecff;
+			border-radius: 4px;
+			white-space: nowrap;
+			height: 39px;
+			padding: 0 4px 0px 8px;
+			line-height: 32px;
+			box-sizing: border-box;
+			margin: 2px 0 2px 6px;
+			display: flex;
+			max-width: 100%;
+			align-items: center;
+			background-color: #f4f4f5;
+			border-color: #e9e9eb;
+			color: #909399;
+ 
+			.text {
+				font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+				font-weight: 400;
+				-webkit-font-smoothing: antialiased;
+				-webkit-tap-highlight-color: transparent;
+				font-size: 11px;
+				white-space: pre-wrap;
+				line-height: 22px;
+				color: #909399;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+ 
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+ 
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+ 
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+ 
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+ 
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: left;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+ 
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+ 
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+ 
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+ 
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+ 
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+ 
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+ 
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+ 
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 16px;
+	}
+ 
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index 0a5125b..ff19d72 100644
--- a/src/config.js
+++ b/src/config.js
@@ -8,7 +8,7 @@ const config = {
    // 应用信息
    appInfo: {
      // 应用名称
-     name: "intc-health-app",
+     name: "intc-imaotai-app",
      // 应用版本
      version: "1.1.0",
      // 应用logo
diff --git a/src/pages.json b/src/pages.json
index 265eb8a..80e6a8d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -18,21 +18,63 @@
       }
     },
     {
-      "path": "pages/health/homepage/index",
+      "path": "pages/register",
       "style": {
-        "navigationBarTitleText": "首页"
+        "navigationBarTitleText": "平台用户注册"
       }
     },
     {
-      "path": "pages/health/index",
+      "path": "pages/imaotai/iuser/list",
       "style": {
-        "navigationBarTitleText": "工作台"
+        "navigationBarTitleText": "账号管理"
+      }
+    },
+    {
+      "path": "pages/imaotai/iuser/listInner",
+      "style": {
+        "navigationBarTitleText": "账号管理"
+      }
+    },
+    {
+      "path": "pages/imaotai/iuser/add",
+      "style": {
+        "navigationBarTitleText": "账号新增"
+      }
+    },
+    {
+      "path": "pages/imaotai/iuser/edit",
+      "style": {
+        "navigationBarTitleText": "账号修改"
+      }
+    },  
+    {
+      "path": "pages/imaotai/iuser/token",
+      "style": {
+        "navigationBarTitleText": "刷新token"
+      }
+    },   
+    {
+      "path": "pages/imaotai/ilog/list",
+      "style": {
+        "navigationBarTitleText": "预约记录"
       }
     }, 
     {
-      "path": "pages/health/statistic/index",
+      "path": "pages/imaotai/ilog/listInner",
       "style": {
-        "navigationBarTitleText": "统计分析"
+        "navigationBarTitleText": "预约记录"
+      }
+    },  
+    {
+      "path": "pages/imaotai/iitem/list",
+      "style": {
+        "navigationBarTitleText": "商品"
+      }
+    },
+    {
+      "path": "pages/imaotai/ishop/list",
+      "style": {
+        "navigationBarTitleText": "门店"
       }
     },
     {
@@ -40,155 +82,6 @@
       "style": {
         "navigationBarTitleText": "我的"
       }
-    },
-    {
-      "path": "pages/health/doctorRecord/list",
-      "style": {
-        "navigationBarTitleText": "就医记录"
-      }
-    }
-    ,
-    {
-      "path": "pages/health/doctorRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "就医记录"
-      }
-    },
-    {
-      "path": "pages/health/healthRecord/list",
-      "style": {
-        "navigationBarTitleText": "健康档案"
-      }
-    } ,
-    {
-      "path": "pages/health/healthRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "健康档案"
-      }
-    },
-    {
-      "path": "pages/health/marRecord/list",
-      "style": {
-        "navigationBarTitleText": "用药记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/marRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "用药记录"
-      }
-    },
-    {
-      "path": "pages/health/medicineBasic/list",
-      "style": {
-        "navigationBarTitleText": "药品基础信息"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineBasic/details",
-      "style": {
-        "navigationBarTitleText": "药品基础信息详情"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineBasic/addEdit",
-      "style": {
-        "navigationBarTitleText": "药品基础信息"
-      }
-    },
-    {
-      "path": "pages/health/medicineStockIn/list",
-      "style": {
-        "navigationBarTitleText": "药品入库清单"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineStockIn/details",
-      "style": {
-        "navigationBarTitleText": "药品入库清单详情"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineStockIn/addEdit",
-      "style": {
-        "navigationBarTitleText": "药品入库清单"
-      }
-    }, {
-      "path": "pages/health/medicineStock/list",
-      "style": {
-        "navigationBarTitleText": "药品实时库存"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/temperatureRecord/list",
-      "style": {
-        "navigationBarTitleText": "体温记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/temperatureRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "体温记录"
-      }
-    } ,
-    {
-      "path": "pages/health/processRecord/list",
-      "style": {
-        "navigationBarTitleText": "档案过程记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/processRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "档案过程记录"
-      }
-    },
-     {
-      "path": "pages/health/heightWeightRecord/list",
-      "style": {
-        "navigationBarTitleText": "身高体重记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/heightWeightRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "身高体重记录"
-      }
-    },
-    {
-      "path": "pages/health/person/list",
-      "style": {
-        "navigationBarTitleText": "成员管理"
-      }
-    }
-    ,
-    {
-      "path": "pages/health/person/addEdit",
-      "style": {
-        "navigationBarTitleText": "成员管理"
-      }
-    },
-    {
-      "path": "pages/health/activity/list",
-      "style": {
-        "navigationBarTitleText": "活动记录"
-      }
-    }
-    ,
-    {
-      "path": "pages/health/activity/addEdit",
-      "style": {
-        "navigationBarTitleText": "活动记录"
-      }
     }
   ],
   "subPackages": [
@@ -248,23 +141,29 @@
     "backgroundColor": "#ffffff",
     "list": [
       {
-        "pagePath": "pages/health/homepage/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home_.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/health/index",
+        "pagePath": "pages/imaotai/iuser/list",
         "iconPath": "static/images/tabbar/work.png",
         "selectedIconPath": "static/images/tabbar/work_.png",
         "text": "账号管理"
       },
       {
-        "pagePath": "pages/health/statistic/index",
+        "pagePath": "pages/imaotai/ilog/list",
         "iconPath": "static/images/tabbar/statistic.png",
         "selectedIconPath": "static/images/tabbar/statistic_.png",
         "text": "预约记录"
       },
+      // {
+      //   "pagePath": "pages/imaotai/iitem/list",
+      //   "iconPath": "static/images/tabbar/statistic.png",
+      //   "selectedIconPath": "static/images/tabbar/statistic_.png",
+      //   "text": "商品"
+      // },
+      // {
+      //   "pagePath": "pages/imaotai/ishop/list",
+      //   "iconPath": "static/images/tabbar/statistic.png",
+      //   "selectedIconPath": "static/images/tabbar/statistic_.png",
+      //   "text": "门店"
+      // },
       {
         "pagePath": "pages/mine",
         "iconPath": "static/images/tabbar/mine.png",
diff --git a/src/pages/health/activity/addEdit.vue b/src/pages/health/activity/addEdit.vue
deleted file mode 100644
index aea6c71..0000000
--- a/src/pages/health/activity/addEdit.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="活动记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="活动名称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写活动名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-          <u-form-item label="类型" prop="typeName" required @click="handleType">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="活动地点" required prop="place" >
-              <u--input v-model="form.place"  placeholder="请填写活动地点"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="成员" required prop="partner" >
-              <u--input v-model="form.partner" placeholder="请填写成员"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="开始时间" prop="startTime" required @click="selectStartTime()">
-            <u--input v-model="form.startTime" disabled disabledColor="#ffffff" placeholder="请选择开始时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="结束时间" prop="endTime" required  @click="selectEndTime()">
-            <u--input v-model="form.endTime" disabled disabledColor="#ffffff" placeholder="请选择结束时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="活动时长" prop="exerciseTime" >
-              <u--input v-model="form.exerciseTime" placeholder="请填写活动时长"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="总费用" prop="totalCost" >
-              <u--input v-model="form.totalCost" type="number"  placeholder="请填写总费用"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="元"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-            <u-form-item label="费用明细" prop="costDetail"  labelPosition="top">
-            <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="饮食" prop="foods"  labelPosition="top">
-            <u--textarea v-model="form.foods" placeholder="请填写饮食" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="收获" prop="harvest"  labelPosition="top">
-            <u--textarea v-model="form.harvest" placeholder="请填写收获" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-        <u-datetime-picker
-			:show="startTimeShow"
-			mode="datetime"
-      ref="startTimeRef" 
-			@cancel="startTimeShow=false"
-			@confirm="startTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="endTimeShow"
-			mode="datetime"
-      ref="endTimeRef" 
-			@cancel="endTimeShow=false"
-			@confirm="endTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getActivity, addActivity, updateActivity } from '@/api/health/activity'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const birthdayShow = ref(false)
-const title = ref("活动记录")
-const startTimeShow = ref(false)
-const endTimeShow = ref(false)
-const typeList = ref([])
-const showType = ref(false)
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    type: null,
-    place: null,
-    activityVolume: null,
-    exerciseTime: null,
-    startTime: null,
-    endTime: null,
-    harvest: null,
-    foods: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    totalCost: null,
-    partner: null,
-    costDetail: null
-},
-rules: {
-  name: [{ required: true, message: '活动名称不能为空', trigger:['change', 'blur'] }],
-  place: [{ required: true, message: '活动地点不能为空', trigger: ['change', 'blur'] }],
-  partner: [{ required: true, message: '成员不能为空', trigger: ['change', 'blur'] }],
-  startTime: [{ required: true, message: '开始时间不能为空', trigger: ['change', 'blur'] }],
-  endTime: [{ required: true, message: '结束时间不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="活动记录-修改"
-     }else{
-      title.value="活动记录-新增"
-     }
-    getData()
-})
-onReady(() => {
-  form.value.startTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
- function  selectStartTime() {
-      startTimeShow.value = true
-      proxy.$refs['startTimeRef'].innerValue = new Date().getTime()
-  }
-function startTimeConfirm(e) {
-      form.value.startTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      startTimeShow.value = false
-  }
-
-  function  selectEndTime() {
-    endTimeShow.value = true
-      proxy.$refs['endTimeRef'].innerValue = new Date().getTime()
-  }
-function endTimeConfirm(e) {
-      form.value.endTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      endTimeShow.value = false
-  }
-function  getData() {
-     // 类型
-     getDicts('activity_type').then(res => {
-        typeList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getActivity(form.value.id).then(res => {
-        form.value = res.data   
-            // 类型
-           getDicts('activity_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }
-}
-
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateActivity(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-            }
-          })
-        })
-        }else {
-          addActivity(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue
deleted file mode 100644
index 73fbaac..0000000
--- a/src/pages/health/doctorRecord/addEdit.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="就医记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="医院名称" prop="hospitalName" required >
-              <u--input v-model="form.hospitalName"  placeholder="请填写医院名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="科室" prop="departments" required >
-              <u--input v-model="form.departments"  placeholder="请填写科室"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="大夫" prop="doctor" required >
-              <u--input v-model="form.doctor"  placeholder="请填写大夫"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="就诊时间" prop="visitingTime" required @click="selectDate()">
-            <u--input v-model="form.visitingTime" disabled disabledColor="#ffffff" placeholder="请选择就诊时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="陪同人" prop="partner" required >
-              <u--input v-model="form.partner"  placeholder="请填写陪同人"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="诊断及开药" prop="prescribe"  labelPosition="top">
-            <u--textarea v-model="form.prescribe" placeholder="请填写诊断及开药" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-            <u-form-item label="总费用" prop="totalCost" required >
-              <u--input v-model="form.totalCost"  placeholder="请填写总费用"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="元"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-            <u-form-item label="费用明细" prop="costDetail" required >
-              <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="visitingTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getDoctorRecord, addDoctorRecord, updateDoctorRecord } from '@/api/health/doctorRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("就医记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const data = reactive({
-form: {
-  id: null,
-    hospitalName: null,
-    departments: null,
-    doctor: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    visitingTime: null,
-    prescribe: null,
-    personId: null,
-    totalCost: null,
-    partner: null,
-    costDetail: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  hospitalName: [{ required: true, message: '医院名称不能为空', trigger: ['change', 'blur'] }],
-  departments: [{ required: true, message: '科室不能为空', trigger: ['change', 'blur'] }],
-  doctor: [{ required: true, message: '大夫不能为空', trigger: ['change', 'blur'] }],
-  totalCost: [{ type: 'number',  required: true, message: '总费用不能为空', trigger: ['change', 'blur'] }],
-  partner: [{ required: true, message: '陪同人不能为空', trigger: ['change', 'blur'] }],
-  prescribe: [{ required: true, message: '诊断及开药不能为空', trigger: ['change', 'blur'] }],
-  visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="就医记录-修改"
-     }else{
-      title.value="就医记录-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.visitingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-      // 药品来源
-      
-    if(form.value.id!=null){
-      getDoctorRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['visitingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.visitingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateDoctorRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-            }
-          })
-        })
-        }else {
-          addDoctorRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue
deleted file mode 100644
index 8e16896..0000000
--- a/src/pages/health/doctorRecord/list.vue
+++ /dev/null
@@ -1,467 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择就诊时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
- 
-            
-              <view class="select-header">就诊时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.healthRecordName +'：'+ item.hospitalName" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">就诊时间：</text>
-            <text class="row-value">{{ item.visitingTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">人员姓名：</text>
-            <text class="row-value">{{ item.personName }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">科室：</text>
-            <text class="row-value">{{ item.departments }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">大夫：</text>
-            <text class="row-value">{{ item.doctor }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">陪同人：</text>
-            <text class="row-value">{{ item.partner }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">总费用（元）：</text>
-            <text class="row-value">{{ item.totalCost }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">诊断及开药：</text>
-            <text class="row-value">{{ item.prescribe }}</text>
-          </view>
-   
-          <view class="item-row">
-            <text class="row-label">费用明细：</text>
-            <text class="row-value">{{ item.costDetail }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listDoctorRecord, delDoctorRecord } from '@/api/health/doctorRecord'
-import { listPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    hospitalName: null,
-    departments: null,
-    doctor: null,
-    healthRecordId: null,
-    time: '',
-    personId: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listDoctorRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delDoctorRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue
deleted file mode 100644
index 14d5d61..0000000
--- a/src/pages/health/healthRecord/addEdit.vue
+++ /dev/null
@@ -1,390 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="健康档案"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="档案名称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写档案名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-          <u-form-item label="类型" prop="typeName" required @click="handleType">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="档案状态" prop="stateName" required @click="handleState">
-              <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择档案状态"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="发生时间" prop="occurTime" required @click="selectOccurTime()">
-            <u--input v-model="form.occurTime" disabled disabledColor="#ffffff" placeholder="请选择发生时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="发生原因"  prop="etiologyName" required @click="handleEtiology">
-              <u--input v-model="form.etiologyName" disabled disabledColor="#ffffff" placeholder="请选择发生原因"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="初期症状" prop="initialSymptoms" required >
-                <u--textarea v-model="form.initialSymptoms" placeholder="请填写初期症状" border="none" autoHeight inputAlign="right" count
-                maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-            <u-form-item label="中期症状" prop="mediumTermSymptoms"  >
-                <u--textarea v-model="form.mediumTermSymptoms" placeholder="请填写中期症状" border="none" autoHeight inputAlign="right" count
-                maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-            <u-form-item label="后期症状" prop="laterStageSymptoms"  >
-                <u--textarea v-model="form.laterStageSymptoms" placeholder="请填写后期症状" border="none" autoHeight inputAlign="right" count
-                maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-           
-            <u-form-item label="康复时间" prop="rehabilitationTime"  @click="selectRehabilitationTime()">
-            <u--input v-model="form.rehabilitationTime" disabled disabledColor="#ffffff" placeholder="请选择康复时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-   
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
-        @confirm="handleStateConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showEtiology" :columns="etiologyList" keyName="dictLabel" @cancel="handleEtiologyCancel"
-        @confirm="handleEtiologyConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-      <u-datetime-picker
-			:show="occurTimeShow"
-			mode="datetime"
-      ref="occurTimeRef" 
-			@cancel="occurTimeShow=false"
-			@confirm="occurTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="rehabilitationTimeShow"
-			mode="datetime"
-      ref="rehabilitationTimeRef" 
-			@cancel="rehabilitationTimeShow=false"
-			@confirm="rehabilitationTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {getHealthRecord, addHealthRecord, updateHealthRecord } from '@/api/health/healthRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const occurTimeShow = ref(false)
-const showPerson = ref(false)
-const title = ref("健康档案")
-const personList = ref([])
-
-const typeList = ref([])
-const showType = ref(false)
-
-const stateList = ref([])
-const showState = ref(false)
-
-const etiologyList = ref([])
-const showEtiology = ref(false)
-
-const rehabilitationTimeShow = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    type: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    occurTime: null,
-    rehabilitationTime: null,
-    initialSymptoms: null,
-    mediumTermSymptoms: null,
-    laterStageSymptoms: null,
-    etiology: null,
-    personId: null,
-    state: '1',
-    stateName: '建档中'
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-rules: {
-  name: [{ required: true, message: '档案名称不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员姓名不能为空', trigger: ['change', 'blur'] }],
-  occurTime: [{ required: true, message: '发生时间不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-  etiologyName: [{ required: true, message: '发生原因不能为空', trigger: ['change', 'blur'] }],
-  stateName: [{ required: true, message: '状态不能为空', trigger: ['change', 'blur'] }],
-  initialSymptoms: [{ required: true, message: '初期症状不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="健康档案-修改"
-     }else{
-      title.value="健康档案-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.occurTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      if( form.value.id==null){
-      getPerson( response.rows[0].id).then((response) => {
-    const date = new Date()
-    const year = date.getFullYear() // 年份
-    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-    let day = date.getDate() // 日期
-
-    // 对月份和日期进行补零
-    month = month < 10 ? '0' + month : month.toString()
-    day = day < 10 ? '0' + day : day.toString()
-
-    const currentDate = year + month + day
-    form.value.name = response.data.name + currentDate + '档案'
-  })}
-     }
-     })
-     // 类型
-     getDicts('record_type').then(res => {
-        typeList.value =[res.data] 
-      })
-       // 状态
-       getDicts('health_record_state').then(res => {
-        stateList.value =[res.data] 
-      })
-       // 发生原因
-       getDicts('etiology').then(res => {
-        etiologyList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getHealthRecord(form.value.id).then(res => {
-        form.value = res.data   
-        getDicts('etiology').then(result => {
-          form.value.etiologyName=dictStr(form.value.etiology, result.data)
-         })
-          // 状态
-        getDicts('health_record_state').then(result => {
-          form.value.stateName=dictStr(form.value.state, result.data)
-         })
-                // 类型
-           getDicts('record_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-
-      getPerson( e.value[0].id).then((response) => {
-    const date = new Date()
-    const year = date.getFullYear() // 年份
-    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-    let day = date.getDate() // 日期
-
-    // 对月份和日期进行补零
-    month = month < 10 ? '0' + month : month.toString()
-    day = day < 10 ? '0' + day : day.toString()
-
-    const currentDate = year + month + day
-    form.value.name = response.data.name + currentDate + '档案'
-  })
-      showPerson.value = false         
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-function handleState() {
-        if (stateList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '档案状态为空  ', type: 'warning'
-          })
-        } else {
-          showState.value = true
-        }
-     }
-  function   handleStateConfirm(e) {
-        form.value.stateName = e.value[0].dictLabel
-        form.value.resource = e.value[0].dictValue
-        showState.value = false
-  }
- function handleStateCancel() {
-      showState.value = false
-      }
-
-
-      function handleEtiology() {
-        if (etiologyList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '发生原因为空  ', type: 'warning'
-          })
-        } else {
-          showEtiology.value = true
-        }
-     }
-  function   handleEtiologyConfirm(e) {
-        form.value.etiologyName = e.value[0].dictLabel
-        form.value.place = e.value[0].dictValue
-        showEtiology.value = false
-  }
- function handleEtiologyCancel() {
-  showEtiology.value = false
-      }
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-function  selectOccurTime() {
-      occurTimeShow.value = true
-      proxy.$refs['occurTimeRef'].innerValue = new Date().getTime()
-  }
-function occurTimeConfirm(e) {
-      form.value.occurTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      occurTimeShow.value = false
-  }
-
-  function  selectRehabilitationTime() {
-    rehabilitationTimeShow.value = true
-      proxy.$refs['rehabilitationTimeRef'].innerValue = new Date().getTime()
-  }
-function rehabilitationTimeConfirm(e) {
-      form.value.rehabilitationTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      rehabilitationTimeShow.value = false
-  }
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateHealthRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
-            }
-          })
-        })
-        }else {
-          addHealthRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/list.vue b/src/pages/health/healthRecord/list.vue
deleted file mode 100644
index 29ca07d..0000000
--- a/src/pages/health/healthRecord/list.vue
+++ /dev/null
@@ -1,516 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择发生时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">档案状态</view>
-              <view class="state-list">
-                <view v-for="item in typeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="select-header">发生时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">人员名称：</text>
-            <text class="row-value">{{ item.personName }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">类型：</text>
-            <text class="row-value">{{ dictStr(item.type,typeList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">档案状态：</text>
-            <text class="row-value">{{ dictStr(item.state, stateList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">发生时间：</text>
-            <text class="row-value">{{ item.occurTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">康复时间：</text>
-            <text class="row-value">{{ item.rehabilitationTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">发生原因：</text>
-            <text class="row-value">{{ dictStr(item.etiology, etiologyList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">初期症状：</text>
-            <text class="row-value">{{ item.initialSymptoms }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">中期症状：</text>
-            <text class="row-value">{{ item.mediumTermSymptoms }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">后期症状：</text>
-            <text class="row-value">{{ item.laterStageSymptoms }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listHealthRecord, delHealthRecord } from '@/api/health/healthRecord'
-import { listPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const typeList = ref([])
-const etiologyList = ref([])
-const stateList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    personId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-       // 类型
-       getDicts('record_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('etiology').then(res => {
-        etiologyList.value = res.data
-      })
-            // 单位
-            getDicts('health_record_state').then(res => {
-              stateList.value = res.data
-      })
-
-      status.value = 'loading'
-      listHealthRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-       queryParams.value.type = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/healthRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delHealthRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/heightWeightRecord/addEdit.vue b/src/pages/health/heightWeightRecord/addEdit.vue
deleted file mode 100644
index fa6116d..0000000
--- a/src/pages/health/heightWeightRecord/addEdit.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="身高体重记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="测量时间" prop="measureTime" required @click="selectDate()">
-            <u--input v-model="form.measureTime" disabled disabledColor="#ffffff" placeholder="请选择测量时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="身高" required prop="height" >
-            <u--input v-model="form.height"  type="number" placeholder="请填写身高"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="CM"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="体重" required prop="weight" >
-            <u--input v-model="form.weight"  type="number" placeholder="请填写体重过"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="KG"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="measureTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {
-  getHeightWeightRecord,
-  addHeightWeightRecord,
-  updateHeightWeightRecord
-} from '@/api/health/heightWeightRecord'
-import { listPerson, } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const title = ref("身高体重记录")
-const personList = ref([])
-const data = reactive({
-form: {
-  id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    measureTime: null,
-    weight: null,
-    personId: null,
-    height: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-rules: {
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  measureTime: [{ required: true, message: '测量时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="身高体重记录-修改"
-     }else{
-      title.value="身高体重记录-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-     }
-     })
-  
-    if(form.value.id!=null){
-      getHeightWeightRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['measureTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.measureTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateHeightWeightRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
-            }
-          })
-        })
-        }else {
-          addHeightWeightRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/heightWeightRecord/list.vue b/src/pages/health/heightWeightRecord/list.vue
deleted file mode 100644
index 22a44f7..0000000
--- a/src/pages/health/heightWeightRecord/list.vue
+++ /dev/null
@@ -1,432 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择测量时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="select-header">测量时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.personName+'，身高：'+item.height +'CM'+'，体重：'+item.weight +'KG'" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">测量时间：</text>
-            <text class="row-value">{{ item.measureTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import {
-  listHeightWeightRecord,
-  delHeightWeightRecord
-} from '@/api/health/heightWeightRecord'
-import { listPerson } from '@/api/health/person'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    measureTime: null,
-    weight: null,
-    personId: null,
-    height: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listHeightWeightRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delHeightWeightRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/homepage/index.vue b/src/pages/health/homepage/index.vue
deleted file mode 100644
index ec19c1a..0000000
--- a/src/pages/health/homepage/index.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <view class="content">
-    <view class="text-area">
-      <text class="title"></text>
-    </view>
-    <div class="app-container" style="overflow: auto">
-    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;数据总览</div>
-    <div class="header-con" ref="searchHeightRef">
-      <div class="item">
-        <img src="../../assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">账号数量</div>
-          <div class="num">3<span>人</span></div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="../../assets/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">预约次数</div>
-          <div class="num">5<span>次</span></div>
-        </div>
-      </div>
-    </div>
-    
-    <div class="header-con"  ref="searchHeightRef">
-
-      <div class="item">
-        <img src="../../assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">门店数量</div>
-          <div class="num">8<span>次</span></div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="../../assets/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">商品数量</div>
-          <div class="num">100<span>次</span></div>
-        </div>
-      </div>
-    </div>
-    <div class="header-con"  ref="searchHeightRef">
-
-<div class="item">
-  <img src="../../assets/one.png" alt="" />
-  <div class="info-sum">
-    <div class="title">成功次数</div>
-    <div class="num">88<span>次</span></div>
-  </div>
-</div>
-<div class="item">
-  <img src="../../assets/ticketSum.png" alt="" />
-  <div class="info-sum">
-    <div class="title">失败次数</div>
-    <div class="num">100<span>次</span></div>
-  </div>
-</div>
-</div>
-<div class="header-con"  ref="searchHeightRef">
-
-<div class="item">
-  <img src="../../assets/one.png" alt="" />
-  <div class="info-sum">
-    <div class="title">旅行次数</div>
-    <div class="num">8<span>次</span></div>
-  </div>
-</div>
-<div class="item">
-  <img src="../../assets/ticketSum.png" alt="" />
-  <div class="info-sum">
-    <div class="title">药品数量</div>
-    <div class="num">10<span>种</span></div>
-  </div>
-</div>
-</div>
-
-    <div></div>
-  </div>
-</view>
-</template>
-<script setup>
-import { ref, onMounted } from 'vue';
-import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
-
-
-
-onMounted(() => {
-
-})
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  .header-con {
-    width: 100%;
-    height: 100px;
-    background-color: #ffffff;
-    margin-bottom: 5px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .item {
-      width: 50%;
-      height: 100%;
-      display: flex;
-      position: relative;
-      align-items: center;
-      margin: 0px 5px 0px 5px;
-      .title {
-        margin-left: 5px;
-        color: rgb(133, 133, 148);
-        margin-bottom: 5px;
-        font-size: 14px;
-      }
-      .num {
-        margin-left: 5px;
-        font-weight: bold;
-        font-size: 14px;
-      }
-    }
-    img {
-      height: 30px;
-      width: 30px;
-    }
-  }
-  .header-title {
-    width: 100%;
-    height: 30px;
-    background-color: #ffffff;
-    margin-bottom: 3px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 16px;
-  }
-}
-</style>
diff --git a/src/pages/health/index.vue b/src/pages/health/index.vue
deleted file mode 100644
index 739f9d6..0000000
--- a/src/pages/health/index.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <view class="work-container">
-
-
-    <!-- 宫格组件 -->
-    <uni-section title="健康管理" v-show="auth.hasPermi('health:person:list')"  type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false">
-        <uni-grid-item v-for="(item, index) in healthGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
-        <view class="grid-item-box">
-            <uni-icons :type="item.icon" size="30"></uni-icons>
-            <text class="text">{{ item.text }}</text>
-          </view>
-      </uni-grid-item>
-      </uni-grid>
-    </view>
-        <!-- 宫格组件 -->
-        <uni-section title="药品管理" v-show="auth.hasPermi('health:medicineStockIn:list')"  type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false">
-        <uni-grid-item v-for="(item, index) in medicineGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
-        <view class="grid-item-box">
-            <uni-icons :type="item.icon" size="30"></uni-icons>
-            <text class="text">{{ item.text }}</text>
-          </view>
-      </uni-grid-item>
-      </uni-grid>
-    </view>
-  </view>
-
-      
-</template>
-
-<script setup>
-import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
-
-// 也可以使用下面的方式
-	import { ref } from "vue";
-
-  const healthGridList=ref([
-       { path: '/pages/health/person/list', text: '成员管理', icon: 'staff-filled', permission: 'health:person:list'  },
-        { path: '/pages/health/healthRecord/list', text: '健康档案', icon: 'bars', permission: 'health:healthRecord:list'  },
-        { path: '/pages/health/processRecord/list', text: '档案过程记录', icon: 'list', permission: 'health:processRecord:list'  },
-        { path: '/pages/health/doctorRecord/list', text: '就医记录', icon: 'upload', permission: 'health:doctorRecord:list'  },
-        { path: '/pages/health/marRecord/list', text: '用药记录', icon: 'shop-filled', permission: 'health:marRecord:list' },
-        { path: '/pages/health/temperatureRecord/list', text: '体温记录', icon: 'spinner-cycle', permission: 'health:temperatureRecord:list'  },
-        { path: '/pages/health/heightWeightRecord/list', text: '身高体重记录', icon: 'map-pin-ellipse', permission: 'health:heightWeightRecord:list'  },
-        { path: '/pages/health/activity/list', text: '活动记录', icon: 'images-filled', permission: 'health:activity:list'  }
-       
-      ])
-      const medicineGridList=ref([
-        { path: '/pages/health/medicineBasic/list', text: '药品基础信息', icon: 'folder-add-filled', permission: 'health:medicineBasic:list'  },
-        { path: '/pages/health/medicineStockIn/list', text: '药品入库清单', icon: 'arrow-down', permission: 'health:medicineStockIn:list'  },
-        { path: '/pages/health/medicineStock/list', text: '药品实时库存', icon: 'color', permission: 'health:medicineStockIn:list'  }
-       
-      ])
-	function navigateTo(path) {
-    uni.navigateTo({
-        url: path
-      });
-	}
-</script>
-
-<style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
-
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
-
-  /* #endif */
-
-  .text {
-    text-align: center;
-    font-size: 22rpx;
-    margin-top: 10rpx;
-  }
-
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
-
-  .uni-margin-wrap {
-    width: 690rpx;
-    width: 100%;
-    ;
-  }
-
-  .swiper {
-    height: 300rpx;
-  }
-
-  .swiper-box {
-    height: 150px;
-  }
-
-  .swiper-item {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
-  }
-
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
-    }
-
-    .image {
-      width: 100%;
-    }
-  }
-</style>
diff --git a/src/pages/health/marRecord/addEdit.vue b/src/pages/health/marRecord/addEdit.vue
deleted file mode 100644
index f9e0e2b..0000000
--- a/src/pages/health/marRecord/addEdit.vue
+++ /dev/null
@@ -1,489 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="用药记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="用药类型" prop="marTypeName" required @click="handleMarType">
-              <u--input v-model="form.marTypeName" disabled disabledColor="#ffffff" placeholder="请选择用药类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品名称" prop="medicalName" required @click="handleMedical">
-            <u--input v-model="form.medicalName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-            <u-form-item label="药品来源" prop="resourceName" required @click="handleResource">
-              <u--input v-model="form.resourceName" disabled disabledColor="#ffffff" placeholder="请选择药品来源"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="用药地点"  prop="placeName" required @click="handlePlace">
-              <u--input v-model="form.placeName" disabled disabledColor="#ffffff" placeholder="请选择用药地点"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="用药时间" prop="dosingTime" required @click="selectDate()">
-            <u--input v-model="form.dosingTime" disabled disabledColor="#ffffff" placeholder="请选择用药时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="用药剂量" prop="dosage" required >
-              <u--input v-model="form.dosage"  placeholder="请填写用药剂量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="用药单位" prop="unitName" required @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择用药单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showResource" :columns="resourceList" keyName="dictLabel" @cancel="handleResourceCancel"
-        @confirm="handleResourceConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showPlace" :columns="placeList" keyName="dictLabel" @cancel="handlePlaceCancel"
-        @confirm="handlePlaceConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showMarType" :columns="marTypeList" keyName="dictLabel" @cancel="handleMarTypeCancel"
-        @confirm="handleMarTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-      @confirm="handleMedicalConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="dosingTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getMarRecord, addMarRecord, updateMarRecord  } from '@/api/health/marRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const flag = ref('add')
-const showHealthRecord = ref(false)
-const title = ref("用药记录")
-const healthRecordList = ref([])
-const personList = ref([])
-
-const medicalList = ref([])
-const showMedical = ref(false)
-
-const marTypeList = ref([])
-const showMarType = ref(false)
-
-const resourceList = ref([])
-const showResource = ref(false)
-
-const placeList = ref([])
-const showPlace = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    type: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    personId: null,
-    resource: '1',
-    place: '1',
-     resourceName: '医院开药',
-    placeName: '家中'
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-queryMedicineParams: {
-    pageNum: 1,
-    treatmentType: null,
-    pageSize: 1000
-  },
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  medicalName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
-  marTypeName: [{ required: true, message: '用药类型不能为空', trigger: ['change', 'blur'] }],
-  resource: [{ required: true, message: '药品来源不能为空', trigger: ['change', 'blur'] }],
-  place: [{ required: true, message: '用药地点不能为空', trigger: ['change', 'blur'] }],
-  dosage: [{ type: 'number', required: true, message: '用药剂量不能为空', trigger: ['change', 'blur'] }],
-
-  dosingTime: [{ required: true, message: '用药时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams,queryMedicineParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="用药记录-修改"
-     }else{
-      title.value="用药记录-新增"
-     }
-     }else{
-      title.value="用药记录-复制"
-     }
-     
-    getData()
-})
-onReady(() => {
-     form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-     // 类型
-     getDicts('mar_type').then(res => {
-        marTypeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('medical_unit').then(res => {
-        unitList.value =[res.data] 
-      })
-       // 类型
-       getDicts('mar_resource').then(res => {
-        resourceList.value =[res.data] 
-      })
-       // 子类型
-       getDicts('mar_place').then(res => {
-        placeList.value =[res.data] 
-      })
-
-      // 药品来源
-      
-    if(form.value.id!=null){
-      getMarRecord(form.value.id).then(res => {
-        form.value = res.data   
-        form.value.medicalName=form.value.name
-        getDicts('mar_place').then(result => {
-          form.value.placeName=dictStr(form.value.place, result.data)
-         })
-          // 药品来源
-        getDicts('mar_resource').then(result => {
-          form.value.resourceName=dictStr(form.value.resource, result.data)
-         })
-                   // 药品来源
-        getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-                // 用药类型
-           getDicts('mar_type').then(result => {
-          form.value.marTypeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-  function handleMedical() {
-      if (medicalList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '药品为空  ', type: 'warning'
-        })
-      } else {
-        showMedical.value = true
-      }
-   }
-function   handleMedicalConfirm(e) {
-     form.value.medicalName = e.value[0].shortNameBrandPackaging
-     form.value.name = e.value[0].shortNameBrandPackaging
-      form.value.medicineId = e.value[0].id
-      getMedicineBasic(e.value[0].id).then((response) => {
-    form.value.unit = response.data.unit
-       // 药品来源
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr( response.data.unit, result.data)
-         })
-    form.value.contentUnit = response.data.contentUnit
-  })
-      showMedical.value = false
-      
-}
-function handleMedicalCancel() {
-     showMedical.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-
-function handleResource() {
-        if (resourceList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showResource.value = true
-        }
-     }
-  function   handleResourceConfirm(e) {
-        form.value.resourceName = e.value[0].dictLabel
-        form.value.resource = e.value[0].dictValue
-        showResource.value = false
-  }
- function handleResourceCancel() {
-      showResource.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药单位为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-      showUnit.value = false
-      }
-
-      function handlePlace() {
-        if (placeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药地点为空  ', type: 'warning'
-          })
-        } else {
-          showPlace.value = true
-        }
-     }
-  function   handlePlaceConfirm(e) {
-        form.value.placeName = e.value[0].dictLabel
-        form.value.place = e.value[0].dictValue
-        showPlace.value = false
-  }
- function handlePlaceCancel() {
-  showPlace.value = false
-      }
-
-  function handleMarType() {
-        if (marTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药类型为空  ', type: 'warning'
-          })
-        } else {
-          showMarType.value = true
-        }
-     }
-  function   handleMarTypeConfirm(e) {
-        form.value.marTypeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-
-        queryMedicineParams.value.treatmentType = e.value[0].dictValue
-        form.value.medicalName = ""
-     form.value.name = ""
-      form.value.medicineId = null
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-
-        showMarType.value = false
-  }
- function handleMarTypeCancel() {
-       showMarType.value = false
-      }
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['dosingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.dosingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          if(flag.value==null){
-            updateMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-          }
-
-        }else {
-          addMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/marRecord/list.vue b/src/pages/health/marRecord/list.vue
deleted file mode 100644
index af6a785..0000000
--- a/src/pages/health/marRecord/list.vue
+++ /dev/null
@@ -1,515 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择用药时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">用药类型</view>
-              <view class="state-list">
-                <view v-for="item in typeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="select-header">用药时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.name +' '+ item.dosage+dictStr(item.unit, unitList) " size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">用药时间：</text>
-            <text class="row-value">{{ item.dosingTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">用药类型：</text>
-            <text class="row-value">{{ dictStr(item.type, typeList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">人员名称：</text>
-            <text class="row-value">{{ item.personName }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">健康档案：</text>
-            <text class="row-value">{{ item.healthRecordName }}</text>
-          </view>
-  
-          <view class="item-row">
-            <text class="row-label">药品来源：</text>
-            <text class="row-value">{{ dictStr(item.resource,resourceList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">用药地点：</text>
-            <text class="row-value">{{ dictStr(item.place, placeList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleCopy(item)">复制</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listMarRecord, delMarRecord } from '@/api/health/marRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const typeList = ref([])
-const resourceList = ref([])
-const placeList = ref([])
-const unitList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    personId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-       // 用药类型
-       getDicts('mar_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('mar_place').then(res => {
-        placeList.value = res.data
-      })
-            // 单位
-            getDicts('medical_unit').then(res => {
-              unitList.value = res.data
-      })
-
-       // 药品类型
-       getDicts('mar_resource').then(res => {
-        resourceList.value = res.data
-      })
-      status.value = 'loading'
-      listMarRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-       queryParams.value.healthRecordId = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delMarRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/addEdit.vue b/src/pages/health/medicineBasic/addEdit.vue
deleted file mode 100644
index fe78429..0000000
--- a/src/pages/health/medicineBasic/addEdit.vue
+++ /dev/null
@@ -1,524 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="药品基础信息"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="药品全称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写药品全称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品简称" prop="shortName" required >
-              <u--input v-model="form.shortName"  placeholder="请填写药品简称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品编码" prop="code" required >
-              <u--input v-model="form.code"  placeholder="请填写药品编码"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-
-          <u-form-item label="药品剂型" prop="dosageFormName" required @click="handleDosageForm">
-              <u--input v-model="form.dosageFormName" disabled disabledColor="#ffffff" placeholder="请选择药品剂型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="治疗类型" prop="treatmentTypeName" required @click="handleTreatmentType">
-              <u--input v-model="form.treatmentTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品分类"  prop="classificationName" required @click="handleClassification">
-              <u--input v-model="form.classificationName" disabled disabledColor="#ffffff" placeholder="请选择药品分类"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-
-            <u-form-item label="类别" prop="categoryName" required @click="handleCategory">
-              <u--input v-model="form.categoryName" disabled disabledColor="#ffffff" placeholder="请选择类别"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="品牌" prop="brand" required >
-              <u--input v-model="form.brand"  placeholder="请填写品牌"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品包装" prop="packaging" required >
-              <u--input v-model="form.packaging"  placeholder="请填写药品包装"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="包装单位" prop="packageUnitName" required @click="handlePackageUnit">
-              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="生产厂家" prop="manufacturers" required >
-              <u--input v-model="form.manufacturers"  placeholder="请填写生产厂家"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="是否进口" prop="isImportName"  @click="handleIsImport">
-              <u--input v-model="form.isImportName" disabled disabledColor="#ffffff" placeholder="请选择是否进口"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="规格" prop="specifications" >
-              <u--input v-model="form.specifications"  placeholder="请填写规格"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="单个含量" prop="content"  >
-              <u--input v-model="form.content"  placeholder="请填写单个含量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="含量单位" prop="contentUnitName"  @click="handleContentUnit">
-              <u--input v-model="form.contentUnitName" disabled disabledColor="#ffffff" placeholder="请选择含量单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="生产地址" prop="address"  >
-              <u--input v-model="form.address"  placeholder="请填写生产地址"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="功能主治" prop="indications"  labelPosition="top">
-            <u--textarea v-model="form.indications" placeholder="请填写功能主治" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="贮藏" prop="storage"  labelPosition="top">
-            <u--textarea v-model="form.storage" placeholder="请填写贮藏" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="药品成分" prop="ingredients"  labelPosition="top">
-            <u--textarea v-model="form.ingredients" placeholder="请填写药品成分" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="用法用量" prop="usage"  labelPosition="top">
-            <u--textarea v-model="form.usage" placeholder="请填写用法用量" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="性状" prop="character"  labelPosition="top">
-            <u--textarea v-model="form.character" placeholder="请填写性状" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="不良反应" prop="adverseReaction"  labelPosition="top">
-            <u--textarea v-model="form.adverseReaction" placeholder="请填写不良反应" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showDosageForm" :columns="dosageFormList" keyName="dictLabel" @cancel="handleDosageFormCancel"
-        @confirm="handleDosageFormConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showTreatmentType" :columns="treatmentTypeList" keyName="dictLabel" @cancel="handleTreatmentTypeCancel"
-        @confirm="handleTreatmentTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showClassification" :columns="classificationList" keyName="dictLabel" @cancel="handleClassificationCancel"
-        @confirm="handleClassificationConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showCategory" :columns="categoryList" keyName="dictLabel" @cancel="handleCategoryCancel"
-      @confirm="handleCategoryConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
-      @confirm="handlePackageUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showIsImport" :columns="isImportList" keyName="dictLabel" @cancel="handleIsImportCancel"
-      @confirm="handleIsImportConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showContentUnit" :columns="contentUnitList" keyName="dictLabel" @cancel="handleContentUnitCancel"
-      @confirm="handleContentUnitConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import {getMedicineBasic, addMedicineBasic, updateMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const title = ref("药品基础信息")
-const flag = ref('add')
-
-const dosageFormList = ref([])
-const showDosageForm = ref(false)
-
-const treatmentTypeList = ref([])
-const showTreatmentType = ref(false)
-
-const classificationList = ref([])
-const showClassification = ref(false)
-
-const categoryList = ref([])
-const showCategory = ref(false)
-
-const packageUnitList = ref([])
-const showPackageUnit = ref(false)
-
-const isImportList = ref([])
-const showIsImport = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const contentUnitList = ref([])
-const showContentUnit = ref(false)
-
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    classification: null,
-    category: null,
-    brand: null,
-    packaging: null,
-    manufacturers: null,
-    treatmentType: null,
-    isImport: null,
-    ingredients: null,
-    usage: null,
-    dosageForm: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    code: null,
-    specifications: null,
-    unit: null,
-    address: null,
-    adverseReaction: null,
-    content: null,
-    contentUnit: null,
-    character: null,
-    storage: null,
-    indications: null
-},
-rules: {
-  name: [{ required: true, message: '药品全称不能为空', trigger:['change', 'blur'] }],
-  shortName: [{ required: true, message: '药品简称不能为空', trigger: ['change', 'blur'] }],
-  classificationName: [{ required: true, message: '药品分类不能为空', trigger: ['change', 'blur'] }],
-  categoryName: [{ required: true, message: '类别不能为空', trigger: ['change', 'blur'] }],
-  brand: [{ required: true, message: '品牌不能为空', trigger: ['change', 'blur'] }],
-  packaging: [{ required: true, message: '药品包装不能为空', trigger: ['change', 'blur'] }],
-  manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: ['change', 'blur'] }],
-  code: [{ required: true, message: '药品编码不能为空', trigger: ['change', 'blur'] }],
-  dosageFormName: [{ required: true, message: '药品剂型不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="药品基础信息-修改"
-     }else{
-      title.value="药品基础信息-新增"
-     }
-     }else{
-      title.value="药品基础信息-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-     // 类型
-     getDicts('dosage_form').then(res => {
-      dosageFormList.value =[res.data] 
-      })
-       // 类型
-     getDicts('mar_type').then(res => {
-      treatmentTypeList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medicine_classification').then(res => {
-      classificationList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medicine_category').then(res => {
-      categoryList.value =[res.data] 
-      })
-       // 类型
-     getDicts('package_unit').then(res => {
-      packageUnitList.value =[res.data] 
-      })
-       // 类型
-     getDicts('is_import').then(res => {
-      isImportList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medical_unit').then(res => {
-      unitList.value =[res.data] 
-      })
-       // 类型
-     getDicts('content_unit').then(res => {
-      contentUnitList.value =[res.data] 
-      })
-
-    if(form.value.id!=null){
-      getMedicineBasic(form.value.id).then(res => {
-        form.value = res.data   
-        getDicts('dosage_form').then(result => {
-          form.value.dosageFormName=dictStr(form.value.dosageForm, result.data)
-         })
-         getDicts('mar_type').then(result => {
-          form.value.treatmentTypeName=dictStr(form.value.treatmentType, result.data)
-         })
-         getDicts('medicine_classification').then(result => {
-          form.value.classificationName=dictStr(form.value.classification, result.data)
-         })
-         getDicts('medicine_category').then(result => {
-          form.value.categoryName=dictStr(form.value.category, result.data)
-         })
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
-         })
-         getDicts('is_import').then(result => {
-          form.value.isImportName=dictStr(form.value.isImport, result.data)
-         })
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-         getDicts('content_unit').then(result => {
-          form.value.contentUnitName=dictStr(form.value.contentUnit, result.data)
-         })
-      })
-    }
-}
-
-function handleDosageForm() {
-        if (dosageFormList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品剂型为空  ', type: 'warning'
-          })
-        } else {
-          showDosageForm.value = true
-        }
-     }
-  function   handleDosageFormConfirm(e) {
-        form.value.dosageFormName = e.value[0].dictLabel
-        form.value.dosageForm = e.value[0].dictValue
-        showDosageForm.value = false
-  }
- function handleDosageFormCancel() {
-  showDosageForm.value = false
-      }
-
-      function handleTreatmentType() {
-        if (treatmentTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showTreatmentType.value = true
-        }
-     }
-  function   handleTreatmentTypeConfirm(e) {
-        form.value.treatmentTypeName = e.value[0].dictLabel
-        form.value.treatmentType = e.value[0].dictValue
-        showTreatmentType.value = false
-  }
- function handleTreatmentTypeCancel() {
-  showTreatmentType.value = false
-      }
-
-      function handleClassification() {
-        if (classificationList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showClassification.value = true
-        }
-     }
-  function   handleClassificationConfirm(e) {
-        form.value.classificationName = e.value[0].dictLabel
-        form.value.classification = e.value[0].dictValue
-        showClassification.value = false
-  }
- function handleClassificationCancel() {
-  showClassification.value = false
-      }
-
-      function handleCategory() {
-        if (categoryList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showCategory.value = true
-        }
-     }
-  function   handleCategoryConfirm(e) {
-        form.value.categoryName = e.value[0].dictLabel
-        form.value.category = e.value[0].dictValue
-        showCategory.value = false
-  }
- function handleCategoryCancel() {
-  showCategory.value = false
-      }
-
-      function handlePackageUnit() {
-        if (packageUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showPackageUnit.value = true
-        }
-     }
-  function   handlePackageUnitConfirm(e) {
-        form.value.packageUnitName = e.value[0].dictLabel
-        form.value.packageUnit = e.value[0].dictValue
-        showPackageUnit.value = false
-  }
- function handlePackageUnitCancel() {
-  showPackageUnit.value = false
-      }
-
-      function handleIsImport() {
-        if (isImportList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showIsImport.value = true
-        }
-     }
-  function   handleIsImportConfirm(e) {
-        form.value.isImportName = e.value[0].dictLabel
-        form.value.isImport = e.value[0].dictValue
-        showIsImport.value = false
-  }
- function handleIsImportCancel() {
-  showIsImport.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-  showUnit.value = false
-      }
-
-      function handleContentUnit() {
-        if (contentUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showContentUnit.value = true
-        }
-     }
-  function   handleContentUnitConfirm(e) {
-        form.value.contentUnitName = e.value[0].dictLabel
-        form.value.contentUnit = e.value[0].dictValue
-        showContentUnit.value = false
-  }
- function handleContentUnitCancel() {
-  showContentUnit.value = false
-      }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-          }
-
-        }else {
-          addMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/details.vue b/src/pages/health/medicineBasic/details.vue
deleted file mode 100644
index 9051dfc..0000000
--- a/src/pages/health/medicineBasic/details.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="药品基础信息详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="药品全称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
-        <u-cell title="药品简称:" titleStyle="font-weight:bolder" :value="detailInfo.shortName"></u-cell>
-        <u-cell title="药品编码:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
-        <u-cell title="药品剂型:" titleStyle="font-weight:bolder" :value="detailInfo.dosageForm"></u-cell>
-        <u-cell title="治疗类型:" titleStyle="font-weight:bolder" center :value="detailInfo.treatmentType"> </u-cell>
-        <u-cell title="药品分类:" titleStyle="font-weight:bolder" :value="detailInfo.classification"></u-cell>
-        <u-cell title="类别:" titleStyle="font-weight:bolder" :value="detailInfo.category"></u-cell>
-        <u-cell title="品牌:" titleStyle="font-weight:bolder" :value="detailInfo.brand"></u-cell>
-        <u-cell title="药品包装:" titleStyle="font-weight:bolder" :value="detailInfo.packaging"></u-cell>
-        <u-cell title="包装单位:" titleStyle="font-weight:bolder" :value="detailInfo.packageUnit"></u-cell>
-        <u-cell title="生产厂家:" titleStyle="font-weight:bolder" :value="detailInfo.manufacturers"></u-cell>
-        <u-cell title="是否进口:" titleStyle="font-weight:bolder" :value="detailInfo.isImport"></u-cell>
-        <u-cell title="规格:" titleStyle="font-weight:bolder" :value="detailInfo.specifications"></u-cell>
-        <u-cell title="规格单位:" titleStyle="font-weight:bolder" :value="detailInfo.unit"></u-cell>
-        <u-cell title="单个含量:" titleStyle="font-weight:bolder" :value="detailInfo.content"></u-cell>
-        <u-cell title="含量单位:" titleStyle="font-weight:bolder" :value="detailInfo.contentUnit"></u-cell>
-        <u-cell title="生产地址:" titleStyle="font-weight:bolder" :value="detailInfo.address"></u-cell>
-        <u-cell title="功能主治:" titleStyle="font-weight:bolder" :value="detailInfo.indications"></u-cell>
-        <u-cell title="贮藏:" titleStyle="font-weight:bolder" :value="detailInfo.storage"></u-cell>
-        <u-cell title="药品成分:" titleStyle="font-weight:bolder" :value="detailInfo.ingredients"></u-cell>
-        <u-cell title="用法用量:" titleStyle="font-weight:bolder" :value="detailInfo.usage"></u-cell>
-        <u-cell title="性状:" titleStyle="font-weight:bolder" :value="detailInfo.character"></u-cell>
-        <u-cell title="不良反应:" titleStyle="font-weight:bolder" :value="detailInfo.adverseReaction"></u-cell>
-        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getMedicineBasic(id.value).then(res => {
-          detailInfo.value = res.data
-                     // 类型
-            getDicts('dosage_form').then(result => {
-         detailInfo.value.dosageForm=dictStr(detailInfo.value.dosageForm, result.data)
-      })
-       // 类型
-       getDicts('mar_type').then(result => {
-         detailInfo.value.treatmentType=dictStr(detailInfo.value.treatmentType, result.data)
-      })
-       // 类型
-       getDicts('medicine_classification').then(result => {
-         detailInfo.value.classification=dictStr(detailInfo.value.classification, result.data)
-      })
-       // 类型
-       getDicts('medicine_category').then(result => {
-         detailInfo.value.category=dictStr(detailInfo.value.category, result.data)
-      })
-       // 类型
-       getDicts('package_unit').then(result => {
-         detailInfo.value.packageUnit=dictStr(detailInfo.value.packageUnit, result.data)
-      })
-       // 类型
-       getDicts('is_import').then(result => {
-         detailInfo.value.isImport=dictStr(detailInfo.value.isImport, result.data)
-      })
-       // 类型
-       getDicts('medical_unit').then(result => {
-         detailInfo.value.unit=dictStr(detailInfo.value.unit, result.data)
-      })
-                           // 类型
-            getDicts('content_unit').then(result => {
-         detailInfo.value.contentUnit=dictStr(detailInfo.value.contentUnit, result.data)
-      })
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/list.vue b/src/pages/health/medicineBasic/list.vue
deleted file mode 100644
index b57bc93..0000000
--- a/src/pages/health/medicineBasic/list.vue
+++ /dev/null
@@ -1,487 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.keys" border="false" type="select"  @click="searchBlur" placeholder="请输入名称编码品牌厂家" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择创建时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">治疗类型</view>
-              <view class="state-list">
-                <view v-for="item in typeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="select-header">创建时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.shortName +'-'+ item.brand +'('+ item.packaging+')' " size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">药品全称：</text>
-            <text class="row-value">{{ item.name }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">治疗类型：</text>
-            <text class="row-value">{{ dictStr(item.treatmentType, typeList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">药品编码：</text>
-            <text class="row-value">{{ item.code }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">药品分类：</text>
-            <text class="row-value">{{ dictStr(item.classification, classificationList) }}</text>
-          </view>
-  
-          <view class="item-row">
-            <text class="row-label">类别：</text>
-            <text class="row-value">{{ dictStr(item.category,categoryList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">药品剂型：</text>
-            <text class="row-value">{{ dictStr(item.dosageForm, dosageFormList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">生产厂家：</text>
-            <text class="row-value">{{ item.manufacturers }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleCopy(item)">复制</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listMedicineBasic, delMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const typeList = ref([])
-const classificationList = ref([])
-const categoryList = ref([])
-const dosageFormList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryParams: {
-    name: null,
-    classification: null,
-    keys: null,
-    brand: null,
-    packaging: null,
-    manufacturers: null,
-    treatmentType: null,
-    isImport: null,
-    ingredients: null,
-    usage: null,
-    dosageForm: null,
-    code: null,
-    shortName: null
-   } 
-})
-const { filterPanel, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-       // 治疗类型
-       getDicts('mar_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('medicine_classification').then(res => {
-        classificationList.value = res.data
-      })
-            // 单位
-            getDicts('medicine_category').then(res => {
-              categoryList.value = res.data
-      })
-
-       // 药品类型
-       getDicts('dosage_form').then(res => {
-        dosageFormList.value = res.data
-      })
-      status.value = 'loading'
-      listMedicineBasic({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.type = ''
-       queryParams.value.keys = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delMedicineBasic(item.id)
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/addEdit.vue b/src/pages/health/medicineStockIn/addEdit.vue
deleted file mode 100644
index 9ddc9fb..0000000
--- a/src/pages/health/medicineStockIn/addEdit.vue
+++ /dev/null
@@ -1,517 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="药品入库清单"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="治疗类型" prop="marTypeName"  @click="handleMarType">
-              <u--input v-model="form.marTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品名称" prop="medicineName" required @click="handleMedical">
-            <u--input v-model="form.medicineName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="入库编号" prop="code" required >
-              <u--input v-model="form.code"  placeholder="请填写入库编号"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="入库数量" prop="quantity" required >
-              <u--input v-model="form.quantity"  placeholder="请填写入库数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="购买时间" prop="purchaseDate" required @click="selectDate()">
-            <u--input v-model="form.purchaseDate" disabled disabledColor="#ffffff" placeholder="请选择购买时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="使用状态" prop="stateName" required @click="handleState">
-              <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择使用状态"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="生产日期" prop="productionDate" required @click="selectProductionDate()">
-            <u--input v-model="form.productionDate" disabled disabledColor="#ffffff" placeholder="请选择生产日期" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="过期日期" prop="expiringDate"  required @click="selectExpiringDate()">
-            <u--input v-model="form.expiringDate" disabled disabledColor="#ffffff" placeholder="请选择过期日期" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="包装单位" prop="packageUnitName"  @click="handlePackageUnit">
-              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="规格总数" prop="totalCount" required >
-              <u--input v-model="form.totalCount"  placeholder="请填写规格总数"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="已使用数量" prop="usedCount"  >
-              <u--input v-model="form.usedCount"  placeholder="请填写已使用数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="剩余数量" prop="leftCount"  >
-              <u--input v-model="form.leftCount"  placeholder="请填写剩余数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="年龄体重" prop="ageWeight"  >
-              <u--input v-model="form.ageWeight"  placeholder="请填写年龄体重"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品单价" prop="purchasePrice"  >
-              <u--input v-model="form.purchasePrice"  placeholder="请填写药品单价"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品总价" prop="totalPrice"  >
-              <u--input v-model="form.totalPrice"  placeholder="请填写药品总价"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="购买地址" prop="purchaseAddress"  labelPosition="top">
-              <u--input v-model="form.purchaseAddress"  placeholder="请填写购买地址"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-            <u-form-item label="医嘱" prop="usage"  labelPosition="top">
-            <u--textarea v-model="form.usage" placeholder="请填写医嘱" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-         
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-
-      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
-        @confirm="handleStateConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showMarType" :columns="marTypeList" keyName="dictLabel" @cancel="handleMarTypeCancel"
-        @confirm="handleMarTypeConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-      @confirm="handleMedicalConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
-      @confirm="handlePackageUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="purchaseDateRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-    <u-datetime-picker
-			:show="productionDateShow"
-			mode="date"
-      ref="productionDateRef" 
-			@cancel="productionDateShow=false"
-			@confirm="productionDateConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="expiringDateShow"
-			mode="date"
-      ref="expiringDateRef" 
-			@cancel="expiringDateShow=false"
-			@confirm="expiringDateConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {  getMedicineStockIn, addMedicineStockIn, updateMedicineStockIn } from '@/api/health/medicineStockIn'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const title = ref("药品入库清单")
-
-const productionDateShow = ref(false)
-const expiringDateShow = ref(false)
-const medicalList = ref([])
-const showMedical = ref(false)
-
-const marTypeList = ref([])
-const showMarType = ref(false)
-
-const stateList = ref([])
-const showState = ref(false)
-
-const packageUnitList = ref([])
-const showPackageUnit = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    medicineId: null,
-    quantity: 1,
-    productionDate: null,
-    expiringDate: null,
-    purchaseDate: null,
-    purchasePrice: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    code: null,
-    state: '0',
-    stateName: '未使用',
-    leftCount: null,
-    usedCount: null,
-    purchaseAddress: null,
-    totalPrice: null,
-    usage: null,
-    ageWeight: null,
-    totalCount: null,
-    unit: null,
-    packageUnit: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-queryMedicineParams: {
-    pageNum: 1,
-    treatmentType: null,
-    pageSize: 1000
-  },
-rules: {
-  medicineName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
-  quantity: [{type: 'number',  required: true, message: '数量不能为空', trigger: ['change', 'blur'] }],
-  productionDate: [{ required: true, message: '生产日期不能为空', trigger: ['change', 'blur'] }],
-  expiringDate: [{ required: true, message: '过期日期不能为空', trigger: ['change', 'blur'] }],
-  code: [{ type: 'number', required: true, message: '入库编号不能为空', trigger: ['change', 'blur'] }],
-
-  stateName: [{ required: true, message: '使用状态不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form,queryMedicineParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="药品入库清单-修改"
-     }else{
-      title.value="药品入库清单-新增"
-     }
-     }else{
-      title.value="药品入库清单-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.purchaseDate = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-
- function  selectProductionDate() {
-      productionDateShow.value = true
-      proxy.$refs['productionDateRef'].innerValue = new Date().getTime()
-  }
-function productionDateConfirm(e) {
-      form.value.productionDate = dayjs(e.value).format("YYYY-MM-DD")
-      productionDateShow.value = false
-  }
-
-  function  selectExpiringDate() {
-    expiringDateShow.value = true
-      proxy.$refs['expiringDateRef'].innerValue = new Date().getTime()
-  }
-function expiringDateConfirm(e) {
-      form.value.expiringDate = dayjs(e.value).format("YYYY-MM-DD")
-      expiringDateShow.value = false
-  }
-function  getData() {
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-     // 类型
-     getDicts('used_state').then(res => {
-        stateList.value =[res.data] 
-      })
-
-           // 类型
-     getDicts('mar_type').then(res => {
-        marTypeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('medical_unit').then(res => {
-        unitList.value =[res.data] 
-      })
-         // 类型
-     getDicts('package_unit').then(res => {
-      packageUnitList.value =[res.data] 
-      })
-
-    if(form.value.id!=null){
-      getMedicineStockIn(form.value.id).then(res => {
-        form.value = res.data   
-     
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
-         })
-                   // 药品来源
-        getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-                     // 药品来源
-        getDicts('used_state').then(result => {
-          form.value.stateName=dictStr(form.value.state, result.data)
-         })
-                // 用药类型
-           getDicts('mar_type').then(result => {
-          form.value.marTypeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }else {
-
-      const date = new Date()
-  const year = date.getFullYear() // 年份
-  let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-  let day = date.getDate() // 日期
-  let hour = date.getHours()
-  let minute = date.getMinutes()
-  let second = date.getSeconds()
-  // 对月份和日期进行补零
-  month = month < 10 ? '0' + month : month.toString()
-  day = day < 10 ? '0' + day : day.toString()
-  hour = hour < 10 ? '0' + hour : hour.toString()
-  minute = minute < 10 ? '0' + minute : minute.toString()
-  second = second < 10 ? '0' + second : second.toString()
-  const currentDate = year + month + day + hour + minute + second
-  form.value.code = currentDate
-    }
-}
-
-function handlePackageUnit() {
-        if (packageUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showPackageUnit.value = true
-        }
-     }
-  function   handlePackageUnitConfirm(e) {
-        form.value.packageUnitName = e.value[0].dictLabel
-        form.value.packageUnit = e.value[0].dictValue
-        showPackageUnit.value = false
-  }
- function handlePackageUnitCancel() {
-  showPackageUnit.value = false
-      }
-  function handleMedical() {
-      if (medicalList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '药品为空  ', type: 'warning'
-        })
-      } else {
-        showMedical.value = true
-      }
-   }
-function   handleMedicalConfirm(e) {
-     form.value.medicineName = e.value[0].shortNameBrandPackaging
-     form.value.name = e.value[0].shortNameBrandPackaging
-      form.value.medicineId = e.value[0].id
-      getMedicineBasic(e.value[0].id).then((response) => {
-    form.value.unit = response.data.unit
-       // 药品来源
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr( response.data.unit, result.data)
-         })
-         form.value.packageUnit = response.data.packageUnit
-       // 药品来源
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr( response.data.packageUnit, result.data)
-         })
-
-  })
-      showMedical.value = false
-      
-}
-function handleMedicalCancel() {
-     showMedical.value = false
-  }
-
-
-function handleState() {
-        if (stateList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '使用状态为空  ', type: 'warning'
-          })
-        } else {
-          showState.value = true
-        }
-     }
-  function   handleStateConfirm(e) {
-        form.value.stateName = e.value[0].dictLabel
-        form.value.state = e.value[0].dictValue
-        showState.value = false
-  }
- function handleStateCancel() {
-      showState.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '规格单位为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-      showUnit.value = false
-      }
-
-     
-
-  function handleMarType() {
-        if (marTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '治疗类型为空  ', type: 'warning'
-          })
-        } else {
-          showMarType.value = true
-        }
-     }
-  function   handleMarTypeConfirm(e) {
-        form.value.marTypeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-
-        queryMedicineParams.value.treatmentType = e.value[0].dictValue
-        form.value.medicineName = ""
-     form.value.name = ""
-      form.value.medicineId = null
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-
-        showMarType.value = false
-  }
- function handleMarTypeCancel() {
-       showMarType.value = false
-      }
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['purchaseDateRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.purchaseDate = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-          }
-        }else {
-          addMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/details.vue b/src/pages/health/medicineStockIn/details.vue
deleted file mode 100644
index b382526..0000000
--- a/src/pages/health/medicineStockIn/details.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="药品入库清单详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="药品名称:" titleStyle="font-weight:bolder" :value="detailInfo.medicineName"></u-cell>
-        <u-cell title="入库编号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
-        <u-cell title="入库数量:" titleStyle="font-weight:bolder" :value="detailInfo.quantity"></u-cell>
-        <u-cell title="购买时间:" titleStyle="font-weight:bolder" :value="detailInfo.purchaseDate"></u-cell>
-        <u-cell title="使用状态:" titleStyle="font-weight:bolder" center :value="detailInfo.state"> </u-cell>
-        <u-cell title="生产日期:" titleStyle="font-weight:bolder" :value="detailInfo.productionDate"></u-cell>
-        <u-cell title="过期日期:" titleStyle="font-weight:bolder" :value="detailInfo.expiringDate"></u-cell>
-        <u-cell title="包装单位:" titleStyle="font-weight:bolder" :value="detailInfo.packageUnit"></u-cell>
-        <u-cell title="规格总数:" titleStyle="font-weight:bolder" :value="detailInfo.totalCount"></u-cell>
-        <u-cell title="规格单位:" titleStyle="font-weight:bolder" :value="detailInfo.unit"></u-cell>
-        <u-cell title="已使用数量:" titleStyle="font-weight:bolder" :value="detailInfo.usedCount"></u-cell>
-        <u-cell title="剩余数量:" titleStyle="font-weight:bolder" :value="detailInfo.leftCount"></u-cell>
-        <u-cell title="年龄体重:" titleStyle="font-weight:bolder" :value="detailInfo.ageWeight"></u-cell>
-        <u-cell title="药品单价:" titleStyle="font-weight:bolder" :value="detailInfo.purchasePrice"></u-cell>
-        <u-cell title="药品总价:" titleStyle="font-weight:bolder" :value="detailInfo.totalPrice"></u-cell>
-        <u-cell title="医嘱:" titleStyle="font-weight:bolder" :value="detailInfo.usage"></u-cell>
-        <u-cell title="购买地址:" titleStyle="font-weight:bolder" :value="detailInfo.purchaseAddress"></u-cell>
-        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getMedicineStockIn } from '@/api/health/medicineStockIn'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getMedicineStockIn(id.value).then(res => {
-          detailInfo.value = res.data
-
-       // 类型
-       getDicts('used_state').then(result => {
-         detailInfo.value.state=dictStr(detailInfo.value.state, result.data)
-      })
-       // 类型
-       getDicts('package_unit').then(result => {
-         detailInfo.value.packageUnit=dictStr(detailInfo.value.packageUnit, result.data)
-      })
-    
-       // 类型
-       getDicts('medical_unit').then(result => {
-         detailInfo.value.unit=dictStr(detailInfo.value.unit, result.data)
-      })
-       
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/list.vue b/src/pages/health/medicineStockIn/list.vue
deleted file mode 100644
index a6f551e..0000000
--- a/src/pages/health/medicineStockIn/list.vue
+++ /dev/null
@@ -1,522 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.medicalName" border="false" type="select"  @click="handleMedical" placeholder="请选择药品" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择购买时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">使用状态</view>
-              <view class="state-list">
-                <view v-for="item in stateList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="select-header">购买时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header"  @click="enterDetails(item)">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">购买时间：</text>
-            <text class="row-value">{{ item.purchaseDate }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">使用状态：</text>
-            <text class="row-value">{{ dictStr(item.state, stateList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">入库编号：</text>
-            <text class="row-value">{{ item.code }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">入库数量：</text>
-            <text class="row-value">{{ item.quantity }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">包装单位：</text>
-            <text class="row-value">{{ dictStr(item.packageUnit, packageUnitList) }}</text>
-          </view>
-  
-          <view class="item-row">
-            <text class="row-label">过期日期：</text>
-            <text class="row-value">{{item.expiringDate }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">规格总数：</text>
-            <text class="row-value">{{ item.totalCount }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">规格单位：</text>
-            <text class="row-value">{{ dictStr(item.unit, unitList) }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">剩余数量：</text>
-            <text class="row-value">{{ item.leftCount }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleCopy(item)">复制</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-        @confirm="handleMedicalConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listMedicineStockIn,  delMedicineStockIn,  } from '@/api/health/medicineStockIn'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const stateList = ref([])
-
-const unitList = ref([])
-const packageUnitList = ref([])
-const medicalList = ref([])
-const showMedical = ref(false)
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryMedicalParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    medicalId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.state = item.dictValue
-      stateList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listMedicineBasic(queryMedicalParams.value).then((response) => {
-        medicalList.value = [response.rows] 
-      })
-       // 使用状态
-       getDicts('used_state').then(res => {
-        stateList.value = res.data
-      })
-       // 用药地点
-       getDicts('medical_unit').then(res => {
-        unitList.value = res.data
-      })
-            // 单位
-            getDicts('package_unit').then(res => {
-              packageUnitList.value = res.data
-      })
-
-      status.value = 'loading'
-      listMedicineStockIn({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handleMedical() {
-        if (medicalList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品名称为空  ', type: 'warning'
-          })
-        } else {
-          showMedical.value = true
-        }
-     }
-  function   handleMedicalConfirm(e) {
-    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
-    queryParams.value.medicineId= e.value[0].id
-        showMedical.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleMedicalCancel() {
-       showMedical.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.medicalName = ''
-       queryParams.value.state = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.medicineId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delMedicineStockIn(item.id)
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/person/addEdit.vue b/src/pages/health/person/addEdit.vue
deleted file mode 100644
index 806e55b..0000000
--- a/src/pages/health/person/addEdit.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="成员管理"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="姓名" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写姓名"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="昵称" prop="nickName" required >
-              <u--input v-model="form.nickName"  placeholder="请填写昵称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-          <u-form-item label="类型" prop="typeName" required @click="handleType">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-          
-            <u-form-item label="生日" prop="birthday" required @click="selectBirthday()">
-            <u--input v-model="form.birthday" disabled disabledColor="#ffffff" placeholder="请选择发生时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="排序" prop="ranking" >
-              <u--input v-model="form.ranking" type="number" placeholder="请填写排序"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="身高" prop="height" >
-              <u--input v-model="form.height"  placeholder="请填写身高"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="CM"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-            <u-form-item label="体重" prop="weight" >
-              <u--input v-model="form.weight"  placeholder="请填写体重"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="KG"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-           
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-      <u-datetime-picker
-			:show="birthdayShow"
-			mode="date"
-      ref="birthdayRef" 
-			@cancel="birthdayShow=false"
-			@confirm="birthdayConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getPerson,addPerson, updatePerson } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const birthdayShow = ref(false)
-const title = ref("成员管理")
-
-const typeList = ref([])
-const showType = ref(false)
-const data = reactive({
-form: {
-  id: null,
-  id: null,
-    name: null,
-    type: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    birthday: null,
-    nickName: null,
-    height: null,
-    weight: null,
-    ranking: 0
-},
-rules: {
-  name: [{ required: true, message: '姓名不能为空', trigger:['change', 'blur'] }],
-  nickName: [{ required: true, message: '昵称不能为空', trigger: ['change', 'blur'] }],
-  birthday: [{ required: true, message: '生日不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="成员管理-修改"
-     }else{
-      title.value="成员管理-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.birthday = dayjs(new Date().getTime()).format("YYYY-MM-DD")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-     // 类型
-     getDicts('person_type').then(res => {
-        typeList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getPerson(form.value.id).then(res => {
-        form.value = res.data   
-            // 类型
-           getDicts('person_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }
-}
-
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-function  selectBirthday() {
-      birthdayShow.value = true
-      proxy.$refs['birthdayRef'].innerValue = new Date().getTime()
-  }
-function birthdayConfirm(e) {
-      form.value.birthday = dayjs(e.value).format("YYYY-MM-DD")
-      birthdayShow.value = false
-  }
-
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updatePerson(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/person/list` })
-            }
-          })
-        })
-        }else {
-          addPerson(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/person/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/processRecord/addEdit.vue b/src/pages/health/processRecord/addEdit.vue
deleted file mode 100644
index f6f2061..0000000
--- a/src/pages/health/processRecord/addEdit.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="档案过程记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="记录时间" prop="recordingTime" required @click="selectDate()">
-            <u--input v-model="form.recordingTime" disabled disabledColor="#ffffff" placeholder="请选择记录时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="记录内容" required prop="content" >
-            <u--textarea v-model="form.content" placeholder="请填写记录内容" border="none" autoHeight inputAlign="right" count
-            maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="recordingTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getProcessRecord, addProcessRecord, updateProcessRecord } from '@/api/health/processRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("记录内容记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const data = reactive({
-form: {
-    id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    recordingTime: null,
-    content: null,
-    personId: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  content: [{ required: true, message: '记录内容不能为空', trigger: ['change', 'blur'] }],
-  recordingTime: [{ required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="过程档案记录-修改"
-     }else{
-      title.value="过程档案记录-新增"
-     }
-     }else{
-      title.value="过程档案记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.recordingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-  
-    if(form.value.id!=null){
-      getProcessRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['recordingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.recordingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-          }
-
-
-        }else {
-          addProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/processRecord/list.vue b/src/pages/health/processRecord/list.vue
deleted file mode 100644
index 8571ea1..0000000
--- a/src/pages/health/processRecord/list.vue
+++ /dev/null
@@ -1,447 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择记录时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="select-header">记录时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.personName+' ' +item.recordingTime" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-            <view class="item-row">
-            <text class="row-label">健康档案：</text>
-            <text class="row-value">{{ item.healthRecordName }}</text>
-          </view>
-          <!-- <view class="item-row">
-            <text class="row-label">记录时间：</text>
-            <text class="row-value">{{ item.recordingTime }}</text>
-          </view> -->
-          <view class="item-row">
-            <text class="row-label">记录内容：</text>
-            <text class="row-value">{{ item.content }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleCopy(item)">复制</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-        </view>
-      </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listProcessRecord, delProcessRecord } from '@/api/health/processRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    healthRecordId: null,
-    recordingTime: null,
-    temperature: null,
-    personId: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listProcessRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-       queryParams.value.healthRecordId = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delProcessRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/index.vue b/src/pages/health/statistic/index.vue
deleted file mode 100644
index 8878e82..0000000
--- a/src/pages/health/statistic/index.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <view class="work-container">
-
-
-    <!-- 宫格组件 -->
-    <uni-section title="健康管理" v-show="auth.hasPermi('health:person:list')"  type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false">
-        <uni-grid-item v-for="(item, index) in healthGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
-        <view class="grid-item-box">
-            <uni-icons :type="item.icon" size="30"></uni-icons>
-            <text class="text">{{ item.text }}</text>
-          </view>
-      </uni-grid-item>
-      </uni-grid>
-    </view>
-  </view>
-
-      
-</template>
-
-<script setup>
-import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
-
-// 也可以使用下面的方式
-	import { ref } from "vue";
-
-  const healthGridList=ref([
-        { path: '/pages/health/temperatureRecord/list', text: '体温统计', icon: 'spinner-cycle', permission: 'health:temperatureRecord:list'  },
-        { path: '/pages/health/marRecord/list', text: '用药统计', icon: 'shop-filled', permission: 'health:marRecord:list' }
-        
-      ])
-	function navigateTo(path) {
-    uni.navigateTo({
-        url: path
-      });
-	}
-</script>
-
-<style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
-
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
-
-  /* #endif */
-
-  .text {
-    text-align: center;
-    font-size: 22rpx;
-    margin-top: 10rpx;
-  }
-
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
-
-  .uni-margin-wrap {
-    width: 690rpx;
-    width: 100%;
-    ;
-  }
-
-  .swiper {
-    height: 300rpx;
-  }
-
-  .swiper-box {
-    height: 150px;
-  }
-
-  .swiper-item {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
-  }
-
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
-    }
-
-    .image {
-      width: 100%;
-    }
-  }
-</style>
diff --git a/src/pages/health/temperatureRecord/addEdit.vue b/src/pages/health/temperatureRecord/addEdit.vue
deleted file mode 100644
index b90e466..0000000
--- a/src/pages/health/temperatureRecord/addEdit.vue
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="体温记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="测量时间" prop="measureTime" required @click="selectDate()">
-            <u--input v-model="form.measureTime" disabled disabledColor="#ffffff" placeholder="请选择测量时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="体温" required prop="temperature" >
-            <u--input v-model="form.temperature"  type="number" placeholder="请填写体温"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="℃"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="measureTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getTemperatureRecord, addTemperatureRecord, updateTemperatureRecord } from '@/api/health/temperatureRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("体温记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const data = reactive({
-form: {
-    id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    measureTime: null,
-    temperature: null,
-    personId: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  temperature: [{ type: 'number',required: true, message: '体温不能为空', trigger: ['change', 'blur'] }],
-  measureTime: [{ required: true, message: '测量时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="体温记录-修改"
-     }else{
-      title.value="体温记录-新增"
-     }
-     }else{
-      title.value="体温记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-  
-    if(form.value.id!=null){
-      getTemperatureRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['measureTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.measureTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-          }
-
-
-        }else {
-          addTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 16rpx 24rpx;
-  background-color: #fff;
-  border-radius: 8rpx;
-
-  .section-title {
-    width: 360rpx;
-    color: #333333;
-    line-height: 44rpx;
-    font-size: 30rpx;
-    border-left: 6rpx solid #2681FF;
-    padding-left: 26rpx;
-  }
-
-  .form-view {
-    padding: 20rpx 0rpx 0 10rpx;
-
-    .form-btn {
-      padding-top: 20rpx;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/temperatureRecord/list.vue b/src/pages/health/temperatureRecord/list.vue
deleted file mode 100644
index 6f693cb..0000000
--- a/src/pages/health/temperatureRecord/list.vue
+++ /dev/null
@@ -1,443 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-         <view class="search-view">
-          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-	    suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-       </view>
-       </u-sticky>
-    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择测量时间" suffixIcon="calendar"
-          suffixIconStyle="color: #909399" class="search-input">
-          </u-input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="select-header">测量时间</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="datetime"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.personName+'，体温：'+item.temperature +'℃'" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">测量时间：</text>
-            <text class="row-value">{{ item.measureTime }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">健康档案：</text>
-            <text class="row-value">{{ item.healthRecordName }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleCopy(item)">复制</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import { listTemperatureRecord, delTemperatureRecord } from '@/api/health/temperatureRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    healthRecordId: null,
-    measureTime: null,
-    temperature: null,
-    personId: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listTemperatureRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-       queryParams.value.healthRecordId = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delTemperatureRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-
-  .search-input {
-    background: #F5F5F5;
-    color: #333333;
-    margin-right: 36rpx;
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 24rpx;
-  padding: 32rpx;
-  background-color: #fff;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 16rpx;
-
-    .status {
-      .status-item {
-        width: 120rpx;
-        height: 44rpx;
-        text-align: center;
-        line-height: 44rpx;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-      }
-
-      .status1 {
-        background: #F0F0F0;
-        color: #8C8C8C;
-      }
-
-      .status2 {
-        background: rgba(38, 129, 255, 0.2);
-        color: #2681FF;
-      }
-
-      .status3 {
-        background: #F7F7F7;
-        color: #2681FF;
-      }
-
-      .status4 {
-        background: rgba(255, 85, 51, 0.2);
-        color: #FF5533;
-      }
-
-      .status5 {
-        background: #F7F7F7;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .status7 {
-        background: rgba(255, 129, 51, 0.2);
-        color: #FF8133;
-      }
-
-      .status8 {
-        background: rgba(65, 217, 165, 0.2);
-        color: #41D9A5;
-      }
-    }
-  }
-
-  .item-row {
-    padding: 16rpx 0;
-
-    .row-label {
-      color: rgba(0, 0, 0, 0.55);
-    }
-
-    .row-value {
-      color: rgba(0, 0, 0, 0.85)
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-
-    .btn {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      margin-left: 5rpx;
-      text-align: center;
-    }
-
-    .circulation {
-      background: rgba(0, 0, 0, 0.04);
-      margin-right: 24rpx;
-      color: rgba(0, 0, 0, 0.85);
-    }
-
-    .filling {
-      background: #2681FF;
-      border-radius: 8rpx;
-      color: #FFFFFF;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/imaotai/iitem/list.vue b/src/pages/imaotai/iitem/list.vue
new file mode 100644
index 0000000..5f6345c
--- /dev/null
+++ b/src/pages/imaotai/iitem/list.vue
@@ -0,0 +1,289 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <!-- <view class="search-view">
+          <u-input v-model="queryParams.title" border="false" type="select"   @click="handleSearch" placeholder="请填入商品名称" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+       </view> -->
+       </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header">
+            <u--text lines="2" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.title+'-'+item.itemCode" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <image :src="item.pictureV2"></image>
+          </view>  
+          <view class="item-row">
+            <text class="row-label"></text>
+            <text class="row-value">{{ item.content }}</text>
+          </view>   
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+  </view>
+</template>
+
+<script setup>
+import { getDicts } from '@/api/system/dict/data.js'
+import { listIitem } from '@/api/imaotai/iitem.js'
+import { timeHandler } from '@/utils/common.ts'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const typeList = ref([])
+const statusList = ref([])
+
+const  flag= ref(true)
+const data = reactive({
+  filterPanel: false,
+  queryParams: {
+    itemCode: null,
+    title: null,
+    type: null
+   } 
+})
+const { filterPanel, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      listData.value=[]
+      getList()
+      isShow.value = false
+    }
+  });
+
+  function handleSearch() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+     }
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+       // 类型
+       getDicts('ilog_type').then(res => {
+        typeList.value = res.data
+      })
+             // 类型
+        getDicts('sys_common_status').then(res => {
+          statusList.value = res.data
+      })
+      status.value = 'loading'
+      listIitem({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 22rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/person/list.vue b/src/pages/imaotai/ilog/list.vue
similarity index 70%
rename from src/pages/health/person/list.vue
rename to src/pages/imaotai/ilog/list.vue
index df70669..3a629ac 100644
--- a/src/pages/health/person/list.vue
+++ b/src/pages/imaotai/ilog/list.vue
@@ -2,56 +2,42 @@
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
          <view class="search-view">
-          <u-input v-model="queryParams.name" border="false" type="select"   @click="handleSearch" placeholder="请填入名称或昵称" suffixIcon="search"
+          <u-input v-model="queryParams.mobile" border="false" type="select"   @click="handleSearch" placeholder="请填入用户" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
        </view>
        </u-sticky>
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header">
+          <!-- <view class="item-header">
             <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
-          </view>
+              :text="item.mobile" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view> -->
           <view class="item-row">
-            <text class="row-label">昵称：</text>
-            <text class="row-value">{{ item.nickName }}</text>
+            <text class="row-label">用户：</text>
+            <text class="row-value">{{ item.mobile }}</text>
           </view>
           <view class="item-row">
             <text class="row-label">类型：</text>
             <text class="row-value">{{ dictStr(item.type,typeList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">生日：</text>
-            <text class="row-value">{{ item.birthday }}</text>
+            <text class="row-label">操作状态：</text>
+            <text class="row-value">{{ dictStr(item.status,statusList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">年龄：</text>
-            <text class="row-value">{{ item.age }}</text>
+            <text class="row-label">操作时间：</text>
+            <text class="row-value">{{ item.operTime }}</text>
           </view>
+
           <view class="item-row">
-            <text class="row-label">身高（CM）：</text>
-            <text class="row-value">{{ item.height }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">体重（KG）：</text>
-            <text class="row-value">{{ item.weight }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">排序：</text>
-            <text class="row-value">{{ item.ranking }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
+            <text class="row-label">记录内容：</text>
+            <text class="row-value">{{ item.logContent }}</text>
           </view>
           <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
-          </view>
+              <view class="btn filling" @click="handleDelete(item)">删除</view>
+            </view>
         </view>
       </u-list-item>
       <view>
@@ -62,8 +48,8 @@
 </template>
 
 <script setup>
-import { listPerson, delPerson } from '@/api/health/person'
 import { getDicts } from '@/api/system/dict/data.js'
+import { listIlog, delIlog } from '@/api/imaotai/ilog.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
 import dayjs from 'dayjs'
@@ -74,14 +60,15 @@ const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
 const typeList = ref([])
+const statusList = ref([])
 
 const  flag= ref(true)
 const data = reactive({
   filterPanel: false,
   queryParams: {
-    name: null,
-    type: null,
-    nickName: null
+    mobile: null,
+    status: null,
+    type: null
    } 
 })
 const { filterPanel, queryParams} = toRefs(data)
@@ -124,11 +111,15 @@ function loadmore() {
     }
 function getList() {
        // 类型
-       getDicts('person_type').then(res => {
+       getDicts('ilog_type').then(res => {
         typeList.value = res.data
+      })
+             // 类型
+        getDicts('sys_common_status').then(res => {
+          statusList.value = res.data
       })
       status.value = 'loading'
-      listPerson({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listIlog({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -139,30 +130,20 @@ function getList() {
         status.value = 'nomore'
       })
     }
-
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/person/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/person/addEdit` })
-      isShow.value = true
-    }
     function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delPerson(item.id)
-              uni.navigateTo({ url: `/pages/health/person/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
+        uni.showModal({
+              title: '提示',
+              content: '你确定要删除吗',
+              success: function (res) {
+                  if (res.confirm) {
+                    delIlog(item.logId)
+                uni.navigateTo({ url: `/pages/imaotai/ilog/listInner` })
+                  } else if (res.cancel) {
+                      console.log('取消');
+                  }
+              }
+          });
+      }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/health/medicineStock/list.vue b/src/pages/imaotai/ilog/listInner.vue
similarity index 62%
rename from src/pages/health/medicineStock/list.vue
rename to src/pages/imaotai/ilog/listInner.vue
index 3634f2d..7694c5a 100644
--- a/src/pages/health/medicineStock/list.vue
+++ b/src/pages/imaotai/ilog/listInner.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
          <view class="search-view">
-          <u-input v-model="queryParams.medicalName" border="false" type="select"  @click="handleMedical" placeholder="请选择药品" suffixIcon="search"
+          <u-input v-model="queryParams.mobile" border="false" type="select"   @click="handleSearch" placeholder="请填入用户" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
        </view>
@@ -10,37 +10,47 @@
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header"  @click="enterDetails(item)">
+          <!-- <view class="item-header">
             <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
+              :text="item.mobile" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view> -->
+          <view class="item-row">
+            <text class="row-label">用户：</text>
+            <text class="row-value">{{ item.mobile }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">规格总数：</text>
-            <text class="row-value">{{ item.totalCount }}</text>
+            <text class="row-label">类型：</text>
+            <text class="row-value">{{ dictStr(item.type,typeList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">剩余数量：</text>
-            <text class="row-value">{{ item.leftCount }}</text>
+            <text class="row-label">操作状态：</text>
+            <text class="row-value">{{ dictStr(item.status,statusList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">规格单位：</text>
-            <text class="row-value">{{ dictStr(item.unit, unitList) }}</text>
+            <text class="row-label">操作时间：</text>
+            <text class="row-value">{{ item.operTime }}</text>
           </view>
+
+          <view class="item-row">
+            <text class="row-label">记录内容：</text>
+            <text class="row-value">{{ item.logContent }}</text>
+          </view>
+          <view class="operate" >
+              <view class="btn filling" @click="handleDelete(item)">删除</view>
+            </view>
         </view>
       </u-list-item>
+      <view>
+      </view>
       <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
     </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-        @confirm="handleMedicalConfirm"></u-picker>
   </view>
 </template>
 
 <script setup>
-import { listMedicineRealtimeStock } from '@/api/health/medicineStockIn'
-import { listMedicineBasic } from '@/api/health/medicineBasic'
 import { getDicts } from '@/api/system/dict/data.js'
+import { listIlog, delIlog } from '@/api/imaotai/ilog.js'
+import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
 import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
@@ -49,33 +59,19 @@ const pageNum = ref(1)
 const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const stateList = ref([])
+const typeList = ref([])
+const statusList = ref([])
 
-const unitList = ref([])
-const medicalList = ref([])
-const showMedical = ref(false)
 const  flag= ref(true)
 const data = reactive({
   filterPanel: false,
-  queryMedicalParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
   queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    medicineId: null,
-    resource: null,
-    place: null
+    mobile: null,
+    status: null,
+    type: null
    } 
 })
-const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
+const { filterPanel, queryParams} = toRefs(data)
 const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
@@ -91,6 +87,12 @@ onLoad(() => {
     }
   });
 
+  function handleSearch() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+     }
+
   function dictStr(val, arr) {
       let str = ''
       arr.map(item => {
@@ -101,22 +103,6 @@ onLoad(() => {
       return str
     }
 
-  function selectType(item) {
-      queryParams.value.state = item.dictValue
-      stateList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
 function loadmore() {
       pageNum.value += 1
       if (status.value == 'loadmore') {
@@ -124,16 +110,16 @@ function loadmore() {
       }
     }
 function getList() {
-  listMedicineBasic(queryMedicalParams.value).then((response) => {
-        medicalList.value = [response.rows] 
+       // 类型
+       getDicts('ilog_type').then(res => {
+        typeList.value = res.data
       })
-       // 用药地点
-       getDicts('medical_unit').then(res => {
-        unitList.value = res.data
+             // 类型
+        getDicts('sys_common_status').then(res => {
+          statusList.value = res.data
       })
-         
       status.value = 'loading'
-      listMedicineRealtimeStock({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listIlog({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -144,43 +130,20 @@ function getList() {
         status.value = 'nomore'
       })
     }
-
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-
-    function handleMedical() {
-        if (medicalList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品名称为空  ', type: 'warning'
-          })
-        } else {
-          showMedical.value = true
-        }
-     }
-  function   handleMedicalConfirm(e) {
-    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
-    queryParams.value.medicineId= e.value[0].id
-        showMedical.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleMedicalCancel() {
-       showMedical.value = false
-       queryParams.value.medicalName =null
-       queryParams.value.medicineId= null
-       getList()
-  }
-
-
-
-	
+    function handleDelete(item) {
+        uni.showModal({
+              title: '提示',
+              content: '你确定要删除吗',
+              success: function (res) {
+                  if (res.confirm) {
+                    delIlog(item.logId)
+                uni.switchTab({url: `/pages/imaotai/ilog/list`})
+                  } else if (res.cancel) {
+                      console.log('取消');
+                  }
+              }
+          });
+      }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/health/activity/list.vue b/src/pages/imaotai/ishop/list.vue
similarity index 64%
rename from src/pages/health/activity/list.vue
rename to src/pages/imaotai/ishop/list.vue
index 626f73f..9c12378 100644
--- a/src/pages/health/activity/list.vue
+++ b/src/pages/imaotai/ishop/list.vue
@@ -2,11 +2,9 @@
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
          <view class="search-view">
-          <u-input v-model="queryParams.name" border="false" type="select"   @click="handleSearch" placeholder="请填入活动名称" suffixIcon="search"
+          <u-input v-model="queryParams.mobile" border="false" type="select"   @click="handleSearch" placeholder="请填入用户" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
-        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
        </view>
        </u-sticky>
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
@@ -14,57 +12,35 @@
         <view class="list-item">
           <view class="item-header">
             <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="dictStr(item.type,typeList) +'：'+item.name" size="30rpx" color="#333333" :bold="true"></u--text>
+              :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
           <view class="item-row">
-            <text class="row-label">活动地点：</text>
-            <text class="row-value">{{ item.place }}</text>
+            <text class="row-label">省份：</text>
+            <text class="row-value">{{ item.provinceName }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">成员：</text>
-            <text class="row-value">{{ item.partner }}</text>
+            <text class="row-label">城市：</text>
+            <text class="row-value">{{ item.cityName}}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">开始时间：</text>
-            <text class="row-value">{{ item.startTime }}</text>
+            <text class="row-label">地区：</text>
+            <text class="row-value">{{ item.districtName}}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">结束时间：</text>
-            <text class="row-value">{{ item.endTime }}</text>
+            <text class="row-label">地址：</text>
+            <text class="row-value">{{ item.address}}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">活动时长：</text>
-            <text class="row-value">{{ item.exerciseTime }}</text>
+            <text class="row-label">营业时间：</text>
+            <text class="row-value">{{ item.openStartTime+'-'+ item.openEndTime}}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">活动量：</text>
-            <text class="row-value">{{ item.activityVolume }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">总费用（元）：</text>
-            <text class="row-value">{{ item.totalCost }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">费用明细：</text>
-            <text class="row-value">{{ item.costDetail }}</text>
-          </view>
-          
-          <view class="item-row">
-            <text class="row-label">饮食：</text>
-            <text class="row-value">{{ item.foods }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">收获：</text>
-            <text class="row-value">{{ item.harvest }}</text>
-          </view>
-          <view class="item-row">
-            <text class="row-label">备注：</text>
-            <text class="row-value">{{ item.remark }}</text>
-          </view>
-          <view class="operate" >
-            <view class="btn filling" @click="handleEdit(item)">修改</view>
-            <view class="btn filling" @click="handleDelete(item)">删除</view>
+
+            <text class="row-label">更新时间：</text>
+            <text class="row-value">{{ item.createTime }}</text>
           </view>
+
+
         </view>
       </u-list-item>
       <view>
@@ -75,8 +51,8 @@
 </template>
 
 <script setup>
-import { listActivity, delActivity } from '@/api/health/activity'
 import { getDicts } from '@/api/system/dict/data.js'
+import { listIshop } from '@/api/imaotai/ishop.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
 import dayjs from 'dayjs'
@@ -87,14 +63,15 @@ const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
 const typeList = ref([])
+const statusList = ref([])
 
 const  flag= ref(true)
 const data = reactive({
   filterPanel: false,
   queryParams: {
-    name: null,
-    type: null,
-    nickName: null
+    mobile: null,
+    status: null,
+    type: null
    } 
 })
 const { filterPanel, queryParams} = toRefs(data)
@@ -137,11 +114,15 @@ function loadmore() {
     }
 function getList() {
        // 类型
-       getDicts('activity_type').then(res => {
+       getDicts('ilog_type').then(res => {
         typeList.value = res.data
+      })
+             // 类型
+        getDicts('sys_common_status').then(res => {
+          statusList.value = res.data
       })
       status.value = 'loading'
-      listActivity({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listIshop({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -152,30 +133,6 @@ function getList() {
         status.value = 'nomore'
       })
     }
-
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/activity/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/activity/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delActivity(item.id)
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/imaotai/iuser/add.vue b/src/pages/imaotai/iuser/add.vue
new file mode 100644
index 0000000..500fd31
--- /dev/null
+++ b/src/pages/imaotai/iuser/add.vue
@@ -0,0 +1,459 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="账号添加"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="手机号" prop="mobile" required >
+              <u--input v-model="form.mobile"  placeholder="请填写手机号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item >
+                <button class="btn filling" style="width: 150px;height: 28px;" @click="sendMobileCode(form.mobile)">发送验证码<span  v-if="state">({{ stateNum }})</span></button>
+            </u-form-item>
+            <u-form-item label="验证码" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写验证码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="预约商品" prop="itemCode" required>
+            <mySelectCheckbox v-model="itemSelect" multiple placeholder="请选择预约商品" dataKey="title" dataValue="itemCode" :localdata="itemList"  
+            @change="itemChange"></mySelectCheckbox>
+            </u-form-item>
+            <u-form-item label="省份" prop="provinceName" required @click="handleProvinceName">
+              <u--input v-model="form.provinceName" disabled disabledColor="#ffffff" placeholder="请选择省份"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="城市" prop="cityName" required @click="handleCityName">
+              <u--input v-model="form.cityName" disabled disabledColor="#ffffff" placeholder="请选择城市"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="区域" prop="districtName" required @click="handleDistrictName">
+              <u--input v-model="form.districtName" disabled disabledColor="#ffffff" placeholder="请选择区域"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="默认预约门店" prop="shopName" required @click="handleShopName">
+              <u--input v-model="form.shopName" disabled disabledColor="#ffffff" placeholder="请选择默认预约门店"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="预约类型" prop="shopTypeName" required @click="handleShopType">
+              <u--input v-model="form.shopTypeName" disabled disabledColor="#ffffff" placeholder="请选择预约类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="随机时间预约" prop="randomMinuteName" required @click="handleRandomMinuteName">
+              <u--input v-model="form.randomMinuteName" disabled disabledColor="#ffffff" placeholder="请选择随机时间预约"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="预约执行分钟" prop="minute" required >
+              <u--input v-model="form.minute"   type="number" placeholder="请填写预约执行分钟"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+        <u-picker itemHeight="88" :show="showProvinceName" :columns="provinceNameList" keyName="provinceName" @cancel="handleProvinceNameCancel"
+        @confirm="handleProvinceNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showCityName" :columns="cityNameList" keyName="cityName" @cancel="handleCityNameCancel"
+        @confirm="handleCityNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showDistrictName" :columns="districtNameList" keyName="districtName" @cancel="handleDistrictNameCancel"
+        @confirm="handleDistrictNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showShopName" :columns="shopNameList" keyName="name" @cancel="handleShopNameCancel"
+        @confirm="handleShopNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showShopType" :columns="shopTypeList" keyName="dictLabel" @cancel="handleShopTypeCancel"
+        @confirm="handleShopTypeConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showRandomMinuteName" :columns="randomMinuteNameList" keyName="dictLabel" @cancel="handleRandomMinuteNameCancel"
+        @confirm="handleRandomMinuteNameConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { sendCode, loginIUser } from '@/api/imaotai/iuser.js'
+import { listIshop, listProvince, listCity, listDistrict } from '@/api/imaotai/ishop.js'
+import { listIitem } from '@/api/imaotai/iitem.js'
+const { proxy } = getCurrentInstance()
+  import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+import mySelectCheckbox  from '@/components/my-selectCheckbox/my-selectCheckbox.vue';
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const title = ref("账号添加")
+
+const itemSelect = ref([])
+
+const provinceNameList = ref([])
+const showProvinceName = ref(false)
+
+const cityNameList = ref([])
+const showCityName = ref(false)
+
+const districtNameList = ref([])
+const showDistrictName = ref(false)
+
+const shopNameList = ref([])
+const showShopName = ref(false)
+
+const shopTypeList = ref([])
+const showShopType = ref(false)
+
+const randomMinuteNameList = ref([])
+const showRandomMinuteName = ref(false)
+
+// 发送短信按钮倒计时
+const state = ref(false)
+const stateNum = ref(60)
+
+const itemList = ref([])
+
+
+const data = reactive({
+form: {
+  mobile: null,
+    userId: null,
+    token: null,
+    cookie: null,
+    code: null,
+    deviceId: null,
+    itemCode: null,
+    ishopId: null,
+    provinceName: null,
+    cityName: null,
+    districtName: null,
+    address: null,
+    lat: null,
+    lng: null,
+    minute: 8,
+    shopTypeName: '预约本市出货量最大的门店',
+    randomMinuteName: '开启',
+    shopType: '1',
+    randomMinute: '0',
+    pushPlusToken: null,
+    jsonResult: null,
+    remark: null,
+    expireTime: null,
+    delFlag: null,
+    createTime: null,
+    createUser: null,
+    updateTime: null,
+    updateUser: null,
+    createBy: null
+},
+queryDistrictParams: {
+    pageNum: 1,
+    pageSize: 2000,
+    provinceName: null,
+    cityName: null,
+    districtName: null
+  },
+  queryShopParams: {
+    pageNum: 1,
+    pageSize: 2000,
+    provinceName: null,
+    cityName: null,
+    districtName: null
+  },
+rules: {
+  mobile: [{ required: true, message: '手机号不能为空', trigger:['change', 'blur'] }],
+  shopName: [{ required: true, message: '默认预约门店不能为空', trigger:['change', 'blur'] }],
+  code: [{ required: true, message: '验证码不能为空', trigger:['change', 'blur'] }],
+  randomMinuteName: [{ required: true, message: '随机时间预约不能为空', trigger:['change', 'blur'] }],
+  shopType: [{ required: true, message: '预约类型不能为空', trigger:['change', 'blur'] }],
+  minute: [{type: 'number',required: true, message: '预约执行分钟不能为空', trigger: ['change', 'blur'] }],
+  provinceName: [{ required: true, message: '省份不能为空', trigger: ['change', 'blur'] }],
+  cityName: [{ required: true, message: '城市不能为空', trigger: ['change', 'blur'] }],
+  districtName: [{ required: true, message: '区域不能为空', trigger: ['change', 'blur'] }],
+  itemCode: [{ required: true, message: '预约商品不能为空', trigger: ['change', 'blur'] }],
+}
+})
+const { form, queryDistrictParams, queryShopParams , rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.id = option.id
+    title.value="账号添加"
+    getData()
+})
+onReady(() => {
+})
+function  getData() {
+     getDicts('open_close').then(res => {
+      randomMinuteNameList.value =[res.data] 
+      })
+     getDicts('reservation_type').then(res => {
+      shopTypeList.value =[res.data] 
+      })
+      listProvince(queryDistrictParams.value).then((response) => {
+        provinceNameList.value = [response.rows] 
+      })
+
+      listCity(queryDistrictParams.value).then((response) => {
+        cityNameList.value = [response.rows] 
+      })
+      listDistrict(queryDistrictParams.value).then((response) => {
+        districtNameList.value = [response.rows] 
+       })
+      listIshop(queryShopParams.value).then((response) => {
+        shopNameList.value = [response.rows] 
+      })
+
+      listIitem().then((response) => {
+    itemList.value = response.rows
+  })
+}
+
+
+function itemChange(){
+  form.value.itemCode = ''
+  itemSelect.value.forEach((e) => {
+    form.value.itemCode += e + '@'
+  })
+}
+  function handleRandomMinuteName() {
+        if (randomMinuteNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '随机时间预约为空  ', type: 'warning'
+          })
+        } else {
+          showRandomMinuteName.value = true
+        }
+     }
+  function   handleRandomMinuteNameConfirm(e) {
+        form.value.randomMinuteName = e.value[0].dictLabel
+        form.value.randomMinute = e.value[0].dictValue
+        showRandomMinuteName.value = false
+  }
+    function handleRandomMinuteNameCancel() {
+       showRandomMinuteName.value = false
+      }
+
+      function handleCityName() {
+        if (cityNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '城市为空  ', type: 'warning'
+          })
+        } else {
+          showCityName.value = true
+        }
+     }
+  function   handleCityNameConfirm(e) {
+        form.value.cityName = e.value[0].cityName
+
+        queryDistrictParams.value.cityName = e.value[0].cityName
+  queryDistrictParams.value.districtName = null
+  form.value.districtName = null
+  form.value.ishopId = null
+  listDistrict(queryDistrictParams.value).then((response) => {
+    districtNameList.value = [response.rows] 
+    queryShopParams.value.provinceName = form.value.provinceName
+    queryShopParams.value.cityName = e.value[0].cityName
+    queryShopParams.value.districtName = null
+    listIshop(queryShopParams.value).then((response) => {
+      shopNameList.value = [response.rows] 
+    })
+  })
+        showCityName.value = false
+  }
+ function handleCityNameCancel() {
+       showCityName.value = false
+      }
+
+      function handleProvinceName() {
+        if (provinceNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '省份为空  ', type: 'warning'
+          })
+        } else {
+          showProvinceName.value = true
+        }
+     }
+  function   handleProvinceNameConfirm(e) {
+        form.value.provinceName = e.value[0].provinceName
+
+  queryDistrictParams.value.provinceName = e.value[0].provinceName
+  queryDistrictParams.value.cityName = null
+  form.value.cityName = null
+  form.value.districtName = null
+  form.value.cityName = null
+  form.value.ishopId = null
+  listCity(queryDistrictParams.value).then((response) => {
+    cityNameList.value = [response.rows] 
+    listDistrict(queryDistrictParams.value).then((response) => {
+      districtNameList.value = [response.rows]
+      queryShopParams.value.provinceName = e.value[0].provinceName
+      queryShopParams.value.cityName = form.value.cityName
+      queryShopParams.value.districtName = form.value.districtName
+      listIshop(queryShopParams.value).then((response) => {
+        shopNameList.value = [response.rows] 
+      })
+    })
+  })
+        showProvinceName.value = false
+  }
+ function handleProvinceNameCancel() {
+       showProvinceName.value = false
+      }
+
+      function handleDistrictName() {
+        if (districtNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '区域为空  ', type: 'warning'
+          })
+        } else {
+          showDistrictName.value = true
+        }
+     }
+  function   handleDistrictNameConfirm(e) {
+        form.value.districtName = e.value[0].districtName
+
+        queryShopParams.value.districtName = e.value[0].districtName
+  queryShopParams.value.cityName = form.value.cityName
+  queryShopParams.value.provinceName = form.value.provinceName
+  form.value.ishopId = null
+  listIshop(queryShopParams.value).then((response) => {
+    shopNameList.value = [response.rows] 
+  })
+        showDistrictName.value = false
+  }
+ function handleDistrictNameCancel() {
+       showDistrictName.value = false
+      }
+
+      function handleShopName() {
+        if (shopNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '默认预约门店为空  ', type: 'warning'
+          })
+        } else {
+          showShopName.value = true
+        }
+     }
+  function   handleShopNameConfirm(e) {
+        form.value.shopName = e.value[0].name
+        form.value.ishopId = e.value[0].ishopId
+        showShopName.value = false
+  }
+ function handleShopNameCancel() {
+       showShopName.value = false
+      }
+
+      function handleShopType() {
+        if (shopTypeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '预约类型为空  ', type: 'warning'
+          })
+        } else {
+          showShopType.value = true
+        }
+     }
+  function   handleShopTypeConfirm(e) {
+        form.value.shopTypeName = e.value[0].dictLabel
+        form.value.shopType = e.value[0].dictValue
+        showShopType.value = false
+  }
+ function handleShopTypeCancel() {
+       showShopType.value = false
+      }
+
+
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        loginIUser(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.switchTab({ url: `/pages/imaotai/iuser/list` })
+            }
+          })
+        })
+      })
+    }
+
+    //发送验证码
+function sendMobileCode(mobile) {
+    form.value.deviceId = guid()
+  sendCode(mobile, form.value.deviceId).then((response) => {
+    proxy.$modal.msgSuccess('发送成功')
+    state.value = true
+    const timer = setInterval(() => {
+      stateNum.value--
+      if (stateNum.value === 0) {
+        clearInterval(timer)
+        state.value = false
+        stateNum.value = 60
+      }
+    }, 1000)
+  })
+}
+
+function guid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0
+    const v = c == 'x' ? r : (r & 0x3) | 0x8
+    return v.toString(16)
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+    .btn {
+        width: 226rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/imaotai/iuser/edit.vue b/src/pages/imaotai/iuser/edit.vue
new file mode 100644
index 0000000..fc5f4d9
--- /dev/null
+++ b/src/pages/imaotai/iuser/edit.vue
@@ -0,0 +1,476 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="账号添加"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="手机号" prop="name" required >
+              <u--input v-model="form.mobile"  readonly placeholder="请填写手机号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="用户Id" prop="userId"  required >
+              <u--input readonly v-model="form.userId"  placeholder="请填写用户Id"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="预约商品" prop="itemCode" required>
+            <mySelectCheckbox v-model="itemSelect" multiple dataKey="title" dataValue="itemCode" :localdata="itemList"  
+            @change="itemChange"></mySelectCheckbox>
+            </u-form-item>
+            <u-form-item label="省份" prop="provinceName" required @click="handleProvinceName">
+              <u--input v-model="form.provinceName" disabled disabledColor="#ffffff" placeholder="请选择省份"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="城市" prop="cityName" required @click="handleCityName">
+              <u--input v-model="form.cityName" disabled disabledColor="#ffffff" placeholder="请选择城市"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="区域" prop="districtName" required @click="handleDistrictName">
+              <u--input v-model="form.districtName" disabled disabledColor="#ffffff" placeholder="请选择区域"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="默认预约门店" prop="shopName" required @click="handleShopName">
+              <u--input v-model="form.shopName" disabled disabledColor="#ffffff" placeholder="请选择默认预约门店"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="预约类型" prop="shopTypeName" required @click="handleShopType">
+              <u--input v-model="form.shopTypeName" disabled disabledColor="#ffffff" placeholder="请选择预约类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="随机时间预约" prop="randomMinuteName" required @click="handleRandomMinuteName">
+              <u--input v-model="form.randomMinuteName" disabled disabledColor="#ffffff" placeholder="请选择随机时间预约"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="预约执行分钟" prop="minute" required >
+              <u--input v-model="form.minute"   type="number" placeholder="请填写预约执行分钟"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+        <u-picker itemHeight="88" :show="showProvinceName" :columns="provinceNameList" keyName="provinceName" @cancel="handleProvinceNameCancel"
+        @confirm="handleProvinceNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showCityName" :columns="cityNameList" keyName="cityName" @cancel="handleCityNameCancel"
+        @confirm="handleCityNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showDistrictName" :columns="districtNameList" keyName="districtName" @cancel="handleDistrictNameCancel"
+        @confirm="handleDistrictNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showShopName" :columns="shopNameList" keyName="name" @cancel="handleShopNameCancel"
+        @confirm="handleShopNameConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showShopType" :columns="shopTypeList" keyName="dictLabel" @cancel="handleShopTypeCancel"
+        @confirm="handleShopTypeConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showRandomMinuteName" :columns="randomMinuteNameList" keyName="dictLabel" @cancel="handleRandomMinuteNameCancel"
+        @confirm="handleRandomMinuteNameConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { getIuser,updateIuser } from '@/api/imaotai/iuser.js'
+import { listIshop, listProvince, listCity, listDistrict } from '@/api/imaotai/ishop.js'
+import { listIitem } from '@/api/imaotai/iitem.js'
+const { proxy } = getCurrentInstance()
+  import { getDicts } from '@/api/system/dict/data.js'
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+import mySelectCheckbox  from '@/components/my-selectCheckbox/my-selectCheckbox.vue';
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const title = ref("账号添加")
+
+const itemSelect = ref([])
+
+const provinceNameList = ref([])
+const showProvinceName = ref(false)
+
+const cityNameList = ref([])
+const showCityName = ref(false)
+
+const districtNameList = ref([])
+const showDistrictName = ref(false)
+
+const shopNameList = ref([])
+const showShopName = ref(false)
+
+const shopTypeList = ref([])
+const showShopType = ref(false)
+
+const randomMinuteNameList = ref([])
+const showRandomMinuteName = ref(false)
+
+// 发送短信按钮倒计时
+const state = ref(false)
+const stateNum = ref(60)
+
+const itemList = ref([])
+
+
+const data = reactive({
+form: {
+  mobile: null,
+    userId: null,
+    token: null,
+    cookie: null,
+    code: null,
+    deviceId: null,
+    itemCode: null,
+    ishopId: null,
+    provinceName: null,
+    cityName: null,
+    districtName: null,
+    address: null,
+    lat: null,
+    lng: null,
+    minute: 8,
+    shopTypeName: '预约本市出货量最大的门店',
+    randomMinuteName: '开启',
+    shopType: '1',
+    randomMinute: '0',
+    pushPlusToken: null,
+    jsonResult: null,
+    remark: null,
+    expireTime: null,
+    delFlag: null,
+    createTime: null,
+    createUser: null,
+    updateTime: null,
+    updateUser: null,
+    createBy: null
+},
+queryDistrictParams: {
+    pageNum: 1,
+    pageSize: 2000,
+    provinceName: null,
+    cityName: null,
+    districtName: null
+  },
+  queryShopParams: {
+    pageNum: 1,
+    pageSize: 2000,
+    provinceName: null,
+    cityName: null,
+    districtName: null
+  },
+rules: {
+  mobile: [{ required: true, message: '手机号不能为空', trigger:['change', 'blur'] }],
+  shopName: [{ required: true, message: '默认预约门店不能为空', trigger:['change', 'blur'] }],
+  code: [{ required: true, message: '验证码不能为空', trigger:['change', 'blur'] }],
+  randomMinuteName: [{ required: true, message: '随机时间预约不能为空', trigger:['change', 'blur'] }],
+  shopType: [{ required: true, message: '预约类型不能为空', trigger:['change', 'blur'] }],
+  minute: [{type: 'number',required: true, message: '预约执行分钟不能为空', trigger: ['change', 'blur'] }],
+  provinceName: [{ required: true, message: '省份不能为空', trigger: ['change', 'blur'] }],
+  cityName: [{ required: true, message: '城市不能为空', trigger: ['change', 'blur'] }],
+  districtName: [{ required: true, message: '区域不能为空', trigger: ['change', 'blur'] }],
+  itemCode: [{ required: true, message: '预约商品不能为空', trigger: ['change', 'blur'] }],
+}
+})
+const { form, queryDistrictParams, queryShopParams , rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.mobile = option.id
+    title.value="账号修改"
+    getData()
+})
+onReady(() => {
+})
+function  getData() {
+
+  getDicts('open_close').then(res => {
+      randomMinuteNameList.value =[res.data] 
+      })
+     getDicts('reservation_type').then(res => {
+      shopTypeList.value =[res.data] 
+      })
+      listIitem().then((response) => {
+    itemList.value = response.rows
+  })
+  listProvince(queryDistrictParams.value).then((response) => {
+        provinceNameList.value = [response.rows] 
+      })
+  getIuser(form.value.mobile).then(res => {
+        form.value = res.data   
+
+        queryDistrictParams.value.provinceName = form.value.provinceName
+    listCity(queryDistrictParams.value).then((response) => {
+      cityNameList.value =[ response.rows]
+      queryDistrictParams.value.cityName = form.value.cityName
+      listDistrict(queryDistrictParams.value).then((response) => {
+        districtNameList.value = [response.rows]
+        queryShopParams.value.provinceName = form.value.provinceName
+        queryShopParams.value.cityName = form.value.cityName
+        queryShopParams.value.districtName = form.value.districtName
+        listIshop(queryShopParams.value).then((response) => {
+          shopNameList.value = [response.rows]
+        })
+      })
+    })
+    itemSelect.value = []
+    if (form.value.itemCode.indexOf('@') == -1 && form.value.itemCode !== '') {
+      itemSelect.value.push(form.value.itemCode)
+    } else {
+      const arr = form.value.itemCode.split('@')
+      arr.forEach((e) => {
+        if (e !== '') {
+          itemSelect.value.push(e)
+        }
+      })
+    }
+            // 类型
+           getDicts('open_close').then(result => {
+          form.value.randomMinuteName=dictStr(form.value.randomMinute, result.data)
+         })
+          getDicts('reservation_type').then(result => {
+          form.value.shopTypeName=dictStr(form.value.shopType, result.data)
+         })
+
+
+
+      })
+
+}
+
+
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+function itemChange(){
+form.value.itemCode = ''
+  itemSelect.value.forEach((e) => {
+    form.value.itemCode += e + '@'
+  })
+}
+  function handleRandomMinuteName() {
+        if (randomMinuteNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '随机时间预约为空  ', type: 'warning'
+          })
+        } else {
+          showRandomMinuteName.value = true
+        }
+     }
+  function   handleRandomMinuteNameConfirm(e) {
+        form.value.randomMinuteName = e.value[0].dictLabel
+        form.value.randomMinute = e.value[0].dictValue
+        showRandomMinuteName.value = false
+  }
+    function handleRandomMinuteNameCancel() {
+       showRandomMinuteName.value = false
+      }
+
+      function handleCityName() {
+        if (cityNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '城市为空  ', type: 'warning'
+          })
+        } else {
+          showCityName.value = true
+        }
+     }
+  function   handleCityNameConfirm(e) {
+        form.value.cityName = e.value[0].cityName
+
+        queryDistrictParams.value.cityName = e.value[0].cityName
+  queryDistrictParams.value.districtName = null
+  form.value.districtName = null
+  form.value.ishopId = null
+  form.value.shopName = null
+  listDistrict(queryDistrictParams.value).then((response) => {
+    districtNameList.value = [response.rows] 
+    queryShopParams.value.provinceName = form.value.provinceName
+    queryShopParams.value.cityName = e.value[0].cityName
+    queryShopParams.value.districtName = null
+    listIshop(queryShopParams.value).then((response) => {
+      shopNameList.value = [response.rows] 
+    })
+  })
+        showCityName.value = false
+  }
+ function handleCityNameCancel() {
+       showCityName.value = false
+      }
+
+      function handleProvinceName() {
+        if (provinceNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '省份为空  ', type: 'warning'
+          })
+        } else {
+          showProvinceName.value = true
+        }
+     }
+  function   handleProvinceNameConfirm(e) {
+        form.value.provinceName = e.value[0].provinceName
+
+  queryDistrictParams.value.provinceName = e.value[0].provinceName
+  queryDistrictParams.value.cityName = null
+  form.value.cityName = null
+  form.value.districtName = null
+  form.value.cityName = null
+  form.value.ishopId = null
+  form.value.shopName = null
+  listCity(queryDistrictParams.value).then((response) => {
+    cityNameList.value = [response.rows] 
+    listDistrict(queryDistrictParams.value).then((response) => {
+      districtNameList.value = [response.rows]
+      queryShopParams.value.provinceName = e.value[0].provinceName
+      queryShopParams.value.cityName = form.value.cityName
+      queryShopParams.value.districtName = form.value.districtName
+      listIshop(queryShopParams.value).then((response) => {
+        shopNameList.value = [response.rows] 
+      })
+    })
+  })
+        showProvinceName.value = false
+  }
+ function handleProvinceNameCancel() {
+       showProvinceName.value = false
+      }
+
+      function handleDistrictName() {
+        if (districtNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '区域为空  ', type: 'warning'
+          })
+        } else {
+          showDistrictName.value = true
+        }
+     }
+  function   handleDistrictNameConfirm(e) {
+        form.value.districtName = e.value[0].districtName
+
+        queryShopParams.value.districtName = e.value[0].districtName
+  queryShopParams.value.cityName = form.value.cityName
+  queryShopParams.value.provinceName = form.value.provinceName
+  form.value.ishopId = null
+  form.value.shopName = null
+  listIshop(queryShopParams.value).then((response) => {
+    shopNameList.value = [response.rows] 
+  })
+        showDistrictName.value = false
+  }
+ function handleDistrictNameCancel() {
+       showDistrictName.value = false
+      }
+
+      function handleShopName() {
+        if (shopNameList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '默认预约门店为空  ', type: 'warning'
+          })
+        } else {
+          showShopName.value = true
+        }
+     }
+  function   handleShopNameConfirm(e) {
+        form.value.shopName = e.value[0].name
+        form.value.ishopId = e.value[0].ishopId
+        showShopName.value = false
+  }
+ function handleShopNameCancel() {
+       showShopName.value = false
+      }
+
+      function handleShopType() {
+        if (shopTypeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '预约类型为空  ', type: 'warning'
+          })
+        } else {
+          showShopType.value = true
+        }
+     }
+  function   handleShopTypeConfirm(e) {
+        form.value.shopTypeName = e.value[0].dictLabel
+        form.value.shopType = e.value[0].dictValue
+        showShopType.value = false
+  }
+ function handleShopTypeCancel() {
+       showShopType.value = false
+      }
+
+
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        updateIuser(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.switchTab({ url: `/pages/imaotai/iuser/list` })
+            }
+          })
+        })
+      })
+    }
+
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+    .btn {
+        width: 226rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/imaotai/iuser/list.vue b/src/pages/imaotai/iuser/list.vue
new file mode 100644
index 0000000..7304fee
--- /dev/null
+++ b/src/pages/imaotai/iuser/list.vue
@@ -0,0 +1,351 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+           <view class="search-view">
+            <u-input v-model="queryParams.mobile" border="false" type="select"   @click="handleSearch" placeholder="请填入手机号" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+         </view>
+         </u-sticky>
+      <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+                :text="item.userName+'-'+item.mobile" size="30rpx" color="#333333" :bold="true"></u--text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">默认预约门店：</text>
+              <text class="row-value">{{ item.shopName }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">预约商品：</text>
+              <text class="row-value">{{ item.itemName }}</text>
+            </view>
+            <view class="item-row">
+              <view class="item-row">
+              <text class="row-label">随机时间预约：</text>
+              <text class="row-value">{{ dictStr(item.randomMinute,randomMinuteList) }}</text>
+            </view>
+              <text class="row-label">预约类型：</text>
+              <text class="row-value">{{ dictStr(item.shopType,shopTypeList) }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">预约执行分钟：</text>
+              <text class="row-value">{{ item.minute }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">到期时间：</text>
+              <text class="row-value">{{ item.expireTime }}</text>
+            </view>
+            <view class="operate" >
+              <view class="btn filling" @click="handleReservation(item)">预约</view>
+              <view class="btn filling" @click="handleRefreshToken(item)">刷新token</view>
+              <view class="btn filling" @click="handleEdit(item)">修改</view>
+              <view class="btn filling" @click="handleDelete(item)">删除</view>
+            </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+        <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+      </u-list>
+    </view>
+  </template>
+  <script setup>
+import { listIuser, delIuser, reservation } from '@/api/imaotai/iuser.js'
+  import { getDicts } from '@/api/system/dict/data.js'
+  import { timeHandler } from '@/utils/common.ts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+  import dayjs from 'dayjs'
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const status = ref('loadmore')
+  const shopTypeList = ref([])
+  const randomMinuteList = ref([])
+  const  flag= ref(true)
+  const data = reactive({
+    filterPanel: false,
+    queryParams: {
+      mobile: null
+     } 
+  })
+  const { filterPanel, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        listData.value=[]
+        getList()
+        isShow.value = false
+      }
+    });
+  
+    function handleSearch() {
+        pageNum.value = 1
+        listData.value = []
+        getList()
+       }
+  
+    function dictStr(val, arr) {
+        let str = ''
+        arr.map(item => {
+          if (item.dictValue === val) {
+            str = item.dictLabel
+          }
+        })
+        return str
+      }
+  
+  function loadmore() {
+        pageNum.value += 1
+        if (status.value == 'loadmore') {
+          getList()
+        }
+      }
+  function getList() {
+         // 类型
+         getDicts('reservation_type').then(res => {
+          shopTypeList.value = res.data
+        })
+         // 类型
+          getDicts('open_close').then(res => {
+             randomMinuteList.value = res.data
+        })
+        status.value = 'loading'
+        listIuser({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+          listData.value = listData.value.concat(res.rows)
+          if (listData.value.length < res.total) {
+            status.value = 'loadmore'
+          } else {
+            status.value = 'nomore'
+          }
+        }).catch(() => {
+          status.value = 'nomore'
+        })
+      }
+  
+   function handleReservation(item) {
+        const mobile = item.mobile
+     reservation(mobile).then((response) => {
+      uni.showToast({
+    title: '请求成功，查看预约记录',
+    icon: 'success',
+    duration: 2000
+});
+uni.navigateTo({ url: `/pages/imaotai/iuser/listInner` })
+isShow.value = true
+        })
+      }
+
+      function handleRefreshToken(item) {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/token?id=${item.mobile}` })
+        isShow.value = true
+      }
+      function handleEdit(item) {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/edit?id=${item.mobile}` })
+        isShow.value = true
+      }
+      function handleAdd() {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/add` })
+        isShow.value = true
+      }
+      function handleDelete(item) {
+        uni.showModal({
+              title: '提示',
+              content: '你确定要删除吗',
+              success: function (res) {
+                  if (res.confirm) {
+                    delIuser(item.mobile)
+                uni.navigateTo({ url: `/pages/imaotai/iuser/listInner` })
+                  } else if (res.cancel) {
+                      console.log('取消');
+                  }
+              }
+          });
+      }
+      
+  </script>
+  
+  <style lang="scss" scoped>
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/imaotai/iuser/listInner.vue b/src/pages/imaotai/iuser/listInner.vue
new file mode 100644
index 0000000..33d3d2d
--- /dev/null
+++ b/src/pages/imaotai/iuser/listInner.vue
@@ -0,0 +1,350 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+           <view class="search-view">
+            <u-input v-model="queryParams.mobile" border="false" type="select"   @click="handleSearch" placeholder="请填入手机号" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+         </view>
+         </u-sticky>
+      <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+                :text="item.userName+'-'+item.mobile" size="30rpx" color="#333333" :bold="true"></u--text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">默认预约门店：</text>
+              <text class="row-value">{{ item.shopName }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">预约商品：</text>
+              <text class="row-value">{{ item.itemName }}</text>
+            </view>
+            <view class="item-row">
+              <view class="item-row">
+              <text class="row-label">随机时间预约：</text>
+              <text class="row-value">{{ dictStr(item.randomMinute,randomMinuteList) }}</text>
+            </view>
+              <text class="row-label">预约类型：</text>
+              <text class="row-value">{{ dictStr(item.shopType,shopTypeList) }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">预约执行分钟：</text>
+              <text class="row-value">{{ item.minute }}</text>
+            </view>
+            <view class="item-row">
+              <text class="row-label">到期时间：</text>
+              <text class="row-value">{{ item.expireTime }}</text>
+            </view>
+            <view class="operate" >
+              <view class="btn filling" @click="handleReservation(item)">预约</view>
+              <view class="btn filling" @click="handleRefreshToken(item)">刷新token</view>
+              <view class="btn filling" @click="handleEdit(item)">修改</view>
+              <view class="btn filling" @click="handleDelete(item)">删除</view>
+            </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+        <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+      </u-list>
+    </view>
+  </template>
+  
+  <script setup>
+import { listIuser,delIuser, reservation } from '@/api/imaotai/iuser.js'
+  import { getDicts } from '@/api/system/dict/data.js'
+  import { timeHandler } from '@/utils/common.ts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+  import dayjs from 'dayjs'
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const status = ref('loadmore')
+  const shopTypeList = ref([])
+  const randomMinuteList = ref([])
+  const  flag= ref(true)
+  const data = reactive({
+    filterPanel: false,
+    queryParams: {
+      mobile: null
+     } 
+  })
+  const { filterPanel, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        listData.value=[]
+        getList()
+        isShow.value = false
+      }
+    });
+  
+    function handleSearch() {
+        pageNum.value = 1
+        listData.value = []
+        getList()
+       }
+  
+    function dictStr(val, arr) {
+        let str = ''
+        arr.map(item => {
+          if (item.dictValue === val) {
+            str = item.dictLabel
+          }
+        })
+        return str
+      }
+  
+  function loadmore() {
+        pageNum.value += 1
+        if (status.value == 'loadmore') {
+          getList()
+        }
+      }
+  function getList() {
+         // 类型
+         getDicts('reservation_type').then(res => {
+          shopTypeList.value = res.data
+        })
+         // 类型
+          getDicts('open_close').then(res => {
+             randomMinuteList.value = res.data
+        })
+        status.value = 'loading'
+        listIuser({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+          listData.value = listData.value.concat(res.rows)
+          if (listData.value.length < res.total) {
+            status.value = 'loadmore'
+          } else {
+            status.value = 'nomore'
+          }
+        }).catch(() => {
+          status.value = 'nomore'
+        })
+      }
+  
+   function handleReservation(item) {
+        const mobile = item.mobile
+     reservation(mobile).then((response) => {
+          proxy.$refs['uToast'].show({
+            message: '请求成功，结果看日志', complete() {
+              uni.navigateTo({ url: `/pages/imaotai/iuser/list` })
+            }
+          })
+        })
+      }
+
+      function handleRefreshToken(item) {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/token?id=${item.mobile}` })
+        isShow.value = true
+      }
+      function handleEdit(item) {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/edit?id=${item.mobile}` })
+        isShow.value = true
+      }
+      function handleAdd() {
+        uni.navigateTo({ url: `/pages/imaotai/iuser/add` })
+        isShow.value = true
+      }
+      function handleDelete(item) {
+        uni.showModal({
+              title: '提示',
+              content: '你确定要删除吗',
+              success: function (res) {
+                  if (res.confirm) {
+                    delIuser(item.id)
+                uni.switchTab({ url: `/pages/imaotai/iuser/list` })
+                  } else if (res.cancel) {
+                      console.log('取消');
+                  }
+              }
+          });
+      }
+      
+  </script>
+  
+  <style lang="scss" scoped>
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/imaotai/iuser/token.vue b/src/pages/imaotai/iuser/token.vue
new file mode 100644
index 0000000..d959837
--- /dev/null
+++ b/src/pages/imaotai/iuser/token.vue
@@ -0,0 +1,184 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="刷新token"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="手机号" prop="mobile" required >
+              <u--input v-model="form.mobile" readonly placeholder="请填写手机号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item >
+                <button class="btn filling" style="width: 150px;height: 28px;" @click="sendMobileCode(form.mobile)">发送验证码<span  v-if="state">({{ stateNum }})</span></button>
+            </u-form-item>
+            <u-form-item label="验证码" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写验证码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="刷新" @click="refresh(form.mobile, form.code, form.deviceId)"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script setup>
+import { sendCode, login, getIuser } from '@/api/imaotai/iuser.js'
+const { proxy } = getCurrentInstance()
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const title = ref("账号添加")
+
+
+// 发送短信按钮倒计时
+const state = ref(false)
+const stateNum = ref(60)
+
+const data = reactive({
+form: {
+  mobile: null,
+    userId: null,
+    token: null,
+    cookie: null,
+    code: null,
+    deviceId: null,
+    itemCode: null,
+    ishopId: null,
+    provinceName: null,
+    cityName: null,
+    districtName: null,
+    address: null,
+    lat: null,
+    lng: null,
+    minute: 8,
+    shopTypeName: '预约本市出货量最大的门店',
+    randomMinuteName: '开启',
+    shopType: '1',
+    randomMinute: '0',
+    pushPlusToken: null,
+    jsonResult: null,
+    remark: null,
+    expireTime: null,
+    delFlag: null,
+    createTime: null,
+    createUser: null,
+    updateTime: null,
+    updateUser: null,
+    createBy: null
+},
+rules: {
+  mobile: [{ required: true, message: '手机号不能为空', trigger:['change', 'blur'] }],
+  code: [{ required: true, message: '验证码不能为空', trigger:['change', 'blur'] }],
+}
+})
+const { form , rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.mobile = option.id
+    title.value="刷新token"
+    getData()
+})
+onReady(() => {
+})
+function  getData() {
+  getIuser(form.value.mobile).then(res => {
+    form.value = res.data   
+  })
+}
+function refresh(mobile, code, deviceId) {
+  proxy.$refs['uForm'].validate().then(() => {
+    login(mobile, code, deviceId).then((response) => {
+    proxy.$refs['uToast'].show({
+            message: '刷新成功', complete() {
+              uni.switchTab({ url: `/pages/imaotai/iuser/list` })
+            }
+       })
+  })
+      })
+
+
+}
+
+    //发送验证码
+function sendMobileCode(mobile) {
+    form.value.deviceId = guid()
+  sendCode(mobile, form.value.deviceId).then((response) => {
+    proxy.$modal.msgSuccess('发送成功')
+    state.value = true
+    const timer = setInterval(() => {
+      stateNum.value--
+      if (stateNum.value === 0) {
+        clearInterval(timer)
+        state.value = false
+        stateNum.value = 60
+      }
+    }, 1000)
+  })
+}
+
+function guid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0
+    const v = c == 'x' ? r : (r & 0x3) | 0x8
+    return v.toString(16)
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+    .btn {
+        width: 226rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+  }
+}
+</style>
\ No newline at end of file