帮扶任务分配

packageB/login2.vue

@@ -49,12 +49,15 @@
 		code: '',
 		uuid: ''
 	})
-
+	const jumpUrl=ref('')
 	onLoad((option) => {
-		console.log("111")
+		console.log("111",option)
 		if(option.flag){
 			flag.value=option.flag
 		}
+		if(option.jump){
+			jumpUrl.value=option.jump
+		}
 	})
 
 	onMounted(() => {
@@ -140,8 +143,12 @@
 		}else if(flag.value=='nw'){
 			$api.myRequest('/auth/login',form,'post',9100).then((res) => {
 				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				// 临时修改，现在有多个跳转页面
+				// uni.reLaunch({
+				// 	url: '/packageB/priority/helpFilter'
+				// })
 				uni.reLaunch({
-					url: '/packageB/priority/helpFilter'
+					url:jumpUrl.value
 				})
 				codeUrl.value = 'data:image/gif;base64,' + res.img
 			}).catch(() => {

packageB/priority/allocate.vue

@@ -0,0 +1,358 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶任务分配</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <uni-forms-item label="任务名称：" name="taskName" required >
+					  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+                  </uni-forms-item>
+				  <uni-forms-item label="目标人员：" name="priority" required >
+				  	   <uni-data-select v-model="formData.priority" placeholder="请选择目标人员" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人数：" name="content" required>
+				  		<uni-easyinput v-model="formData.taskAllocation.goalPersonCount" placeholder="请输入目标人数"></uni-easyinput>
+				  </uni-forms-item>
+				  <uni-forms-item label="执行区域：" name="executeDeptId" required >
+				  	  <uni-data-select v-model="formData.taskAllocation.executeDeptId" placeholder="请选择执行区域" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+				  </uni-forms-item>
+                  <uni-forms-item label="分配说明：" name="allocationNote" required>
+					  <uni-easyinput type="textarea" v-model="formData.taskAllocation.allocationNote" placeholder="请输入分配说明"></uni-easyinput>
+                  </uni-forms-item>
+                  <uni-forms-item label="截止时间：" name="deadline" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择截止时间"  v-model="formData.taskAllocation.deadline" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">确定</button>
+                  <button class="btn reset-btn"  @click="handleReset">取消</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	taskType:'',
+	task_id:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+// 表单引用
+const formRef = ref(null)
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	let header={
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	// personInfo.value.person_id=options.person_id
+	// personInfo.value.name=options.name
+	// personInfo.value.taskType=options.taskType
+	// personInfo.value.task_id=options.task_id
+	// getDictionary()
+	// getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>

packageB/priority/components/targetPersonnel.vue

@@ -0,0 +1,473 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="task-box">
+						<text class="task-label">任务：</text>
+						<text class="task-name">{{props.taskName}}</text>
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+			<view class="button-group">
+				<view class="btns">
+					<button class="btn reset-btn" @click="handleCancel">关闭</button>
+				</view>
+			  
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  currentItem:{
+    type: String,
+    required: true,
+	default: ''
+  },
+  taskName:{
+    type: String,
+    required: true,
+	default: ''
+  },
+})
+const title = ref('');
+const pageNum = ref(1)
+const pageSize = ref(2)
+const currentItem=ref({})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+const handleCancel = () => {
+	emit('update:showView', 'main')
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		allocationId: props.currentItem,
+		pageNum: pageNum.value,
+		pageSize: pageSize.value
+	}
+	$api.myRequest('/dispatch/assist/person/database/pageGoalPersonList',params,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function scrollBottom(){
+	if(pageNum.value<totalNum.value/pageSize.value){
+		pageNum.value++
+		getDataList()
+	}
+}
+onMounted(() => {
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>

packageB/priority/components/targetPersonnelChoice.vue

@@ -0,0 +1,545 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+					    <view class="search-item">
+					      <text class="label">姓名：</text>
+						  <uni-easyinput v-model="formData.name" placeholder="请输入任务名称"></uni-easyinput>
+					    </view>
+						<view class="search-item">
+						  <text class="label">身份证号：</text>
+						  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">人员标签：</text>
+						  <uni-data-select v-model="formData.tagId" :localdata="personTagOptions" placeholder="请选择人员标签" @change="personTagChange"></uni-data-select>
+						</view>
+						<view class="search-item">
+						  <text class="label">所属区域：</text>
+						  <uni-data-select v-model="formData.deptTags" :localdata="taskTypeOptions" placeholder="请选择所属区域" @change="onTaskTypeChange"></uni-data-select>
+						</view>	
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<checkbox :value="item.id" :checked="item.checked" @click="selectItem(item)"/>
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+				
+			</scroll-view>
+			<view class="button-group">
+				<view class="btns">
+					<button class="btn submit-btn" @click="handlesubmit">确认选择</button>
+					<button class="btn reset-btn" @click="handleCancel">关闭</button>
+				</view>
+			  
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+    name: '',
+	idCard: '',
+	tagId: '',
+	deptTags: '',
+	pageNum: 1,
+	pageSize: 10
+})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const personTagOptions=ref([])
+const selectedPersonIds=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/person/tag/list',params,'get',9100,header).then((resData) => {
+		console.log("res",resData)
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.id,
+				    text: item.name
+				}
+				personTagOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+const handleCancel = () => {
+	emit('update:showView', 'main')
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function handleReset(){
+	formData.name=''
+	formData.idCard=''
+	formData.tagId=''
+	formData.deptTags=''
+	formData.pageNum=1
+	formData.pageSize=10
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/assist/person/database/pageList',formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+			item.checked = false; // 添加这一行
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function selectItem(item) {
+	const id = item.id; // 假设每条数据有唯一 id 字段
+    item.checked = !item.checked;
+  
+    if (item.checked) {
+      // 如果选中，加入数组（去重）
+      if (!selectedPersonIds.value.includes(id)) {
+        selectedPersonIds.value.push(id);
+      }
+    } else {
+      // 如果取消选中，从数组中移除
+      selectedPersonIds.value = selectedPersonIds.value.filter(v => v !== id);
+    }
+}
+// 获取选中的数据
+function handlesubmit() {
+	emit('update:showView', {
+	    showView: 'main',
+	    selectedPersonIds: selectedPersonIds.value
+	});
+}
+function personTagChange(e){
+	formData.tagId=e
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+onMounted(() => {
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  padding-bottom: 140rpx
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>

packageB/priority/components/taskCreated.vue

@@ -0,0 +1,266 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>创建任务</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <uni-forms-item label="任务名称：" name="taskName" required >
+					  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+                  </uni-forms-item>
+                  <uni-forms-item label="任务类型：" name="taskType" required >
+					  <uni-data-select v-model="formData.taskType" placeholder="请选择任务类型" :localdata="taskTypeOptions" @change="taskTypeChange"></uni-data-select>
+                  </uni-forms-item>
+				  <uni-forms-item label="优先级：" name="priority" required >
+				  	   <uni-data-select v-model="formData.priority" placeholder="请选择优先级" :localdata="priorityOptions" @change="priorityChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人员："  required >
+				  	   <button class="choice-btn">从帮扶人员库选择目标人员</button>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人数：" name="goalPersonCount" required>
+				  		<uni-easyinput v-model="formData.taskAllocation.goalPersonCount" ></uni-easyinput>
+				  </uni-forms-item>
+				  <uni-forms-item label="执行区域：" name="executeDeptId" required >
+				  	  <uni-data-select v-model="formData.taskAllocation.executeDeptId" placeholder="请选择执行区域" :localdata="executeDeptOptions" @change="executeDeptChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="截止时间：" name="deadline" required>
+				  					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择截止时间"  v-model="formData.taskAllocation.deadline" @change="onDateChange" />
+				  </uni-forms-item>
+                  <uni-forms-item label="分配说明：" name="allocationNote" >
+					  <uni-easyinput type="textarea" v-model="formData.taskAllocation.allocationNote" placeholder="请输入分配说明"></uni-easyinput>
+                  </uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">确定</button>
+                  <button class="btn reset-btn"  @click="handleCancel">取消</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  taskTypeOptions: {
+    type: Array,
+    required: true,
+    default: () => []
+  },
+  priorityOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  executeDeptOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+})
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+// 表单引用
+const formRef = ref(null)
+// 校验规则
+const rules = {
+	taskName: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写任务名称'
+		}]
+	},
+	taskType: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择任务类型'
+		}]
+	},
+	priority: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择优先级'
+		}]
+	},
+	goalPersonCount: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择目标人员'
+		}]
+	},
+	executeDeptId: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择执行区域'
+		}]
+	},
+	deadline:{
+		rules: [{
+			required: true,
+			errorMessage: '请选择截止时间'
+		}]
+	},
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+
+// 事件处理
+function onDateChange(){}
+function taskTypeChange(){}
+function priorityChange(){}
+function executeDeptChange(){}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+		}
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleCancel = () => {
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.taskAllocation.goalPersonCount=null
+	formData.taskAllocation.executeDeptId=''
+	formData.taskAllocation.executeDeptName=''
+	formData.taskAllocation.executeDeptAncestors=''
+	formData.taskAllocation.allocationStatus='1'
+	formData.taskAllocation.allocationNote=''
+	formData.taskAllocation.deadline=null
+	formData.taskAllocation.goalPersonList=[]
+	emit('update:showView', 'main')
+}
+onLoad((options) => {});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>

