优化

.hbuilderx/launch.json

@@ -4,29 +4,27 @@
     "version" : "0.0",
     "configurations" : [
         {
-        	"app-plus" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"default" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"h5" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"mp-weixin" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"type" : "uniCloud"
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
         },
         {
+            "openVueDevtools" : true,
             "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
+            "openVueDevtools" : true,
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         },

api/mainData/index.js

@@ -32,7 +32,41 @@ export async function getAsset(params) {
   }
   return Promise.reject(new Error(data.message));
 }
+/**
+ * 查询人员列表
+ * @param params 查询条件
+ */
+export async function getUserPage(params) {
 
+  const res = await request.get(Vue.prototype.apiUrl + `/main/user/getUserPage?`, {});
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询机构列表
+ * @param params 查询条件
+ */
+export async function listOrganizations (params) {
+  const res = await request.get(Vue.prototype.apiUrl + '/main/group/getGroupList', params);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+//h获取部门用户
+export async function getGroupUserTree(params) {
+  const res = await request.get(
+   Vue.prototype.apiUrl +  `/main/group/getGroupUserTree`,
+    params
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 // // 根据工艺路线编码获取工序
 // export async function getProcessByRoute (data) {
 //   const res = await request.post(

api/wt/index.js

@@ -369,5 +369,37 @@ export async function getList(params) {
 //
 //
 //
-
-
+//动态表单 工作流自定义权限过滤表单集合
+export async function getBpmCustomFormList(params) {
+  const res = await get(Vue.prototype.apiUrl + '/flowable/bpmcustomform/list', params );
+  if (res.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+  };
+//动态表单 我发起的申请
+export async function getProcessInstancePage(params) {
+	const res = await get(Vue.prototype.apiUrl + '/bpm/process-instance/my-page', params );
+	if (res.code == 0) {
+	  return res.data;
+	}
+	return Promise.reject(new Error(res.data.message));
+	};
+//动态表单 部门发起的申请
+export async function getProcessInstanceDeptPage(query) {
+	
+	const res = await get(Vue.prototype.apiUrl + '/bpm/process-instance/my-dept-page', params );
+	if (res.code == 0) {
+	  return res.data;
+	}
+	return Promise.reject(new Error(res.data.message));
+	};
+//动态表单 通知我的申请
+export async function getProcessInstanceNoticePage(data) {
+	
+	const res = await postJ(Vue.prototype.apiUrl + '/bpm/process-instance/my-notice-page', data );
+	if (res.code == 0) {
+	  return res.data;
+	}
+	return Promise.reject(new Error(res.data.message));
+	};

main.js

@@ -3,9 +3,6 @@ import App from "./App";
 import store from "./store";
 Vue.prototype.$store = store;
 
-
-
-
 // uView配置
 import uView from "@/uni_modules/uview-ui";
 Vue.use(uView);
@@ -73,4 +70,3 @@ export function createApp() {
   };
 }
 // #endif
-  

package-lock.json

@@ -14,6 +14,7 @@
 				"lodash": "^4.17.21",
 				"mpvue-echarts": "^0.3.2",
 				"mqtt": "^4.3.7",
+				"svgo": "^3.3.2",
 				"vconsole": "^3.15.1"
 			}
 		},
@@ -28,6 +29,14 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@trysound/sax": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
+			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -48,6 +57,11 @@
 				"readable-stream": "^3.4.0"
 			}
 		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -71,6 +85,14 @@
 			"resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
 			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
 		},
+		"node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
 		"node_modules/commist": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmmirror.com/commist/-/commist-1.1.0.tgz",
@@ -113,6 +135,74 @@
 			"integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==",
 			"hasInstallScript": true
 		},
+		"node_modules/css-select": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmmirror.com/css-select/-/css-select-5.1.0.tgz",
+			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.1.0",
+				"domhandler": "^5.0.2",
+				"domutils": "^3.0.1",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+			"dependencies": {
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+			}
+		},
+		"node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/csso": {
+			"version": "5.0.5",
+			"resolved": "https://registry.npmmirror.com/csso/-/csso-5.0.5.tgz",
+			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+			"dependencies": {
+				"css-tree": "~2.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+				"npm": ">=7.0.0"
+			}
+		},
+		"node_modules/csso/node_modules/css-tree": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.2.1.tgz",
+			"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+			"dependencies": {
+				"mdn-data": "2.0.28",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+				"npm": ">=7.0.0"
+			}
+		},
+		"node_modules/csso/node_modules/mdn-data": {
+			"version": "2.0.28",
+			"resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.28.tgz",
+			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g=="
+		},
 		"node_modules/dayjs": {
 			"version": "1.11.11",
 			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
@@ -134,6 +224,57 @@
 				}
 			}
 		},
