增加流程取回、流程作废功能

api/api.js

@@ -180,7 +180,27 @@ export function processCompleteApi(config) { // 流程办理
 		data: config
 	})
 }
-
+export function claimApi(config) { // 流程签收
+	return https({
+		url: '/act/task/claim',
+		method: 'put',
+		data: config
+	})
+}
+export function callBackProcessApi(config) { // 流程取回
+	return https({
+		url: '/act/task/callBackProcess',
+		method: 'put',
+		data: config
+	})
+}
+export function invalidProcessApi(config) { // 流程作废
+	return https({
+		url: '/act/task/invalidProcess',
+		method: 'put',
+		data: config
+	})
+}
 export function getDictItemsApi(dictCode) { // 字典标签专用
 	return https({
 		url: `/sys/dict/getDictItems/${dictCode}`,
@@ -242,14 +262,6 @@ export function dbJbxxQueryByIdApi(config) { // 督办基本信息
 	})
 }
 
-export function claimApi(config) { // 签收
-	return https({
-		url: '/act/task/claim',
-		method: 'put',
-		data: config
-	})
-}
-
 export function cxcJurisdictionApi(config) { // 是否灰化
 	return https({
 		url: '/CxcJurisdiction/cxcJurisdiction/queryById',

bpm/extendCom.vue

@@ -79,7 +79,6 @@
 			uni.createSelectorQuery().in(CurrentInstance.proxy).select('.item_box')
 				.boundingClientRect(data => {
 					moreHeight.value = data?.height + 'px'
-					console.log('moreHeight', moreHeight.value);
 				}).exec()
 		})
 
@@ -94,7 +93,7 @@
 				id = 0
 			}
 			if (props.title == '已办事项') {
-				id = 2
+				id = 1
 			}
 			if (props.title == '本人发起') {
 				return uni.navigateTo({

bpm/tasklistCom.vue

@@ -14,7 +14,7 @@
 				<view>
 					申请理由：{{item.bpmBizTitle}}
 				</view>
-				<view>
+				<view v-if="currentIndex != 2">
 					当前环节：{{item.taskName}}
 				</view>
 				<view>
@@ -26,7 +26,7 @@
 				<view>
 					开始时间：{{item.taskBeginTime}}
 				</view>
-				<view v-if="currentIndex == 1">
+				<view v-if="item.taskEndTime">
 					结束时间：{{item.taskEndTime}}
 				</view>
 			</view>
@@ -41,17 +41,27 @@
 			<view class="btn f-row aic jcb" v-if="currentIndex == 0 && !item.taskAssigneeName">
 				<view>
 				</view>
-				<view class="handle" @click="claim(item.id)">
+				<view class="handle" @click.stop="handleClaim(item.id)">
 					签收
 				</view>
 			</view>
+			<view class="btn f-row aic jcb" v-if="currentIndex == 2 && !item.endTime">
+				<view class="entrust" @click.stop="invalidProcess(item.processInstanceId)">
+					作废流程
+				</view>
+				<view class="handle" @click.stop="callBackProcess(item.processInstanceId)">
+					取回流程
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
 	import {
-		claimApi
+		claimApi,
+		callBackProcessApi,
+		invalidProcessApi
 	} from '@/api/api.js';
 	import {
 		getCurrentInstance,
@@ -75,18 +85,44 @@
 		emit('jump', url)
 	}
 
-	/**签收*/
+	/**流程签收*/
-	const claim = (id) => {
+	const handleClaim = (id) => {
 		claimApi({
 			taskId: id
 		}).then((res) => {
 			if (res.success) {
+				uni.redirectTo({
+					url: './index?id=0'
+				});
+				proxy.$toast(res.message)
+			}
+		})
+	}
+	
+	/**流程取回*/
+	const callBackProcess = (id) => {
+		callBackProcessApi({
+			processInstanceId: id
+		}).then((res) => {
+			if (res.success) {
+				uni.redirectTo({
+					url: './self'
+				});
+				proxy.$toast(res.message)
+			}
+		})
+	}
+	
+	/**流程作废*/
+	const invalidProcess = (id) => {
+		invalidProcessApi({
+			processInstanceId: id
+		}).then((res) => {
+			if (res.success) {
+				uni.redirectTo({
+					url: './self'
+				});
 				proxy.$toast(res.message)
-				setTimeout(function() {
-					uni.redirectTo({
-						url: './index?id=0'
-					});
-				}, 500);
 			}
 		})
 	}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__F0AFD30",
     "description" : "",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.0",
-    "versionCode" : 20241010,
+    "versionCode" : 20241024,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -150,7 +150,7 @@
 		{
 			"path": "pages/task/todotask",
 			"style": {
-				"navigationBarTitleText": "今日待办任务",
+				"navigationBarTitleText": "个人办公",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "white"
 			}

pages/tab/my.vue

@@ -33,7 +33,7 @@
 						<view class="num">
 							{{todoNum}}
 						</view>
-						<text>今日待办任务</text>
+						<text>个人办公</text>
 					</view>
 					<view class="box f-col aic">
 						<view class="num">
@@ -121,11 +121,11 @@
 		// 	text: '值班表查询',
 		// 	path: '/pages/zhiban/index'
 		// }, 
-		{
+		// {
-			img: '../../static/my/xiaoxi.png',
+		// 	img: '../../static/my/xiaoxi.png',
-			text: '接受消息推送',
+		// 	text: '接受消息推送',
-			path: ''
+		// 	path: ''
-		}
+		// }
 		// , {
 		// 	img: '../../static/my/dingwei.png',
 		// 	text: '开启定位',

pages/task/handle.vue

@@ -14,13 +14,13 @@
 				<view class="status" v-if="type==0">
 					待审批
 				</view>
-				<view class="status" v-else style="background-color: #7AC756;">
+				<view class="status" v-if="type==1" style="background-color: #7AC756;">
 					已处理
 				</view>
 			</view>
 		</customNav>
 		<component :is="comp" :dataId="dataId"></component>
-		<view class="btn f-row aic jcb" >
+		<view class="btn f-row aic jcb" v-if="type == 0">
 			<view class="refuse" @click="openpop(1)">
 				拒绝
 			</view>
@@ -200,7 +200,7 @@
 	onLoad((options) => {
 		taskInfo.value = JSON.parse(options.info)
 		type = options.type
-		if (type == 1) {
+		if (type == 1 || type == 2) {
 			return getHisProcessNodeInfo(taskInfo.value.processInstanceId)
 		}
 		getProcessNodeInfo(taskInfo.value.id)

pages/task/todotask.vue

@@ -1,8 +1,8 @@
 <template>
 	<view :class="['content',{'gray':store.isgray==1}]">
-		<extendCom title="待办事项" img="todo" :list="todoArr" :total="todoTotal"></extendCom>
+		<extendCom title="我的任务" img="process" :list="todoArr" :total="todoTotal"></extendCom>
-		<extendCom title="已办事项" img="done" :list="doneArr" :total="doneTotal"></extendCom>
+		<extendCom title="历史任务" img="done" :list="doneArr" :total="doneTotal"></extendCom>
-		<extendCom title="本人发起"  img="self" :list="selfArr" :total="selfTotal"></extendCom>
+		<extendCom title="我发起流程" img="self" :list="selfArr" :total="selfTotal"></extendCom>
 	</view>
 </template>
 
@@ -98,7 +98,7 @@
 	}
 	const selfArr = ref([])
 	const selfTotal = ref(0)
-	const selfArrquery=ref([])
+	const selfArrquery = ref([])
 	/**本人发起*/
 	const myApplyProcessList = () => {
 		myApplyProcessListApi({

unpackage/cache/wgt/__UNI__F0AFD30/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F0AFD30","name":"数智产销","version":{"name":"1.0.2","code":20241010},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNIF0AFD30","aliasname":"__uni__f0afd30","password":"4Z2SSz2hk5AO56cxUDfY3A==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"geolocation":{"system":{"__platform__":["android"]}}},"orientation":"portrait-primary"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.15","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"tabBar":{"position":"bottom","color":"#333333","selectedColor":"#01508B","borderStyle":"rgba(0,0,0,0.4)","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#FFFFFF","list":[{"text":"首页","pagePath":"pages/tab/index","iconPath":"/static/tab/index1.png","selectedIconPath":"/static/tab/index2.png"},{"text":"办公","pagePath":"pages/tab/office","iconPath":"/static/tab/office1.png","selectedIconPath":"/static/tab/office2.png"},{"text":"生产","pagePath":"pages/tab/product","iconPath":"/static/tab/product1.png","selectedIconPath":"/static/tab/product2.png"},{"text":"我的","pagePath":"pages/tab/my","iconPath":"/static/tab/user1.png","selectedIconPath":"/static/tab/user2.png"}],"midButton":{"width":"65px","height":"75px","text":"","iconPath":"static/tab/todo.png","iconWidth":"50px"},"selectedIndex":0,"shown":true},"adid":"120390270110"},"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F0AFD30","name":"数智产销","version":{"name":"1.0.0","code":20241024},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNIF0AFD30","aliasname":"__uni__f0afd30","password":"4Z2SSz2hk5AO56cxUDfY3A==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"geolocation":{"system":{"__platform__":["android"]}}},"orientation":"portrait-primary"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.15","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"tabBar":{"position":"bottom","color":"#333333","selectedColor":"#01508B","borderStyle":"rgba(0,0,0,0.4)","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#FFFFFF","list":[{"text":"首页","pagePath":"pages/tab/index","iconPath":"/static/tab/index1.png","selectedIconPath":"/static/tab/index2.png"},{"text":"办公","pagePath":"pages/tab/office","iconPath":"/static/tab/office1.png","selectedIconPath":"/static/tab/office2.png"},{"text":"生产","pagePath":"pages/tab/product","iconPath":"/static/tab/product1.png","selectedIconPath":"/static/tab/product2.png"},{"text":"我的","pagePath":"pages/tab/my","iconPath":"/static/tab/user1.png","selectedIconPath":"/static/tab/user2.png"}],"midButton":{"width":"65px","height":"75px","text":"","iconPath":"static/tab/todo.png","iconWidth":"50px"},"selectedIndex":0,"shown":true},"adid":"120390270110"},"launch_path":"__uniappview.html"}

unpackage/cache/wgt/__UNI__F0AFD30/pages/task/index.css

@@ -1 +1 @@
-.list_box[data-v-0fda3c90]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-0fda3c90]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-0fda3c90]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-0fda3c90]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-0fda3c90]{font-size:.875rem;color:#999}.list_box .list .info[data-v-0fda3c90]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-0fda3c90]{padding-top:.5rem}.list_box .list .btn[data-v-0fda3c90]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-0fda3c90]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-0fda3c90]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-0fda3c90]{background:#01508b;color:#fff}body{background-color:#f8f8f8}.tasklist[data-v-aa551903]{padding-top:3.125rem}.nav[data-v-aa551903]{background-color:#fff;height:3.125rem;width:100vw;position:fixed;top:0;left:0;z-index:99}.nav .tab_box[data-v-aa551903]{padding:.75rem 0}.nav .tab_box uni-view[data-v-aa551903]{position:relative;font-size:.875rem;color:#666}.nav .tab_box .active[data-v-aa551903]{font-size:.875rem;color:#01508b}.nav .tab_box .active[data-v-aa551903]:after{position:absolute;width:7.1875rem;height:.0625rem;background:#01508b;content:" ";bottom:-.6875rem;left:50%;transform:translate(-50%)}.nav .time_box[data-v-aa551903]{padding:.625rem 0}.nav .time_box .time[data-v-aa551903]{padding:0 .9375rem;width:19.6875rem;height:2.25rem;background:#f8f8f8;border-radius:.25rem}.nav .time_box .time uni-image[data-v-aa551903]{width:1.0625rem;height:1.0625rem}
+.list_box[data-v-31891b43]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-31891b43]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-31891b43]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-31891b43]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-31891b43]{font-size:.875rem;color:#999}.list_box .list .info[data-v-31891b43]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-31891b43]{padding-top:.5rem}.list_box .list .btn[data-v-31891b43]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-31891b43]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-31891b43]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-31891b43]{background:#01508b;color:#fff}body{background-color:#f8f8f8}.tasklist[data-v-965734c1]{padding-top:3.125rem}.nav[data-v-965734c1]{background-color:#fff;height:3.125rem;width:100vw;position:fixed;top:0;left:0;z-index:99}.nav .tab_box[data-v-965734c1]{padding:.75rem 0}.nav .tab_box uni-view[data-v-965734c1]{position:relative;font-size:.875rem;color:#666}.nav .tab_box .active[data-v-965734c1]{font-size:.875rem;color:#01508b}.nav .tab_box .active[data-v-965734c1]:after{position:absolute;width:7.1875rem;height:.0625rem;background:#01508b;content:" ";bottom:-.6875rem;left:50%;transform:translate(-50%)}.nav .time_box[data-v-965734c1]{padding:.625rem 0}.nav .time_box .time[data-v-965734c1]{padding:0 .9375rem;width:19.6875rem;height:2.25rem;background:#f8f8f8;border-radius:.25rem}.nav .time_box .time uni-image[data-v-965734c1]{width:1.0625rem;height:1.0625rem}

unpackage/cache/wgt/__UNI__F0AFD30/pages/task/self.css

@@ -1 +1 @@
-.list_box[data-v-0fda3c90]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-0fda3c90]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-0fda3c90]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-0fda3c90]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-0fda3c90]{font-size:.875rem;color:#999}.list_box .list .info[data-v-0fda3c90]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-0fda3c90]{padding-top:.5rem}.list_box .list .btn[data-v-0fda3c90]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-0fda3c90]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-0fda3c90]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-0fda3c90]{background:#01508b;color:#fff}
+.list_box[data-v-31891b43]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-31891b43]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-31891b43]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-31891b43]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-31891b43]{font-size:.875rem;color:#999}.list_box .list .info[data-v-31891b43]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-31891b43]{padding-top:.5rem}.list_box .list .btn[data-v-31891b43]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-31891b43]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-31891b43]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-31891b43]{background:#01508b;color:#fff}

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__F0AFD30",
   "name": "数智产销",
   "version": {
-    "name": "1.0.2",
+    "name": "1.0.0",
-    "code": 20241010
+    "code": 20241024
   },
   "description": "",
   "developer": {

unpackage/dist/build/app-plus/pages/task/index.css

@@ -1 +1 @@
-.list_box[data-v-0fda3c90]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-0fda3c90]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-0fda3c90]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-0fda3c90]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-0fda3c90]{font-size:.875rem;color:#999}.list_box .list .info[data-v-0fda3c90]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-0fda3c90]{padding-top:.5rem}.list_box .list .btn[data-v-0fda3c90]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-0fda3c90]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-0fda3c90]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-0fda3c90]{background:#01508b;color:#fff}body{background-color:#f8f8f8}.tasklist[data-v-aa551903]{padding-top:3.125rem}.nav[data-v-aa551903]{background-color:#fff;height:3.125rem;width:100vw;position:fixed;top:0;left:0;z-index:99}.nav .tab_box[data-v-aa551903]{padding:.75rem 0}.nav .tab_box uni-view[data-v-aa551903]{position:relative;font-size:.875rem;color:#666}.nav .tab_box .active[data-v-aa551903]{font-size:.875rem;color:#01508b}.nav .tab_box .active[data-v-aa551903]:after{position:absolute;width:7.1875rem;height:.0625rem;background:#01508b;content:" ";bottom:-.6875rem;left:50%;transform:translate(-50%)}.nav .time_box[data-v-aa551903]{padding:.625rem 0}.nav .time_box .time[data-v-aa551903]{padding:0 .9375rem;width:19.6875rem;height:2.25rem;background:#f8f8f8;border-radius:.25rem}.nav .time_box .time uni-image[data-v-aa551903]{width:1.0625rem;height:1.0625rem}
+.list_box[data-v-31891b43]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-31891b43]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-31891b43]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-31891b43]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-31891b43]{font-size:.875rem;color:#999}.list_box .list .info[data-v-31891b43]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-31891b43]{padding-top:.5rem}.list_box .list .btn[data-v-31891b43]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-31891b43]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-31891b43]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-31891b43]{background:#01508b;color:#fff}body{background-color:#f8f8f8}.tasklist[data-v-965734c1]{padding-top:3.125rem}.nav[data-v-965734c1]{background-color:#fff;height:3.125rem;width:100vw;position:fixed;top:0;left:0;z-index:99}.nav .tab_box[data-v-965734c1]{padding:.75rem 0}.nav .tab_box uni-view[data-v-965734c1]{position:relative;font-size:.875rem;color:#666}.nav .tab_box .active[data-v-965734c1]{font-size:.875rem;color:#01508b}.nav .tab_box .active[data-v-965734c1]:after{position:absolute;width:7.1875rem;height:.0625rem;background:#01508b;content:" ";bottom:-.6875rem;left:50%;transform:translate(-50%)}.nav .time_box[data-v-965734c1]{padding:.625rem 0}.nav .time_box .time[data-v-965734c1]{padding:0 .9375rem;width:19.6875rem;height:2.25rem;background:#f8f8f8;border-radius:.25rem}.nav .time_box .time uni-image[data-v-965734c1]{width:1.0625rem;height:1.0625rem}

unpackage/dist/build/app-plus/pages/task/self.css

@@ -1 +1 @@
-.list_box[data-v-0fda3c90]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-0fda3c90]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-0fda3c90]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-0fda3c90]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-0fda3c90]{font-size:.875rem;color:#999}.list_box .list .info[data-v-0fda3c90]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-0fda3c90]{padding-top:.5rem}.list_box .list .btn[data-v-0fda3c90]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-0fda3c90]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-0fda3c90]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-0fda3c90]{background:#01508b;color:#fff}
+.list_box[data-v-31891b43]{padding:0 .9375rem;margin-top:.75rem}.list_box .list[data-v-31891b43]{background:#fff;box-shadow:0 .0625rem .125rem rgba(0,0,0,.5);border-radius:.5rem;padding:.9375rem;margin-bottom:.9375rem}.list_box .list .title[data-v-31891b43]{border-bottom:1px solid #efefef;padding-bottom:.75rem;margin-bottom:.25rem}.list_box .list .title uni-view[data-v-31891b43]{font-size:.875rem;color:#333}.list_box .list .title uni-text[data-v-31891b43]{font-size:.875rem;color:#999}.list_box .list .info[data-v-31891b43]{font-size:.875rem;color:#666}.list_box .list .info uni-view[data-v-31891b43]{padding-top:.5rem}.list_box .list .btn[data-v-31891b43]{margin-top:.9375rem}.list_box .list .btn uni-view[data-v-31891b43]{width:9.375rem;height:2rem;border-radius:.25rem;font-size:.875rem;text-align:center;line-height:2rem}.list_box .list .btn .entrust[data-v-31891b43]{background:#fff;border:.0625rem solid #01508B;box-sizing:border-box;color:#01508b}.list_box .list .btn .handle[data-v-31891b43]{background:#01508b;color:#fff}

unpackage/dist/build/app-plus/uni_modules/wuwx-step-counter/utssdk/app-android/src/index.kt

@@ -0,0 +1,73 @@
+@file:Suppress("UNCHECKED_CAST", "USELESS_CAST", "INAPPLICABLE_JVM_NAME")
+package uts.sdk.modules.wuwxStepCounter;
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import io.dcloud.uniapp.*;
+import io.dcloud.uniapp.extapi.*;
+import io.dcloud.uts.*;
+import io.dcloud.uts.Map;
+import io.dcloud.uts.Set;
+import io.dcloud.uts.UTSAndroid;
+import kotlinx.coroutines.CoroutineScope;
+import kotlinx.coroutines.Deferred;
+import kotlinx.coroutines.Dispatchers;
+import kotlinx.coroutines.async;
+open class StartStepCountingUpdatesOptions (
+    open var stepCounts: Int? = null,
+    open var handler: (numberOfSteps: Float, timestamp: Date, error: Any) -> Unit,
+) : UTSObject()
+open class QueryStepCountStartingOptions (
+    open var start: Date? = null,
+    open var end: Date? = null,
+    open var handler: (numberOfSteps: Int, error: Any) -> Unit,
+) : UTSObject()
+var successHandler = fun(numberOfSteps: Float, timestamp: Date, error: Any){};
+open class StepCounterSensorEventListener : SensorEventListener {
+    override fun onSensorChanged(event: SensorEvent): Unit {
+        successHandler(event.values[0], Date(), "");
+    }
+    override fun onAccuracyChanged(sensor: Sensor, param1: Int): Unit {}
+}
+fun startStepCountingUpdates(options: StartStepCountingUpdatesOptions) {
+    var stepCounterSensorEventListener = StepCounterSensorEventListener();
+    successHandler = options.handler;
+    val context = UTSAndroid.getAppContext();
+    if (context != null) {
+        val sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager;
+        sensorManager.unregisterListener(stepCounterSensorEventListener, sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER));
+        sensorManager.registerListener(stepCounterSensorEventListener, sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER), SensorManager.SENSOR_DELAY_NORMAL);
+    }
+}
+fun stopStepCountingUpdates() {}
+fun queryStepCountStarting(options: QueryStepCountStartingOptions) {}
+fun isStepCountingAvailable() {}
+open class StartStepCountingUpdatesOptionsJSONObject : UTSJSONObject() {
+    open var stepCounts: Int? = null;
+    open lateinit var handler: UTSCallback;
+}
+open class QueryStepCountStartingOptionsJSONObject : UTSJSONObject() {
+    open var start: Date? = null;
+    open var end: Date? = null;
+    open lateinit var handler: UTSCallback;
+}
+fun startStepCountingUpdatesByJs(options: StartStepCountingUpdatesOptionsJSONObject) {
+    return startStepCountingUpdates(StartStepCountingUpdatesOptions(stepCounts = options.stepCounts, handler = fun(numberOfSteps: Float, timestamp: Date, error: Any): Unit {
+        options.handler(numberOfSteps, timestamp, error);
+    }
+    ));
+}
+fun stopStepCountingUpdatesByJs() {
+    return stopStepCountingUpdates();
+}
+fun queryStepCountStartingByJs(options: QueryStepCountStartingOptionsJSONObject) {
+    return queryStepCountStarting(QueryStepCountStartingOptions(start = options.start, end = options.end, handler = fun(numberOfSteps: Int, error: Any): Unit {
+        options.handler(numberOfSteps, error);
+    }
+    ));
+}
+fun isStepCountingAvailableByJs() {
+    return isStepCountingAvailable();
+}