packageB/priority/components/taskDetail.vue

@@ -0,0 +1,293 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶任务详情</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+				<view class="form-item">
+					<view class="item-label">
+						任务名称：
+					</view>
+					<view class="item-value">
+						{{formData.taskName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						任务类型：
+					</view>
+					<view class="item-value">
+						<!-- {{getabelByValue(formData.value.taskType,props.taskTypeOptions)}} -->
+						{{formData.taskType}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						优先级：
+					</view>
+					<view class="item-value">
+						{{formData.priority}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						目标人数：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.goalPersonCount}}人
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配区域：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.executeDeptName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						创建时间：
+					</view>
+					<view class="item-value">
+						{{formData.createTime}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						截止时间：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.deadline}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配状态：
+					</view>
+					<view class="item-value">
+						{{formData.allocationStatus}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配说明：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.allocationNote?formData.taskAllocation.allocationNote:'暂无'}}
+					</view>
+				</view>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleCancel">关闭</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive,onMounted  } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  taskTypeOptions: {
+    type: Array,
+    required: true,
+    default: () => []
+  },
+  priorityOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  executeDeptOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  allocationStatusOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  currentItem:{
+    type: String,
+    required: true,
+	default: ''
+  },
+})
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	createTime:'',
+	allocationStatus:'',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+// 表单引用
+const formRef = ref(null)
+
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+
+// 事件处理
+function onDateChange(){}
+function taskTypeChange(){}
+function priorityChange(){}
+function executeDeptChange(){}
+
+const handleCancel = () => {
+	emit('update:showView', 'main')
+}
+function getDetail(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		id:props.currentItem
+	}
+	$api.myRequest('/dispatch/assist/task/getTask',params,'get',9100,header).then((resData) => {
+		resData.data.taskType=getabelByValue(resData.data.taskType,props.taskTypeOptions)
+		resData.data.priority=getabelByValue(resData.data.priority,props.priorityOptions)
+		let allocationStatus=resData.data.taskAllocation.allocationStatus
+		resData.data.allocationStatus=getabelByValue(allocationStatus,props.allocationStatusOptions)
+		Object.assign(formData, resData.data)
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+onMounted(() => {
+    getDetail()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+.form-item
+  display: flex
+  align-items: center
+  margin-bottom: 20rpx
+.item-label
+  width:200rpx
+  text-align: left
+  font-size: 30rpx
+  color: #606266
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+.item-value
+  color: #333
+  font-size: 30rpx
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>

packageB/priority/helpFilter.vue

@@ -241,7 +241,7 @@ onLoad(() => {
 			getDataList('refresh');
 		});
 	}else{
-		navTo('/packageB/login2');
+		navTo('/packageB/login2?jump=/packageB/priority/helpFilter');
 	}
 });
 function getDictionary(){

packageB/priority/index.vue

@@ -54,7 +54,18 @@ onLoad(() => {
 });
 
 async function jumps(url){
-	navTo(url);
+	let token=uni.getStorageSync('Padmin-Token')
+	if(token){
+		navTo(url);
+	}else{
+		uni.showToast({
+			title:'请先登录'
+		})
+		setTimeout(() => {
+		    navTo('/packageB/login2?jump='+url);
+		}, 2000)
+	}
+	
 }
 
 

packageB/priority/taskAssignment.vue

@@ -1,197 +1,233 @@
 <template>
-    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
-        <view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>筛选条件</text>
-					<view class="title-line"></view>
-				</view>
-				<view class="title-right button-sp-area">
-					<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
-					<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
-				</view>
-			</view>
-			
-            <view class="search-container">
-                <!-- 人员姓名 -->
-                <view class="search-item">
-                  <text class="label">人员姓名：</text>
-				  <uni-easyinput v-model="formData.name" placeholder="请输入人员姓名"></uni-easyinput>
-                </view>
-            
-                <!-- 身份证号 -->
-                <view class="search-item">
-                  <text class="label">身份证号：</text>
-				  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
-                </view>
-            
-                <!-- 帮扶类型（下拉选择） -->
-                <view class="search-item">
-                  <text class="label">帮扶类型：</text>
-				  <uni-data-select v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择帮扶类型" @change="onTaskTypeChange"></uni-data-select>
-                </view>
-            
-                <!-- 帮扶人员 -->
-                <view class="search-item">
-                  <text class="label">帮扶人员：</text>
-				  <uni-easyinput v-model="formData.createByName" placeholder="请输入帮扶人员姓名"></uni-easyinput>
-                </view>
-            
-                <!-- 所属区域（下拉选择） -->
-                <view class="search-item">
-                  <text class="label">所属区域：</text>
-				  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
-					  @change="onchange" >
-				  </uni-data-picker>
-                </view>
-            
-                <!-- 开始时间 -->
-                <view class="search-item" v-if="false">
-                  <text class="label">开始时间：</text>
-				  <uni-datetime-picker type="date" placeholder="请选择开始时间"  v-model="formData.startTime" @maskClick="onStartTimeChange" />
-                </view>
-            
-                <!-- 结束时间 -->
-                <view class="search-item" v-if="false">
-                  <text class="label">结束时间：</text>
-				  <uni-datetime-picker type="date" placeholder="请选择结束时间"  v-model="formData.endTime" @maskClick="onEndTimeChange" />
-                </view>
-              </view>
-        </view>
-		<view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>帮扶记录列表</text>
-					<view class="title-line" style="left: 70rpx;"></view>
-				</view>
-				<view class="title-total">
-					共<text class="total-num">{{totalNum}}</text>条记录
-				</view>
-			</view>
-			<view class="list-box" v-if="dataList.length>0">
-				<view class="con-box" v-for="(item,index) in dataList" :key="index">
-					<view class="form-title">
-						<view class="form-name">
-							{{item.name}}
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" v-if="showView=='main'">
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="info-box">
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="contact" color="#175CE9" size="34"></uni-icons>
 						</view>
-						<view class="form-type">
-							{{getTaskTypeLabelByValue(item.task_type)}}
+						<view class="info-label">
+							帮扶任务总数
+						</view>
+						<view class="info-value">
+							{{ stats.taskCount }}
 						</view>
 					</view>
-					<view class="form-item" v-if="item.phone">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
-							<view class="item-label">
-								联系电话：
-							</view>
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="info" color="#175CE9" size="34"></uni-icons>
 						</view>
-						<view class="item-right">
-							{{item.phone}}
+						<view class="info-label">
+							待分配任务
+						</view>
+						<view class="info-value">
+							{{ stats.pendingCount }}
 						</view>
 					</view>
-					<view class="form-item" v-if="item.id_card">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
-							<view class="item-label">
-								身份证号：
-							</view>
+					<view class="info-item">
+						<view class="">
+							<uni-icons type="checkbox" color="#175CE9" size="34"></uni-icons>
 						</view>
-						<view class="item-right">
-							{{item.id_card}}
+						<view class="info-label">
+							已分配任务
 						</view>
-					</view>
-					<view class="form-item" v-if="item.dept_name">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
-							<view class="item-label">
-								所属区域：
-							</view>
+						<view class="info-value">
+							{{ stats.allocatedCount }}
 						</view>
-						<view class="item-right">
-							{{item.dept_name}}
-						</view>
-					</view>
-					<view class="form-item" v-if="item.create_by_name">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
-							<view class="item-label">
-								帮扶人员：
-							</view>
-						</view>
-						<view class="item-right">
-							{{item.create_by_name}}
-						</view>
-					</view>
-					<view class="form-item" v-if="item.create_by_dept_name">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
-							<view class="item-label">
-								帮扶单位：
-							</view>
-						</view>
-						<view class="item-right">
-							{{item.create_by_dept_name}}
-						</view>
-					</view>
-					<view class="form-item" v-if="item.follow_date">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
-							<view class="item-label">
-								帮扶日期：
-							</view>
-						</view>
-						<view class="item-right">
-							{{item.follow_date}}
-						</view>
-					</view>
-					<view class="form-item" v-if="item.next_contact_date">
-						<view class="item-left">
-							<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
-							<view class="item-label">
-								下次联系：
-							</view>
-						</view>
-						<view class="item-right">
-							{{item.next_contact_date}}
-						</view>
-					</view>
-					<view class="form-btns">
-						<button class="mini-btn form-box-btn detail-btn"  size="mini" v-if="false">详情</button>
-						<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goFollow(item)">跟进</button>
-						<button class="mini-btn form-box-btn recommend-btn"  size="mini" @click="goRecommend(item)">智能推荐</button>
 					</view>
 				</view>
-			</view>
-		    <empty v-else pdTop="200"></empty>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+						<!-- 人员姓名 -->
+						<view class="search-item">
+						  <text class="label">任务名称：</text>
+						  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+						</view>
+						<!-- 任务类型 -->
+						<view class="search-item">
+						  <text class="label">任务类型：</text>
+						  <uni-data-select :key="1" v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择任务类型" @change="onTaskTypeChange"></uni-data-select>
+						</view>
+						<!-- 优先级 -->
+						<view class="search-item">
+						  <text class="label">优先级：</text>
+						  <uni-data-select :key="2" v-model="formData.priority" :localdata="priorityOptions" placeholder="请选择优先级" @change="onPriorityChange"></uni-data-select>
+						</view>
+						<!-- 创建时间 -->
+						<view class="search-item">
+						  <text class="label">创建时间：</text>
+						  <uni-datetime-picker v-model="filterTimeRange" type="datetimerange" rangeSeparator="至" @change="filterTimeRangeChange" />
+						</view>	
+						<!-- 分配状态 -->
+						<view class="search-item">
+						  <text class="label">分配状态：</text>
+						  <uni-data-select :key="3" v-model="formData.allocationStatus" :localdata="allocationStatusOptions" placeholder="请选择分配状态" @change="onAllocationStatusChange"></uni-data-select>
+						</view>
+						<!-- 执行区域 -->
+						<view class="search-item">
+						  <text class="label">执行区域：</text>
+						  <uni-data-select :key="4" v-model="formData.executeDeptId" :localdata="executeDeptOptions" placeholder="请选择区域" @change="onExecuteDeptChange"></uni-data-select>
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="">
+						<button class="mini-btn search-box-btn" type="primary" size="mini" @click="creatTask">创建任务</button>
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>帮扶任务列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条记录
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.taskName}}
+								</view>
+								<view class="form-type">
+									优先级：{{item.priority}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										目标人数：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.goalPersonCount}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										任务类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskType}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										分配状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.allocationStatus}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										执行区域：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.executeDeptName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										创建时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.createTime}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										截止时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.deadline}}
+								</view>
+							</view>
+							<view class="form-btns">
+								<button class="mini-btn form-box-btn detail-btn"  size="mini" @click="goDetail(item)">详情</button>
+								<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goTarget(item)">目标人员</button>
+								<button class="mini-btn form-box-btn recommend-btn"  size="mini" @click="goRecommend(item)">分配</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="" v-else-if="showView=='add'" >
+			<task-created :taskTypeOptions="taskTypeOptions" :priorityOptions="priorityOptions" :executeDeptOptions="executeDeptOptions" @update:show-view="handleShowViewChange"></task-created>
+		</view>
+		<view class="" v-else-if="showView=='detail'" >
+			<task-detail :currentItem="currentItem" :taskTypeOptions="taskTypeOptions" :priorityOptions="priorityOptions" :executeDeptOptions="executeDeptOptions" :allocationStatusOptions="allocationStatusOptions" @update:show-view="handleShowViewChange"></task-detail>
+		</view>
+		<view class="" v-else-if="showView=='targetPersonnel'" >
+			<target-personnel :currentItem="currentItem" :taskName="taskName" @update:show-view="handleShowViewChange"></target-personnel>
 		</view>
     </AppLayout>
 </template>
 
 <script setup>