+		"node_modules/dom-serializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-2.0.0.tgz",
+			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+			"dependencies": {
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.2",
+				"entities": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domhandler": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-5.0.3.tgz",
+			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+			"dependencies": {
+				"domelementtype": "^2.3.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domutils": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmmirror.com/domutils/-/domutils-3.2.2.tgz",
+			"integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+			"dependencies": {
+				"dom-serializer": "^2.0.0",
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
 		"node_modules/duplexify": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmmirror.com/duplexify/-/duplexify-4.1.3.tgz",
@@ -162,6 +303,17 @@
 				"once": "^1.4.0"
 			}
 		},
+		"node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -240,6 +392,11 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
+		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
@@ -313,6 +470,17 @@
 			"resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
 			"integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
 		},
+		"node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
 		"node_modules/number-allocator": {
 			"version": "1.0.14",
 			"resolved": "https://registry.npmmirror.com/number-allocator/-/number-allocator-1.0.14.tgz",
@@ -338,6 +506,11 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/picocolors": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+		},
 		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -385,6 +558,14 @@
 			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
 		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/split2": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmmirror.com/split2/-/split2-3.2.2.tgz",
@@ -406,6 +587,30 @@
 				"safe-buffer": "~5.2.0"
 			}
 		},
+		"node_modules/svgo": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmmirror.com/svgo/-/svgo-3.3.2.tgz",
+			"integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+			"dependencies": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^5.1.0",
+				"css-tree": "^2.3.1",
+				"css-what": "^6.1.0",
+				"csso": "^5.0.5",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/svgo"
+			}
+		},
 		"node_modules/tslib": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
@@ -488,6 +693,11 @@
 				"regenerator-runtime": "^0.14.0"
 			}
 		},
+		"@trysound/sax": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
+			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
+		},
 		"balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -508,6 +718,11 @@
 				"readable-stream": "^3.4.0"
 			}
 		},
+		"boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -531,6 +746,11 @@
 			"resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
 			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
 		},
+		"commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+		},
 		"commist": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmmirror.com/commist/-/commist-1.1.0.tgz",
@@ -566,6 +786,56 @@
 			"resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.0.tgz",
 			"integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug=="
 		},
+		"css-select": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmmirror.com/css-select/-/css-select-5.1.0.tgz",
+			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+			"requires": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.1.0",
+				"domhandler": "^5.0.2",
+				"domutils": "^3.0.1",
+				"nth-check": "^2.0.1"
+			}
+		},
+		"css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+			"requires": {
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
+			}
+		},
+		"css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
+		},
+		"csso": {
+			"version": "5.0.5",
+			"resolved": "https://registry.npmmirror.com/csso/-/csso-5.0.5.tgz",
+			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+			"requires": {
+				"css-tree": "~2.2.0"
+			},
+			"dependencies": {
+				"css-tree": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.2.1.tgz",
+					"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+					"requires": {
+						"mdn-data": "2.0.28",
+						"source-map-js": "^1.0.1"
+					}
+				},
+				"mdn-data": {
+					"version": "2.0.28",
+					"resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.28.tgz",
+					"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g=="
+				}
+			}
+		},
 		"dayjs": {
 			"version": "1.11.11",
 			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
@@ -579,6 +849,39 @@
 				"ms": "2.1.2"
 			}
 		},
+		"dom-serializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-2.0.0.tgz",
+			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+			"requires": {
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.2",
+				"entities": "^4.2.0"
+			}
+		},
+		"domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
+		},
+		"domhandler": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-5.0.3.tgz",
+			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+			"requires": {
+				"domelementtype": "^2.3.0"
+			}
+		},
+		"domutils": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmmirror.com/domutils/-/domutils-3.2.2.tgz",
+			"integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+			"requires": {
+				"dom-serializer": "^2.0.0",
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.3"
+			}
+		},
 		"duplexify": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmmirror.com/duplexify/-/duplexify-4.1.3.tgz",
@@ -607,6 +910,11 @@
 				"once": "^1.4.0"
 			}
 		},
+		"entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -676,6 +984,11 @@
 				"yallist": "^4.0.0"
 			}
 		},
+		"mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
+		},
 		"minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