unpackage/dist/dev/app-plus/app-config-service.js

@@ -2,7 +2,7 @@
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
   const __uniConfig = {"pages":[],"globalStyle":{"navigationBar":{"type":"default","backgroundImage":"linear-gradient(to left , #256FBC, #044D87)"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"数智产销","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.15","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#333333","selectedColor":"#01508B","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#FFFFFF","list":[{"text":"首页","pagePath":"pages/tab/index","iconPath":"/static/tab/index1.png","selectedIconPath":"/static/tab/index2.png"},{"text":"办公","pagePath":"pages/tab/office","iconPath":"/static/tab/office1.png","selectedIconPath":"/static/tab/office2.png"},{"text":"生产","pagePath":"pages/tab/product","iconPath":"/static/tab/product1.png","selectedIconPath":"/static/tab/product2.png"},{"text":"我的","pagePath":"pages/tab/my","iconPath":"/static/tab/user1.png","selectedIconPath":"/static/tab/user2.png"}],"midButton":{"width":"65px","height":"75px","text":"","iconPath":"static/tab/todo.png","iconWidth":"50px"},"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":0,"enablePullDownRefresh":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/office","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/product","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/my","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/task/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"type":"default","titleText":"我的任务","titleColor":"#fff"},"isNVue":false}},{"path":"pages/task/handle","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/talk/message_list","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"消息","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/talk/conversation","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"昵称","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/talk/system","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"系统通知","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/document/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/document/detail","meta":{"navigationBar":{"titleText":"详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/meeting/index","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/meeting/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/leave/application","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"请假申请","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/checkin/index","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/useredit/useredit","meta":{"navigationBar":{"titleText":"资料编辑","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/address","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"地址","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/add_address","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"添加地址","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/addressbook","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"通讯录","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/task/todotask","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"今日待办任务","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/safe/manage","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/product/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"生产数据","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/userlist/index","meta":{"navigationBar":{"titleText":"","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/safe/detail","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/zhiban/index","meta":{"navigationBar":{"titleText":"值班信息","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/task/self","meta":{"navigationBar":{"titleText":"本人发起","type":"default","titleColor":"#ffffff"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":0,"enablePullDownRefresh":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/office","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/product","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/tab/my","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/task/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"type":"default","titleText":"我的任务","titleColor":"#fff"},"isNVue":false}},{"path":"pages/task/handle","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/talk/message_list","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"消息","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/talk/conversation","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"昵称","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/talk/system","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"系统通知","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/document/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/document/detail","meta":{"navigationBar":{"titleText":"详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/meeting/index","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/meeting/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/leave/application","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"请假申请","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/checkin/index","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/useredit/useredit","meta":{"navigationBar":{"titleText":"资料编辑","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/address","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"地址","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/add_address","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"添加地址","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/useredit/addressbook","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"通讯录","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/task/todotask","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"个人办公","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/safe/manage","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/product/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"titleText":"生产数据","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/userlist/index","meta":{"navigationBar":{"titleText":"","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/safe/detail","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/zhiban/index","meta":{"navigationBar":{"titleText":"值班信息","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/task/self","meta":{"navigationBar":{"titleText":"本人发起","type":"default","titleColor":"#ffffff"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/app-service.js

@@ -6335,6 +6335,27 @@ This will fail in production.`);
       data: config
     });
   }
+  function claimApi(config) {
+    return https({
+      url: "/act/task/claim",
+      method: "put",
+      data: config
+    });
+  }
+  function callBackProcessApi(config) {
+    return https({
+      url: "/act/task/callBackProcess",
+      method: "put",
+      data: config
+    });
+  }
+  function invalidProcessApi(config) {
+    return https({
+      url: "/act/task/invalidProcess",
+      method: "put",
+      data: config
+    });
+  }
   function getCategoryItemsApi(pid) {
     return https({
       url: "/sys/category/findtree",
@@ -6379,13 +6400,6 @@ This will fail in production.`);
       data: config
     });
   }