-import { inject, ref, reactive,onMounted } from 'vue';
+import { inject, ref, reactive } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
+import taskCreated from './components/taskCreated.vue';
+import taskDetail from './components/taskDetail.vue';
+import targetPersonnel from './components/targetPersonnel.vue';
 
-// state
+const showView=ref('main')
 const title = ref('');
-const initialForm = {
-  name: '',
-  idCard: '',
-  taskType: '',
-  createByName: '',
-//   helpArea: [],
-//   startTime: '',
-//   endTime: '',
-//   deptId:'',
-  deptTags:''
-}
-const formData = reactive({ ...initialForm });
-const taskTypeOptions=ref([])
-const dataList=ref([])
-const pageSize=ref(10)
-const pageNum=ref(1)
+const stats=ref({})
+const formData = reactive({
+    taskName: '',
+    taskType: '',
+    priority: '',
+    createTimeStart: null,
+    createTimeEnd: null,
+    allocationStatus: '',
+    executeDeptId: '',
+    pageNum: 1,
+    pageSize: 10
+})
+const currentItem=ref('')
+const taskName=ref('')
+const filterTimeRange=ref([])
 const totalNum=ref(0)
+const dataList=ref([])
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
 const baseUrl = config.imgBaseUrl
 const getBackgroundStyle = (imageName) => ({
     backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
@@ -199,51 +235,34 @@ const getBackgroundStyle = (imageName) => ({
     backgroundPosition: 'center', // 居中
     backgroundRepeat: 'no-repeat'
 });
-const trainVideoImgUrl=config.trainVideoImgUrl
-const picker = ref(null)
-
-
-// 所属区域选项（可根据实际替换为动态数据）
-const regions = ref([])
-
-// 事件处理
-const onTaskTypeChange = (e) => {
-	formData.taskType=e
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
 }
-const onStartTimeChange = (e) => {
-  formData.startTime = e.detail.value
+function statisticTask(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/task/statisticTask',params,'get',9100,header).then((resData) => {
+		stats.value=resData.data
+	});
 }
-
-const onEndTimeChange = (e) => {
-  formData.endTime = e.detail.value
-}
-
-const handleSearch = () => {
-  // 在这里调用接口进行搜索
-  getDataList('refresh')
-}
-const handleReset = () =>{
-	 Object.assign(formData, initialForm);
-	 getDataList('refresh')
-}
-onMounted(async () => {
-  // await loadLevelData('201');
-});
-onLoad(() => {
-	// let token=uni.getStorageSync('fourLevelLinkage-token')
-	// if(token){
-	// 	$api.myRequest("/system/user/login/user/info", {}, "GET", 9100, {
-	// 		Authorization: `Bearer ${uni.getStorageSync("fourLevelLinkage-token")}`
-	// 	}).then(async (resData) => {
-
-	// 		await loadLevelData(resData.sysUser.dept.deptId);
-	// 		getDictionary()
-	// 		getDataList('refresh');
-	// 	});
-	// }else{
-	// 	navTo('/packageB/login2');
-	// }
-});
 function getDictionary(){
 	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
 		if(resData && resData.code == 200){
@@ -256,151 +275,163 @@ function getDictionary(){
 			})
 		}
 	});
-}
-function getTaskTypeLabelByValue(value) {
-	if (!Array.isArray(taskTypeOptions.value)) {
-	    return ''
-	  }
-	  const item = taskTypeOptions.value.find(item => item.value === String(value))
-	  return item ? item.text : '暂无帮扶类型'
-}
- // 加载某一级的数据（parentId 为空表示根）
-async function loadLevelData(parentId,node) {
-    let header = {
-		'Authorization': uni.getStorageSync('fourLevelLinkage-token'),
-		'Content-Type': "application/x-www-form-urlencoded"
-	};
-	let params = { parentId };
-
-	try {
-		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
-		if(resData.data.length==0){
-			picker.value.hide()
-			return
-		}
-		const formatted = (resData.data || []).map(item => ({
-			text: item.deptName, 
-			value: item.tags,
-			deptId: item.deptId,
-			children: [] 
-		}));
-		if(node){
-			injectChildren(parentId, formatted);
-		}else{
-			regions.value=formatted
-		}
-	} catch (error) {
-		console.error("加载部门数据失败:", error);
-		uni.showToast({ title: '加载失败', icon: 'none' });
-	}
-}
-// 将子级数据注入到对应的父节点
-function injectChildren(parentValue, childrenData) {
-    const findAndInject = (nodes) => {
-		for (let node of nodes) {
-			if (node.deptId === parentValue) {
-				// 如果 children 已存在且非空，避免重复加载
-				if (!node.children || node.children.length === 0) {
-					node.children = childrenData;
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
 				}
-				return true;
-			}
-			if (node.children && node.children.length > 0) {
-				if (findAndInject(node.children)) return true;
-			}
+				priorityOptions.value.push(obj)
+			})
 		}