@@ -738,6 +1051,14 @@
 			"resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
 			"integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
 		},
+		"nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"requires": {
+				"boolbase": "^1.0.0"
+			}
+		},
 		"number-allocator": {
 			"version": "1.0.14",
 			"resolved": "https://registry.npmmirror.com/number-allocator/-/number-allocator-1.0.14.tgz",
@@ -760,6 +1081,11 @@
 			"resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
 		},
+		"picocolors": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+		},
 		"process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -804,6 +1130,11 @@
 			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
 		},
+		"source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
+		},
 		"split2": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmmirror.com/split2/-/split2-3.2.2.tgz",
@@ -825,6 +1156,20 @@
 				"safe-buffer": "~5.2.0"
 			}
 		},
+		"svgo": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmmirror.com/svgo/-/svgo-3.3.2.tgz",
+			"integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+			"requires": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^5.1.0",
+				"css-tree": "^2.3.1",
+				"css-what": "^6.1.0",
+				"csso": "^5.0.5",
+				"picocolors": "^1.0.0"
+			}
+		},
 		"tslib": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",

package.json

@@ -4,17 +4,22 @@
 	"description": "",
 	"main": "main.js",
 	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"svgicon": "node ./uni_modules/zui-svg-icon/tools/generate-svg-icon.js"
 	},
 	"keywords": [],
 	"author": "",
 	"license": "ISC",
+	"babel": {
+		"sourceType": "unambiguous"
+	},
 	"dependencies": {
 		"dayjs": "^1.11.7",
 		"echarts": "^5.4.2",
 		"lodash": "^4.17.21",
 		"mpvue-echarts": "^0.3.2",
 		"mqtt": "^4.3.7",
+		"svgo": "^3.3.2",
 		"vconsole": "^3.15.1"
 	}
-}
+}

pages.json

@@ -218,6 +218,16 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/home/wt/components/formParser/routerView",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+	    
+	
 		// {
 		// 	"path": "pages/home/wt/components/feeApplication/taskForm",
 		// 	"style": {
@@ -1806,6 +1816,14 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		{
+			"path": "pages/internalManagement/apply/index",
+			"style": {
+				"navigationBarTitleText": "申请",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
 		}
 	],
 	"tabBar": {

pages/home/components/navigation.vue

@@ -39,14 +39,14 @@
 						// "num": 1
 					},
 					{
-						class: 'iconfont icon-kuneipandian ',
+						class: 'iconfont icon-kuneipandian',
 						title: '流程待办',
 						link_url: '/pages/home/wt/todo/todo',
 						badge: 0
 						// "num": 1
 					},
 					{
-						class: 'iconfont icon-yizhihang_1',
+						class: 'iconfont icon-kuneipandian',
 						title: '流程已办',
 						link_url: '/pages/home/wt/done/done'
 						// badge: 0
@@ -164,5 +164,8 @@
 		.nav-item:nth-child(4) span {
 			background-color: $uni-color-error;
 		}
+		.nav-item:nth-child(5) span {
+			background-color: $uni-color-success;
+		}
 	}
 </style>

pages/home/wt/components/detail.vue

@@ -5,7 +5,7 @@
 			<rxl-timeline>
 				<rxl-timeline-item v-for="(item, index) in tasks" :key="index" :color="getTimelineItemIcon(item)" :timestamp="item.createTime">
 					<template #body>
-						<p style="font-weight: 700">任务：{{ item.name }}</p>
+						<p style="font-weight: 700;display: block;">{{item.taskDefinitionKey?'流程节点':'发起人'}}：{{ item.name }}</p>
 						<view style="{ padding: '10px';display: flex;flex-direction: column; }">
 							<span>
 								<label v-if="item.assigneeUser"

pages/home/wt/done/done.vue

@@ -22,7 +22,7 @@
 							<view class="card-body">
 								
 								<view class="card-col">
-									<text class="label">任务名称</text>
+									<text class="label">流程节点</text>
 									<text class="content">{{ item.name }}</text>
 								</view>
 								<view class="card-col">
@@ -189,9 +189,9 @@
 		font-size: 34rpx;
 		color: #333;
 		background-color: #fff;
-		border-radius: 25rpx;
+		border-radius: 10rpx;
 		word-break: break-all;