-  function claimApi(config) {
-    return https({
-      url: "/act/task/claim",
-      method: "put",
-      data: config
-    });
-  }
   function cxcJurisdictionApi(config) {
     return https({
       url: "/CxcJurisdiction/cxcJurisdiction/queryById",
@@ -7563,11 +7577,11 @@ This will fail in production.`);
         // 	text: '值班表查询',
         // 	path: '/pages/zhiban/index'
         // }, 
-        {
+        // {
-          img: "../../static/my/xiaoxi.png",
+        // 	img: '../../static/my/xiaoxi.png',
-          text: "接受消息推送",
+        // 	text: '接受消息推送',
-          path: ""
+        // 	path: ''
-        }
+        // }
         // , {
         // 	img: '../../static/my/dingwei.png',
         // 	text: '开启定位',
@@ -7687,7 +7701,7 @@ This will fail in production.`);
                       1
                       /* TEXT */
                     ),
-                    vue.createElementVNode("text", null, "今日待办任务")
+                    vue.createElementVNode("text", null, "个人办公")
                   ]),
                   vue.createElementVNode("view", { class: "box f-col aic" }, [
                     vue.createElementVNode(
@@ -7853,17 +7867,39 @@ This will fail in production.`);
       const tojump = (url) => {
         emit("jump", url);
       };
-      const claim = (id) => {
+      const handleClaim = (id) => {
         claimApi({
           taskId: id
         }).then((res) => {
           if (res.success) {
+            uni.redirectTo({
+              url: "./index?id=0"
+            });
+            proxy.$toast(res.message);
+          }
+        });
+      };
+      const callBackProcess = (id) => {
+        callBackProcessApi({
+          processInstanceId: id
+        }).then((res) => {
+          if (res.success) {
+            uni.redirectTo({
+              url: "./self"
+            });
+            proxy.$toast(res.message);
+          }
+        });
+      };
+      const invalidProcess = (id) => {
+        invalidProcessApi({
+          processInstanceId: id
+        }).then((res) => {
+          if (res.success) {
+            uni.redirectTo({
+              url: "./self"
+            });
             proxy.$toast(res.message);
-            setTimeout(function() {
-              uni.redirectTo({
-                url: "./index?id=0"
-              });
-            }, 500);
           }
         });
       };
@@ -7904,13 +7940,13 @@ This will fail in production.`);
                     1
                     /* TEXT */
                   ),
-                  vue.createElementVNode(
+                  __props.currentIndex != 2 ? (vue.openBlock(), vue.createElementBlock(
                     "view",
-                    null,
+                    { key: 0 },
                     " 当前环节：" + vue.toDisplayString(item.taskName),
                     1
                     /* TEXT */
-                  ),
+                  )) : vue.createCommentVNode("v-if", true),
                   vue.createElementVNode(
                     "view",
                     null,
@@ -7932,9 +7968,9 @@ This will fail in production.`);
                     1
                     /* TEXT */
                   ),
-                  __props.currentIndex == 1 ? (vue.openBlock(), vue.createElementBlock(
+                  item.taskEndTime ? (vue.openBlock(), vue.createElementBlock(
                     "view",
-                    { key: 0 },
+                    { key: 1 },
                     " 结束时间：" + vue.toDisplayString(item.taskEndTime),
                     1
                     /* TEXT */
@@ -7960,8 +7996,21 @@ This will fail in production.`);
                   vue.createElementVNode("view"),
                   vue.createElementVNode("view", {
                     class: "handle",
-                    onClick: ($event) => claim(item.id)
+                    onClick: vue.withModifiers(($event) => handleClaim(item.id), ["stop"])
                   }, " 签收 ", 8, ["onClick"])
+                ])) : vue.createCommentVNode("v-if", true),
+                __props.currentIndex == 2 && !item.endTime ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 2,
+                  class: "btn f-row aic jcb"
+                }, [
+                  vue.createElementVNode("view", {
+                    class: "entrust",
+                    onClick: vue.withModifiers(($event) => invalidProcess(item.processInstanceId), ["stop"])
+                  }, " 作废流程 ", 8, ["onClick"]),
+                  vue.createElementVNode("view", {
+                    class: "handle",
+                    onClick: vue.withModifiers(($event) => callBackProcess(item.processInstanceId), ["stop"])
+                  }, " 取回流程 ", 8, ["onClick"])
                 ])) : vue.createCommentVNode("v-if", true)
               ], 8, ["onClick"]);
             }),
@@ -8987,7 +9036,7 @@ This will fail in production.`);
       onLoad((options) => {
         taskInfo.value = JSON.parse(options.info);
         type = options.type;
-        if (type == 1) {
+        if (type == 1 || type == 2) {
           return getHisProcessNodeInfo(taskInfo.value.processInstanceId);
         }
         getProcessNodeInfo(taskInfo.value.id);
@@ -9031,18 +9080,22 @@ This will fail in production.`);
                   vue.unref(type) == 0 ? (vue.openBlock(), vue.createElementBlock("view", {
                     key: 0,
                     class: "status"
-                  }, " 待审批 ")) : (vue.openBlock(), vue.createElementBlock("view", {
+                  }, " 待审批 ")) : vue.createCommentVNode("v-if", true),
+                  vue.unref(type) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
                     key: 1,
                     class: "status",
                     style: { "background-color": "#7AC756" }
-                  }, " 已处理 "))
+                  }, " 已处理 ")) : vue.createCommentVNode("v-if", true)
                 ])
               ]),
               _: 1
               /* STABLE */
             }),
             (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(comp.value), { dataId: dataId.value }, null, 8, ["dataId"])),
-            vue.createElementVNode("view", { class: "btn f-row aic jcb" }, [
+            vue.unref(type) == 0 ? (vue.openBlock(), vue.createElementBlock("view", {
+              key: 0,
+              class: "btn f-row aic jcb"
+            }, [
               vue.createElementVNode("view", {
                 class: "refuse",
                 onClick: _cache[0] || (_cache[0] = ($event) => openpop(1))
@@ -9051,7 +9104,7 @@ This will fail in production.`);
                 class: "agree",
                 onClick: _cache[1] || (_cache[1] = ($event) => openpop(2))
               }, " 同意 ")
-            ]),
+            ])) : vue.createCommentVNode("v-if", true),
             vue.createVNode(
               _component_uni_popup,
               {
@@ -10019,7 +10072,7 @@ This will fail in production.`);
     {
       path: "pages/task/todotask",
       style: {
-        navigationBarTitleText: "今日待办任务",
+        navigationBarTitleText: "个人办公",
         enablePullDownRefresh: false,
         navigationBarTextStyle: "white"
       }
@@ -16466,7 +16519,6 @@ ${i3}
         vue.nextTick(() => {
           uni.createSelectorQuery().in(CurrentInstance.proxy).select(".item_box").boundingClientRect((data) => {
             moreHeight.value = (data == null ? void 0 : data.height) + "px";
-            formatAppLog("log", "at bpm/extendCom.vue:82", "moreHeight", moreHeight.value);
           }).exec();
         });
       }, {
@@ -16479,7 +16531,7 @@ ${i3}
             id = 0;
           }
           if (props.title == "已办事项") {
-            id = 2;
+            id = 1;
           }
           if (props.title == "本人发起") {
             return uni.navigateTo({
@@ -16710,19 +16762,19 @@ ${i3}
           },
           [
             vue.createVNode(extendCom, {
-              title: "待办事项",
+              title: "我的任务",
-              img: "todo",
+              img: "process",
               list: todoArr.value,
               total: todoTotal.value
             }, null, 8, ["list", "total"]),
             vue.createVNode(extendCom, {
-              title: "已办事项",
+              title: "历史任务",
               img: "done",
               list: doneArr.value,
               total: doneTotal.value
             }, null, 8, ["list", "total"]),
             vue.createVNode(extendCom, {
-              title: "本人发起",
+              title: "我发起流程",
               img: "self",
               list: selfArr.value,
               total: selfTotal.value

unpackage/dist/dev/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__F0AFD30",
   "name": "数智产销",
   "version": {
-    "name": "1.0.2",
+    "name": "1.0.0",
-    "code": 20241010
+    "code": 20241024
   },
   "description": "",
   "developer": {