-		return false;
-	}
-
-	findAndInject(regions.value);
-  // 强制更新
-}
-// 当用户选择时触发（注意：change 在每级选择后都会触发）
-function onchange(e) {
-	const selectedValues = e.detail.value;
-	// formData.deptId=selectedValues.map(item => item.value).join(',');
-	if (selectedValues.length === 0) return;
-	// 获取最后一级选中的 value
-	const lastSelectedValue = selectedValues[selectedValues.length - 1];
-	// 查找该节点是否有 children，如果没有则尝试加载
-	const node = findNodeByValue(regions.value, lastSelectedValue);
-	if (node && (!node.children || node.children.length === 0)) {
-		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
-		// 这里我们直接尝试加载下一级
-		loadLevelData(node.deptId , node);
-		picker.value.show()
-	}
-}
-// 工具函数：根据 value 查找节点
-function findNodeByValue(nodes, value) {
-	for (let node of nodes) {
-		if (node.value === value.value) {
-			return node;
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_allocation_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				allocationStatusOptions.value.push(obj)
+			})
 		}
-		if (node.children && node.children.length > 0) {
-			const found = findNodeByValue(node.children, value);
-			if (found) return found;
-		}
-	}
-	return null;
-}
-function getDeptOptions(){
-	let header={
-		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
-		'Content-Type': "application/x-www-form-urlencoded"
-	}
-	let params={
-		parentId:''
-	}
-	$api.myRequest('/dispatch/dept/list', params,'get',9100,header).then((resData) => {
 	});
 }
-function getDataList(type = 'add') {
-	let maxPage=Math.ceil(totalNum.value/pageSize.value)
-	let params=({...formData})
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function onTaskTypeChange(e){
+	formData.taskType=e
+}
+function onPriorityChange(e){
+	formData.priority=e
+}
+function onAllocationStatusChange(e){
+	formData.allocationStatus=e
+}
+function filterTimeRangeChange(e){
+	formData.createTimeStart=e[0]
+	formData.createTimeEnd=e[1]
+}
+function onExecuteDeptChange(e){
+	formData.executeDeptId=e
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
 	let header={
-		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
+		'Authorization':uni.getStorageSync('Padmin-Token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
-    if (type === 'refresh') {
-        pageNum.value = 1;
-		params.pageSize=pageSize.value
-		params.pageNum=pageNum.value
-		$api.myRequest('/dispatch/assist/records/pageRecords', params,'get',9100,header).then((resData) => {
-			if(resData&&resData.code == 200){
-				dataList.value=resData.rows
-				totalNum.value=resData.total
-			}
-		});
-    }
-    if (type === 'add' && pageNum.value < maxPage) {
-        pageNum.value += 1;
-		params.pageSize=pageSize.value
-		params.pageNum=pageNum.value
-		$api.myRequest('/dispatch/assist/records/pageRecords', params,'get',9100,header).then((resData) => {
-			dataList.value=dataList.value.concat(resData.rows)
-		});
+	$api.myRequest('/dispatch/assist/task/pageList',formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.priority=getabelByValue(item.priority,priorityOptions)
+			item.taskType=getabelByValue(item.taskType,taskTypeOptions)
+			item.taskAllocation.allocationStatus=getabelByValue(item.taskAllocation.allocationStatus,allocationStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
 		
+	});
+}
+const handleReset = () => {
+	dataList.value=[]
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.createTimeStart=null
+	formData.createTimeEnd=null
+	formData.allocationStatus=''
+	formData.executeDeptId=''
+	formData.pageNum=1
+	formData.pageSize=10
+	filterTimeRange.value=[]
+	getDataList()
+}
+function handleShowViewChange(newValue) {
+  showView.value = newValue
+}
+const creatTask = () => {
+	showView.value='add'
+	// navTo('/packageB/priority/taskCreated');
+}
+const goRecommend = () =>{
+	navTo('/packageB/priority/allocate');
+}
+function goDetail(item){
+	currentItem.value=item.id
+	showView.value='detail'
+}
+function goTarget(item){
+	currentItem.value=item.taskAllocation.id
+	taskName.value=item.taskName
+	showView.value='targetPersonnel'
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
 	}
 }
-function goFollow(item) {
-    navTo(`/packageB/priority/helpFollow?task_id=${item.task_id}&person_id=${item.person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
-}
-//智能推荐
-const goRecommend = (item) => {
-  navTo('/packageB/priority/recommend');
+onLoad((options) => {
+	listNotParam()
+	statisticTask()
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  await getDataList()
 }
+
 </script>
 
 <style lang="stylus" scoped>
-
 image
   height: 100%
   width: 100%
-
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
 .main-list
   background-color: #ffffff
-  padding: 20rpx 30rpx 28rpx 30rpx
+  padding: 20rpx 20rpx 28rpx 20rpx
   margin: 30rpx 30rpx
   box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
   border-radius: 12px
@@ -417,19 +448,29 @@ image
 .title-line
   position: absolute
   bottom: -10rpx
-  left: 36rpx
+  left: 70rpx
   width: 70rpx
   height: 8rpx
   background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
   border-radius: 4rpx
-.search-box-btn
-  border-radius: 32rpx !important
-  background: #3088FF !important
-  margin-right: 16rpx
-.reset-box-btn
-  border-radius: 32rpx !important
-  background: #02B44D
-  color: #fff
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
 .search-container
   padding: 20rpx 0rpx 0rpx 0rpx
 .title-total
@@ -457,8 +498,14 @@ image
   background: #FFFFFF
   flex: 1
   min-width: 0
-.list-box
-  margin-top: 40rpx
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
 .con-box
   background: #fff
   padding: 20rpx

pages.json

@@ -457,6 +457,12 @@
 		      "navigationBarTitleText": "帮扶记录管理"
 		    }
 		  },
+		  {
+		    "path": "priority/allocate",
+		    "style": {
+		      "navigationBarTitleText": "任务分配"
+		    }
+		  },
 		  {
 		    "path": "train/wrongAnswer/mistakeNotebook",
 		    "style": {