-		margin-bottom: 30rpx;
+		margin-bottom: 2rpx;
 
 		.status {
 			font-weight: normal;

pages/home/wt/todo/todo.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="blacklog-container">
-		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="我的待办" @clickLeft="back" background-color="#157A2C" color="#fff"></uni-nav-bar>
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="我的待办" @clickLeft="back"
+			background-color="#157A2C" color="#fff"></uni-nav-bar>
 
 		<view class="list-container">
 			<u-list @scrolltolower="scrolltolower">
@@ -18,7 +19,8 @@
 								</view>
 							</view>
 							<view class="card-footer">
-								<u-button v-if="['0', '2'].includes(item.extensionProperty.taskHandlePlatform)" type="success" @click="handleDetail(item, 'handle')">处理</u-button>
+								<u-button v-if="['0', '2'].includes(item.extensionProperty.taskHandlePlatform)"
+									type="success" @click="handleDetail(item, 'handle')">处理</u-button>
 								<u-button v-else type="error">请在PC端处理</u-button>
 								<u-button type="info" @click="handleDetail(item, 'detail')">流程详情</u-button>
 							</view>
@@ -34,15 +36,16 @@
 </template>
 
 <script>
-	import { getTodoTaskPage } from '@/api/wt/index.js'
+	import {
+		getTodoTaskPage
+	} from '@/api/wt/index.js'
 	let [page, size, isEnd] = [1, 10, true]
 
 	export default {
 		computed: {
 			colOptions() {
-				return [
-					{
-						label: '任务名称',
+				return [{
+						label: '流程节点',
 						key: 'name'
 					},
 					{
@@ -78,12 +81,28 @@
 				//'pages/home' + this.listData.miniHandleRouter
 				///wt/components/feeApplication/taskSubmit
 				if (type == 'handle') {
-					let queryParams = `id=${item.processInstance.id}&businessId=${item.businessId}&taskId=${item.id}&taskDefinitionKey=${item.taskDefinitionKey}&miniHandleRouter=${item.miniHandleRouter}&miniViewRouter=${item.miniViewRouter}`
-					let url =  '/pages/home' + item.miniHandleRouter.replace('taskForm','processTask')
-					console.log(url)
-					uni.navigateTo({
-						url: `${url}?${queryParams}`
-					})
+					console.log(Object.keys(item.formJson).length)
+					if (Object.keys(item.formJson).length) {
+						
+						let params = JSON.stringify({
+							id: item.id,
+							processInstanceId: item.processInstance.id|| '',
+							type: type
+						})
+						let queryParams = `params=${params}`
+						let url = '/pages/home/wt/components/formParser/routerView'
+            uni.navigateTo({
+							url: `${url}?${queryParams}`
+						})
+					} else {
+						let queryParams =
+							`id=${item.processInstance.id}&businessId=${item.businessId}&taskId=${item.id}&taskDefinitionKey=${item.taskDefinitionKey}&miniHandleRouter=${item.miniHandleRouter}&miniViewRouter=${item.miniViewRouter}`
+						let url = '/pages/home' + item.miniHandleRouter.replace('taskForm', 'processTask')
+						uni.navigateTo({
+							url: `${url}?${queryParams}`
+						})
+					}			
+
 					//
 				} else {
 					uni.navigateTo({
@@ -146,9 +165,9 @@
 		font-size: 34rpx;
 		color: #333;
 		background-color: #fff;
-		border-radius: 25rpx;
+		border-radius: 10rpx;
 		word-break: break-all;
-		margin-bottom: 30rpx;
+		margin-bottom: 24rpx;
 
 		.status {
 			font-weight: normal;

pages/index/index.vue

@@ -1,6 +1,18 @@
 <template>
 	<view>
 		<uni-nav-bar fixed="true" statusBar="true" title="工作中心" right-icon="scan" @clickRight="HandlScanCode"></uni-nav-bar>
+		<view>
+			<CellTip title="协同办公" v-if="internalManagementList.length > 0"></CellTip>
+			<view class="nav">
+				<view class="nav-content">
+					<view class="nav-item" v-for="(item, index) in internalManagementList" @click="toNav(item.url)">
+						<span :class="'iconfont ' + item.icon"></span>
+						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
+						<label>{{ item.name }}</label>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view>
 			<CellTip title="生产管理" v-if="productionList.length > 0"></CellTip>
 			<view class="nav">
@@ -55,7 +67,7 @@
 			</view>
 		</view>
 		<view>
-			<CellTip title="派车管理" v-if="dispatchList.length > 0"></CellTip>
+			<CellTip title="运输管理" v-if="dispatchList.length > 0"></CellTip>
 			<view class="nav">
 				<view class="nav-content">
 					<view class="nav-item" v-for="(item, index) in dispatchList" @click="toNav(item.url)">
@@ -66,6 +78,7 @@
 				</view>
 			</view>
 		</view>
+		
 		<!--    <view>
       <CellTip title="生产类"></CellTip>
 
@@ -357,6 +370,15 @@
 						//"num": 34
 					}
 				],
+				internalManagementList: [
+					{
+						name: '申请',
+						url: `/pages/internalManagement/apply/index`,
+						icon: 'icon-gongdanguanli',
+						badge: 0
+						//"num": 34
+					}
+				],
 				treeList: []
 			}
 		},

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,5 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
 ## 2.0.9（2024-01-12）
 fix: 修复图标大小默认值错误的问题
 ## 2.0.8（2023-12-14）

uni_modules/uni-icons/components/uni-icons/uni-icons.uvue

@@ -1,91 +1,91 @@
 <template>
-	<text class="uni-icons" :style="styleObj">
-		<slot>{{unicode}}</slot>
-	</text>
+  <text class="uni-icons" :style="styleObj">
+    <slot>{{unicode}}</slot>
+  </text>
 </template>
 
 <script>
-	import { fontData, IconsDataItem } from './uniicons_file'
+  import { fontData, IconsDataItem } from './uniicons_file'
 
-	/**
-	 * Icons 图标
-	 * @description 用于展示 icon 图标
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
-	 * @property {Number} size 图标大小
-	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
-	 * @event {Function} click 点击 Icon 触发事件
-	 */
-	export default {
-		name: "uni-icons",
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			color: {
-				type: String,
-				default: '#333333'
-			},
-			size: {
-				type: Object,
-				default: 16
-			},
-			fontFamily: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {};
-		},
-		computed: {
-			unicode() : string {
-				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
-				if (codes !== null) {
-					return codes.unicode
-				}
-				return ''
-			},
-			iconSize() : string {
-				const size = this.size
-				if (typeof size == 'string') {
-					const reg = /^[0-9]*$/g
-					return reg.test(size as string) ? '' + size + 'px' : '' + size;
-					// return '' + this.size
-				}
-				return this.getFontSize(size as number)
-			},
-			styleObj() : UTSJSONObject {
-				if (this.fontFamily !== '') {
-					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
-				}
-				return { color: this.color, fontSize: this.iconSize }
-			}
-		},
-		created() { },
-		methods: {
-			/**
-			 * 字体大小
-			 */
-			getFontSize(size : number) : string {
-				return size + 'px';
-			},
-		},
-	}
+  /**
+   * Icons 图标
+   * @description 用于展示 icon 图标
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+   * @property {Number,String} size 图标大小
+   * @property {String} type 图标图案，参考示例
+   * @property {String} color 图标颜色
+   * @property {String} customPrefix 自定义图标
+   * @event {Function} click 点击 Icon 触发事件
+   */
+  export default {
+    name: "uni-icons",
+    props: {
+      type: {
+        type: String,
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#333333'
+      },
+      size: {
+        type: [Number, String],
+        default: 16
+      },
+      fontFamily: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      unicode() : string {
+        let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+        if (codes !== null) {
+          return codes.unicode
+        }
+        return ''
+      },
+      iconSize() : string {
+        const size = this.size
+        if (typeof size == 'string') {
+          const reg = /^[0-9]*$/g
+          return reg.test(size as string) ? '' + size + 'px' : '' + size;
+          // return '' + this.size
+        }
+        return this.getFontSize(size as number)
+      },
+      styleObj() : UTSJSONObject {
+        if (this.fontFamily !== '') {
+          return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+        }
+        return { color: this.color, fontSize: this.iconSize }
+      }
+    },
+    created() { },
+    methods: {
+      /**
+       * 字体大小
+       */
+      getFontSize(size : number) : string {
+        return size + 'px';
+      },
+    },
+  }
 </script>
 
 <style scoped>
-	@font-face {
-		font-family: UniIconsFontFamily;
-		src: url('./uniicons.ttf');
-	}
+  @font-face {
+    font-family: UniIconsFontFamily;
+    src: url('./uniicons.ttf');
+  }
 
-	.uni-icons {
-		font-family: UniIconsFontFamily;
-		font-size: 18px;
-		font-style: normal;
-		color: #333;
-	}
+  .uni-icons {
+    font-family: UniIconsFontFamily;
+    font-size: 18px;
+    font-style: normal;
+    color: #333;
+  }
 </style>

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -42,7 +42,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {