From 59f08ee64f94aeb31741595476cfc895c12a7bc9 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 3 Aug 2023 08:41:49 +0800
Subject: [PATCH] 2023-8-3

---
 supervise-uniapp/common/config.js             |   2 +-
 supervise-uniapp/common/request.api.js        |  39 +-
 supervise-uniapp/manifest.json                |   8 +-
 supervise-uniapp/pages.json                   |  66 +-
 supervise-uniapp/pages/home/WorkFragment.vue  | 241 +++--
 .../pages/index/AlreadyProcessed.vue          | 881 ++++++++++++++++++
 .../pages/index/InventorySummary.vue          | 467 ++++++++++
 .../pages/index/InventorySummaryDetail.vue    | 158 ++++
 supervise-uniapp/pages/index/MyProject.vue    |   2 +-
 .../pages/index/WaitingProcessed.vue          | 877 +++++++++++++++++
 .../pages/index/WarehouseManagement.vue       |  10 +-
 supervise-uniapp/pages/index/auditReport.vue  |  14 +-
 supervise-uniapp/pages/index/demoReportKc.vue |  56 +-
 supervise-uniapp/static/baseIcon/search.png   | Bin 0 -> 1404 bytes
 .../static/baseIcon/submitTime.png            | Bin 0 -> 1693 bytes
 .../static/baseIcon/warehouse.png             | Bin 0 -> 302 bytes
 supervise-uniapp/static/baseIcon/work.png     | Bin 0 -> 1927 bytes
 .../uni-collapse-item/uni-collapse-item.vue   |   4 +-
 supervise-uniapp/utils/index.js               |  47 +
 19 files changed, 2712 insertions(+), 160 deletions(-)
 create mode 100644 supervise-uniapp/pages/index/AlreadyProcessed.vue
 create mode 100644 supervise-uniapp/pages/index/InventorySummary.vue
 create mode 100644 supervise-uniapp/pages/index/InventorySummaryDetail.vue
 create mode 100644 supervise-uniapp/pages/index/WaitingProcessed.vue
 create mode 100644 supervise-uniapp/static/baseIcon/search.png
 create mode 100644 supervise-uniapp/static/baseIcon/submitTime.png
 create mode 100644 supervise-uniapp/static/baseIcon/warehouse.png
 create mode 100644 supervise-uniapp/static/baseIcon/work.png
 create mode 100644 supervise-uniapp/utils/index.js

diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index 3140f23d..557825b9 100644
--- a/supervise-uniapp/common/config.js
+++ b/supervise-uniapp/common/config.js
@@ -7,7 +7,7 @@
  */
 module.exports = {
 	// baseUrl: 'https://jianguan.yyundong.com/api',
-	baseUrl: 'https://supervise.yxtsoft.com/api',
+	baseUrl: 'https://supervise.yxtsoft.com',
 	// baseUrl: 'http://192.168.1.193:8112',
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js
index e45e49da..6a638fdb 100644
--- a/supervise-uniapp/common/request.api.js
+++ b/supervise-uniapp/common/request.api.js
@@ -1,7 +1,7 @@
 import request from '@/utils/requester.js'
 
 export default {
-	login: (params = {}) => request.post("/portal/v1/sysuser/login", params),
+	login: (params = {}) => request.post("/api/portal/v1/sysuser/login", params),
 	sayhello: (params = {}) => request.get("/sayb", params),
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
@@ -11,21 +11,20 @@ export default {
 	selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
 
 	// 获取审核报告内容
-	getReportInfo: (params = {}) => request.post("/reportwxmpapi/v1/csmcashreport/getCsmReportByComSid", params),
+	getReportInfo: (params = {}) => request.post("/reportwxmpapi/reportwxmpapi/v1/csmcashreport/getCsmReportByComSid",
+		params),
 	// 获取今日回款明细
 	getCsmReportTodayByComSid: (params = {}) => request.post(
-		"/reportwxmpapi/v1/csmcashreportcashed/getCsmReportTodayByComSid",
+		"/reportwxmpapi/reportwxmpapi/v1/csmcashreportsales/getCsmReportYesterdayByComSid",
 		params),
 	// 获取昨日销售报表
 	getCsmReportYesterdayByComSid: (params = {}) => request.post(
-		"/reportwxmpapi/v1/csmcashreportsales/getCsmReportYesterdayByComSid",
+		"/reportwxmpapi/reportwxmpapi/v1/csmcashreportsales/getCsmReportYesterdayByComSid",
 		params),
 
 	// 库存汇总表
 	getReportInventoryDayGather: (params = {}) => request.get(
-		"/reportwxmpapi/reportinventory/getReportInventoryDayGather/" +
-		params,
-		params),
+		"/reportwxmpapi/reportinventory/getReportInventoryDayGather/" + params, params),
 	// 仓库库存明细表
 	getReportInventoryDayStore: (params = {}) => request.get(
 		"/reportwxmpapi/reportinventory/getReportInventoryDayStore/" + params, params),
@@ -33,25 +32,39 @@ export default {
 	getReportInventoryDayToStore: (params = {}) => request.get(
 		"/reportwxmpapi/reportinventory/getReportInventoryDayToStore/" + params, params),
 
+	// 质物库存汇总-表头
+	getDayGather: (params = {}) => request.get(
+		"/reportwxmpapi/reportstock/getDayGather/" + params.projectSid + "/" + params.orderDate, params),
+		// "/report/reportstock/getDayGather/" + params.projectSid + "/" + params.orderDate, params),
+
+	// 质物库存汇总-仓库列表
+	getDayStore: (params = {}) => request.get(
+		"/reportwxmpapi/reportstock/getDayStore/" + params.projectSid + "/" + params.orderDate, params),
+		// "/report/reportstock/getDayStore/" + params.projectSid + "/" + params.orderDate, params),
+
+	// 质物库存汇总-明细
+	getDayProduct: (params = {}) => request.get(
+		"/reportwxmpapi/reportstock/getDayProduct/" + params, params),
+		// "/report/reportstock/getDayProduct/" + params, params),
 
 	// 获取首页面数据
-	getWorkData: (params = {}) => request.get("/portal/v1/flow/task/" + params, params),
+	getWorkData: (params = {}) => request.get("/api/portal/v1/flow/task/" + params, params),
 
 	// 获取云仓列表
-	storeHouseListPage: (params = {}) => request.post("/portal/v1/flow/storeHouseListPage", params),
+	storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
 	// 获取云仓详情
-	storeHouseDetail: (params = {}) => request.get("/portal/v1/flow/fetchDetailsBySid/" + params, params),
+	storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params),
 
 	// 获取我的项目
-	getProjectByUserSid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectByUserSid/" + params,
+	getProjectByUserSid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectByUserSid/" + params,
 		params),
 
 	// 获取我的项目详情
-	getProjectBySid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectBySid/" + params,
+	getProjectBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectBySid/" + params,
 		params),
 
 	// 获取我的项目-仓库详情
-	getStorehouseBySid: (params = {}) => request.get("/crm/v1/projectinformation/getStorehouseBySid/" + params,
+	getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params,
 		params),
 
 }
\ No newline at end of file
diff --git a/supervise-uniapp/manifest.json b/supervise-uniapp/manifest.json
index 7ae2a7da..64e1581c 100644
--- a/supervise-uniapp/manifest.json
+++ b/supervise-uniapp/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "汇融云仓贷后",
+    "name" : "监管平台",
     "appid" : "__UNI__DD73AA7",
     "description" : "汇融银行监管平台",
-    "versionName" : "1.0.0.7",
-    "versionCode" : 1007,
+    "versionName" : "1.0.0.8",
+    "versionCode" : 1008,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {
@@ -114,7 +114,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx65c2b78fd1452eeb",
+        "appid" : "wx05604ce2a8bede05",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,
diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json
index 69c6b32f..703cebea 100644
--- a/supervise-uniapp/pages.json
+++ b/supervise-uniapp/pages.json
@@ -7,13 +7,11 @@
 	// 		"query": "" //启动参数，在页面的onLoad函数里面得到
 	// 	}]
 	// },
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [
+
+		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
 		{
-			"path": "pages/index/demoReportKc",
-			"style": {
-				"navigationBarTitleText": "质物库存汇总"
-			}
-		},{
 			"path": "pages/login/login",
 			"style": {
 				"navigationStyle": "custom",
@@ -21,7 +19,49 @@
 					"scrollIndicator": false //禁用原生导航栏,
 				}
 			}
+		},{
+			"path": "pages/index/InventorySummary",
+			"style": {
+				"navigationBarTitleText": "质物库存汇总"
+			}
+		}, {
+			"path": "pages/index/WaitingProcessed",
+			"style": {
+				"navigationBarTitleText": "待办工作",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/index/AlreadyProcessed",
+			"style": {
+				"navigationBarTitleText": "已办工作",
+				"enablePullDownRefresh": true
+			}
+
+		}, 
+		{
+			"path": "pages/index/InventorySummaryDetail",
+			"style": {
+				"navigationBarTitleText": "质物库存汇总-商品明細"
+			}
+		}, {
+			"path": "pages/index/demoReportKc",
+			"style": {
+				"navigationBarTitleText": "质物库存汇总"
+			}
 		}, {
+			"path": "pages/index/auditReport",
+			"style": {
+				"navigationBarTitleText": "回款报告"
+			}
+		}, {
+			"path": "pages/index/enterpriseRisk",
+			"style": {
+				"navigationBarTitleText": "企业经营异常核查"
+			}
+		},
+
+		{
 			"path": "pages/index/MyProject",
 			"style": {
 				"navigationBarTitleText": "我的项目"
@@ -83,18 +123,8 @@
 			"style": {
 				"navigationBarTitleText": "隐私政策"
 			}
-		},
-	 {
-			"path": "pages/index/auditReport",
-			"style": {
-				"navigationBarTitleText": "回款报告"
-			}
-		}, {
-			"path": "pages/index/enterpriseRisk",
-			"style": {
-				"navigationBarTitleText": "企业经营异常核查"
-			}
 		}
+
 	],
 	"lazyCodeLoading": "requiredComponents",
 	"globalStyle": {
@@ -120,7 +150,7 @@
 		"selectedColor": "#41adf8",
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "black",
-		"iconWidth": "20px", // 字体大小
+		"iconWidth": "25px", // 字体大小
 		"list": [{
 			"pagePath": "pages/home/WorkFragment",
 			"iconPath": "static/bottom-icon/gongzuotai1.png",
diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue
index 5d922d1b..e6e2de19 100644
--- a/supervise-uniapp/pages/home/WorkFragment.vue
+++ b/supervise-uniapp/pages/home/WorkFragment.vue
@@ -1,49 +1,62 @@
 <template>
 	<view class="content">
 
-		<view class="whiteBg" style="margin-top: 20px;">
+		<view class="whiteBg" style="display: flex;flex-direction: column;margin-top: 20px;">
 
-			<view class="top_item" @click="topClick('1')">
+			<!--circular用来设置循环轮播   indicator-dots设置下面小圆点用来点击 -->
+			<swiper circular indicator-dots class="swiper" :autoplay="true" :interval="2000" v-show="swipers.length>0">
+				<!-- v-for循环遍历数组 -->
+				<swiper-item v-for="(item,index) in swipers">
+					<image :src="item" @click="swiperClick(index)"></image>
+				</swiper-item>
+			</swiper>
 
-				<view class="top_item_icon">
-					<text class="top_item_icon_num" v-show="dbNum!=0">{{dbNum}}</text>
-					<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dbgz.png"></image>
-				</view>
-				<text class="top_item_text">待办工作</text>
-			</view>
-			<view class="top_item" @click="topClick('2')">
-				<view class="top_item_icon">
-					<text class="top_item_icon_num" v-show="ybNum!=0">{{ybNum}}</text>
+			<view style="display: flex;flex-direction: row;">
 
-					<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/ybgz.png"></image>
+				<view class="top_item" @click="topClick('1')">
+					<view class="top_item_icon">
+						<text class="top_item_icon_num" v-show="dbNum!=0">{{dbNum}}</text>
+						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dbgz.png">
+						</image>
+					</view>
+					<text class="top_item_text">待办工作</text>
 				</view>
-				<text class="top_item_text">已办工作</text>
-			</view>
-			<view class="top_item" @click="topClick('3')">
-				<view class="top_item_icon">
-					<text class="top_item_icon_num" v-show="dyNum!=0">{{dyNum}}</text>
-
-					<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dygz.png"></image>
+				<view class="top_item" @click="topClick('2')">
+					<view class="top_item_icon">
+						<text class="top_item_icon_num" v-show="ybNum!=0">{{ybNum}}</text>
+
+						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/ybgz.png">
+						</image>
+					</view>
+					<text class="top_item_text">已办工作</text>
 				</view>
-				<text class="top_item_text">待阅工作</text>
-			</view>
-			<view class="top_item" @click="topClick('4')">
-				<view class="top_item_icon">
-					<text class="top_item_icon_num" v-show="yyNum!=0">{{yyNum}}</text>
-
-					<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/yygz.png"></image>
+				<view class="top_item" @click="topClick('3')">
+					<view class="top_item_icon">
+						<text class="top_item_icon_num" v-show="dyNum!=0">{{dyNum}}</text>
+
+						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dygz.png">
+						</image>
+					</view>
+					<text class="top_item_text">待阅工作</text>
+				</view>
+				<view class="top_item" @click="topClick('4')">
+					<view class="top_item_icon">
+						<text class="top_item_icon_num" v-show="yyNum!=0">{{yyNum}}</text>
+
+						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/yygz.png">
+						</image>
+					</view>
+					<text class="top_item_text">已阅工作</text>
 				</view>
-				<text class="top_item_text">已阅工作</text>
 			</view>
 
 		</view>
 
 
-		<view style="display: flex;flex-direction: row; align-items: center;margin-top: 15px;"
-			v-show="textArr.length>0">
+		<view style="display: flex;flex-direction: row; align-items: center;" v-show="textArr.length>0">
 
-			<image style="width: 20px;height: 20px;margin-left: 10px;" src="https://jianguan.yyundong.com/img/newApp/notices.png"
-				mode="aspectFit"></image>
+			<image style="width: 20px;height: 20px;margin-left: 10px;"
+				src="https://jianguan.yyundong.com/img/newApp/notices.png" mode="aspectFit"></image>
 			<div class="textBox">
 
 				<!-- <transition name="slide">
@@ -60,67 +73,64 @@
 
 		</view>
 
-		<view class="whiteBg" style="display: flex;flex-direction: column; margin-top: 15px;">
+		<view class="whiteBg" style="display: flex;flex-direction: column;padding-top: 20px;">
 
-			<!--circular用来设置循环轮播   indicator-dots设置下面小圆点用来点击 -->
-			<swiper circular indicator-dots class="swiper" :autoplay="true" :interval="2000" v-show="swipers.length>0">
-				<!-- v-for循环遍历数组 -->
-				<swiper-item v-for="(item,index) in swipers">
-					<image :src="item" @click="swiperClick(index)"></image>
-				</swiper-item>
-			</swiper>
+			<view style="display: flex;flex-direction: row;margin-left: 20px;align-items: center;">
+
+				<image style="width: 25px;height: 25px;" src="https://jianguan.yyundong.com/img/newApp/icon.png"
+					mode="aspectFit"></image>
+				<text style="margin-left: 5px;">更多</text>
 
+			</view>
+
+			<view style=" height: 1px;background: #eee;margin-left: 25px;margin-right: 25px;margin-top: 15px;"></view>
 
 			<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
 
 				<view class="centre" @click="businessClick('1')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ywsp.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ywsp.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">业务审批</text>
 				</view>
 				<view class="centre" @click="businessClick('2')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/gzdd.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/gzdd.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">工作调度</text>
 				</view>
 				<view class="centre" @click="businessClick('3')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/fkgl.png" mode="aspectFit"> </image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/fkgl.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">风控管理</text>
 				</view>
 				<view class="centre" @click="businessClick('4')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/sjbb.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/sjbb.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">数据报表</text>
 				</view>
 
 			</view>
 
-		</view>
-
-		<view class="whiteBg" style="margin-top: 25px;display: flex;flex-direction: column;padding-top: 20px;">
-
-			<view style="display: flex;flex-direction: row;margin-left: 20px;align-items: center;">
-
-				<image style="width: 25px;height: 25px;" src="https://jianguan.yyundong.com/img/newApp/icon.png" mode="aspectFit"></image>
-				<text style="margin-left: 5px;">云仓</text>
-
-			</view>
-
-			<view style=" height: 1px;background: #eee;margin-left: 25px;margin-right: 25px;margin-top: 15px;"></view>
 
 			<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
 
 				<view class="centre" @click="warehouseClick('1')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ycgl.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ycgl.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">云仓管理</text>
 				</view>
 				<view class="centre" @click="warehouseClick('2')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/kcfx.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/kcfx.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">库存分析</text>
 				</view>
 				<view class="centre" @click="warehouseClick('3')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/hjjk.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/hjjk.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">环境监控</text>
 				</view>
 				<view class="centre" @click="warehouseClick('4')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/jqrxk.png" mode="aspectFit"></image>
+					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/jqrxk.png" mode="aspectFit">
+					</image>
 					<text class="centre_text">机器人巡库</text>
 				</view>
 
@@ -135,10 +145,10 @@
 	export default {
 		data() {
 			return {
-				dbNum: 0,
-				ybNum: 0,
-				dyNum: 0,
-				yyNum: 0,
+				dbNum: 1,
+				ybNum: 1,
+				dyNum: 1,
+				yyNum: 1,
 				animateUp: false,
 				timer: null,
 				textArr: [
@@ -177,10 +187,10 @@
 			var userSid = getApp().globalData.sid
 			console.log(">>>>>", userSid)
 			this.getData(userSid)
-			
+
 			uni.setTabBarBadge({ //显示数字
-			  index: 0,//tabbar下标
-			  text: '100'//数字
+				index: 0, //tabbar下标
+				text: '100' //数字
 			})
 			// uni.removeTabBarBadge({ //隐藏数字标
 			//   index:2
@@ -231,6 +241,9 @@
 							title: '待办',
 							duration: 2000,
 						});
+						uni.navigateTo({
+							url: '../index/WaitingProcessed'
+						});
 						break;
 					case "2":
 						// 已办
@@ -239,6 +252,9 @@
 							title: '已办',
 							duration: 2000,
 						});
+						uni.navigateTo({
+							url: '../index/AlreadyProcessed'
+						});
 						break;
 					case "3":
 						// 待阅
@@ -385,51 +401,86 @@
 		height: 100%;
 		margin-left: 12px;
 		margin-right: 12px;
+		padding-bottom: 50px;
 
 		.whiteBg {
 			display: flex;
 			background-color: white;
 			border-radius: 20px;
 
+			.swiper {
+				width: 100%;
+				height: 200px;
+				border-radius: 20rpx;
+				overflow: hidden;
+				/* 兼容IOS，否则在swiper组件内的布局都不受border-radius和overflow的约束 */
+				transform: translateY(0);
+
+
+				image {
+					border-radius: 20rpx;
+					width: 100%;
+					height: 100%;
+				}
+			}
+
 			.top_item {
 				margin-top: 25px;
-				margin-bottom: 15px;
+				margin-bottom: 20px;
 				align-items: center;
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 
 				.top_item_icon {
-					display: flex;
-					flex-direction: column;
+					// position: relative;
+					// width: 50px;
+					// height: 50px;
+					// margin-bottom: 10px;
+					// background-image: url('https://jianguan.yyundong.com/img/newApp/round.png');
+					// background-size: 50px 50px;
+
+					position: relative;
 					width: 50px;
 					height: 50px;
-					align-items: center;
-					justify-content: center;
-					background-image: url('https://jianguan.yyundong.com/img/newApp/round.png');
-					background-size: 50px 50px;
 
 					.top_item_icon_num {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-left: 28px;
-						margin-top: -15px;
-						width: 10px;
-						height: 10px;
-						font-size: 6px;
+						// position: relative;
+						// z-index: 1000;
+						// width: 10px;
+						// height: 10px;
+						// font-size: 6px;
+						// background-color: red;
+						// border-radius: 50%;
+						// padding: 5px;
+						// text-align: center;
+						// color: white;
+						z-index: 1000;
+						position: absolute;
+						color: white;
+						font-size: 12px;
 						background-color: red;
-						border-radius: 50%;
-						padding: 5px;
+						/*height: 24px;改前*/
+						min-height: 18px;
+						/*改后新增的代码*/
+						min-width: 18px;
+						/*改后新增的代码*/
+						line-height: 18px;
+						right: -16%;
+						top: -8px;
 						text-align: center;
-						color: white;
+						-webkit-border-radius: 24px;
+						border-radius: 24px;
+						padding: 2px;
 					}
 
 					.top_item_icon_img {
-						margin-top: -5px;
-						margin-left: 3px;
-						width: 30px;
-						height: 30px;
+						width: 50px;
+						height: 50px;
+						// align-items: center;
+						// justify-content: center;
+						// width: 40px;
+						// height: 40px;
 					}
 				}
 
@@ -507,22 +558,8 @@
 		// }
 	}
 
-	.swiper {
-		width: 100%;
-		height: 200px;
-		border-radius: 20rpx;
-		overflow: hidden;
-		/* 兼容IOS，否则在swiper组件内的布局都不受border-radius和overflow的约束 */
-		transform: translateY(0);
 
 
-		image {
-			border-radius: 20rpx;
-			width: 100%;
-			height: 100%;
-		}
-	}
-
 
 	.centre {
 		flex: 1;
diff --git a/supervise-uniapp/pages/index/AlreadyProcessed.vue b/supervise-uniapp/pages/index/AlreadyProcessed.vue
new file mode 100644
index 00000000..12fb9817
--- /dev/null
+++ b/supervise-uniapp/pages/index/AlreadyProcessed.vue
@@ -0,0 +1,881 @@
+<template>
+	<view class="page" @touchome.stop.prevent="preventHandler">
+
+		<view class="search">
+
+			<view class="search-input">
+				<image class="search-input-img" src="../../static/baseIcon/search.png" mode="aspectFill"></image>
+				<input class="search-input-text" placeholder="输入已办工作名称" @input="searchInput" :disabled="false" />
+			</view>
+
+			<text class="search-text" @click="drawerClick">筛选</text>
+
+		</view>
+
+		<scroll-view class="scrollviewCss" scroll-y="false" refresher-enabled="true" :refresher-triggered="triggered"
+			:refresher-threshold="45" refresher-background="#f8f8f8" @refresherrefresh="onRefresh"
+			@refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem">
+
+			<view>
+				<view v-for="(item,index) in dataList" class="newslist">
+
+					<view class="item-top">
+
+						<image class="item-top-img" src="../../static/baseIcon/work.png" mode="aspectFill"></image>
+						<view class="item-top-text" v-html="highLight(item.workName)">{{item.workName}}</view>
+						<text class="item-top-text2">{{item.state}}</text>
+					</view>
+
+					<view class="item-con">
+						<view >
+							<text class="item-con-text">发起人：</text>
+							<text class="item-con-text">{{item.name}}</text>
+						</view>
+						<view style="margin-top: 8px;">
+							<text class="item-con-text">发起部门：</text>
+							<text class="item-con-text">{{item.department}}</text>
+						</view>
+						<view  style="margin-top: 8px;">
+							<text class="item-con-text">发起日期：</text>
+							<text class="item-con-text">{{item.startDate}}</text>
+						</view>
+						<view  style="margin-top: 8px;">
+							<text class="item-con-text">当前处理人：</text>
+							<text class="item-con-text">{{item.currentProcessor}}</text>
+						</view>
+						
+
+					</view>
+
+					<view class="item-bom">
+						<view style="flex: 1;"></view>
+						<image class="item-bom-img" src="../../static/baseIcon/submitTime.png" mode="aspectFill">
+						</image>
+						<text class="item-bom-text">{{item.submitDate}}</text>
+					</view>
+
+
+				</view>
+
+				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
+
+			</view>
+			<!-- 加载....没有更多 -->
+			<view style="line-height: 60rpx;margin-bottom: 50rpx;">
+				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+			</view>
+		</scroll-view>
+
+		<uni-drawer ref="drawer" width="320" mode="right">
+
+			<view class="drawerView">
+				<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
+				<view class="drawerView-date">
+					<input class="drawerView-date-text" v-model="search.startDate" placeholder="开始日期" :disabled="true"
+						@click="openDate(1)">
+					<text style="margin-left: 10px;margin-right: 10px;color: #777;">至</text>
+					<input class="drawerView-date-text" v-model="search.endDate" placeholder="结束日期" :disabled="true"
+						@click="openDate(2)">
+				</view>
+
+				<text
+					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text>
+
+				<!-- 		<uni-data-checkbox @change="checkboxChange"  selectedColor="#007AFF" mode="list" :localdata="personnelList" :multiple="false" >
+					
+				</uni-data-checkbox> -->
+
+				<scroll-view scroll-y :show-scrollbar="true"
+					style="display: flex;flex-direction: column; margin-top: 20px;width: 100%; height:50%; overflow:auto;">
+
+					<view class="to_do_content_list" :class="{'to_do_finish':item.checked}"
+						v-for="(item,index) in personnelList" :key="index" @click="select(item.id)">
+						<view class="to_do_content_list_checkbox">
+							<view class="checkbox"></view>
+						</view>
+						<!-- 内容 -->
+						<view class="to_do_content_list_cont">{{item.name}}</view>
+					</view>
+
+
+
+				</scroll-view>
+
+
+
+
+				<view class="drawerView-bom">
+
+					<text class="drawerView-bom-text1" @click="resetClik">重置</text>
+					<text class="drawerView-bom-text2" @click="assignClick">确定</text>
+
+				</view>
+
+				<u-datetime-picker ref="datetimePicker" :closeOnClickOverlay='true' @close="cancelClick"
+					@cancel="cancelClick" @confirm="confirmClick" :show="datetimeShow" v-model="selectDate" mode="date"
+					:formatter="formatter">
+
+				</u-datetime-picker>
+
+			</view>
+
+		</uni-drawer>
+	</view>
+
+
+</template>
+
+<script>
+	import {
+		formatTimeTwo
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				searchText: "",
+				search: {
+					startDate: "",
+					endDate: "",
+					promoter: ""
+				},
+				selectDate: "",
+				datetimeShow: false,
+				datetimeIndex: "1",
+				personnelList: [{
+						id: "1",
+						name: "张安1",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "2",
+						name: "张安2",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "3",
+						name: "张安3",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "4",
+						name: "张安4",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "5",
+						name: "张安5",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "6",
+						name: "张安6",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "7",
+						name: "张安7",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "8",
+						name: "张安8",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "9",
+						name: "张安9",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "10",
+						name: "张安10",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "11",
+						name: "张安11",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "12",
+						name: "张安12",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "13",
+						name: "张安13",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "14",
+						name: "张安14",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "1",
+						name: "张安1",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "15",
+						name: "张安16",
+						department: "研发部",
+						checked: false
+					},
+
+				],
+				triggered: true,
+				status: 'loadmore',
+				iconType: 'flower',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '拉也没用，没有了'
+				},
+				listQuery: {
+					current: 1,
+					size: 10,
+					params: {
+						woekName: "",
+					}
+				},
+				loadingType: 'more', //加载更多状态
+				dataList: [{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+
+				],
+
+			};
+		},
+		// onShow() {
+		// 	this.listQuery.current = 1
+		// 	this.dataList = [];
+		// 	this.loadData();
+		// },
+		// onLoad() {
+
+		// },
+		// onPullDownRefresh() {
+		// 	this.listQuery.current = 1
+		// 	this.loadData('refresh');
+		// 	setTimeout(function() {
+		// 		uni.stopPullDownRefresh();
+		// 	}, 2000);
+		// },
+		// //加载更多
+		// onReachBottom() {
+		// 	this.listQuery.current = this.listQuery.current + 1
+		// 	this.loadData();
+		// },
+		onReady() {
+			/*  #ifdef  MP-WEIXIN */
+			// 微信小程序需要用此写法
+			this.$refs.datetimePicker.setFormatter(this.formatter)
+			/* #endif */
+		},
+		methods: {
+			// 禁止滑动
+			preventHandler() {
+				return
+			},
+			/* 滚动到底部 */
+			scrollBottem() {
+				console.log("滚动高度")
+				this.status = "nomore"
+			},
+			onRefresh() {
+				setTimeout(() => {
+					this.triggered = false;
+				}, 2000)
+				console.log("进入");
+			},
+			/* 下拉被复位 */
+			onRestore() {
+				this.triggered = true; // 需要重置
+				console.log(this.triggered);
+				console.log("停止");
+			},
+			/* 下拉被中止，没下拉完就松手就会触发 */
+			onAbort() {
+				console.log("onAbort");
+			},
+			searchInput(e) {
+				console.log("searchText》》》", e.detail.value);
+				this.searchText = e.detail.value
+			},
+			highLight(value) {
+				console.log("highLight》》》", value);
+				if (value.includes(this.searchText)) {
+					value = value.replace(
+						this.searchText,
+						"<font style='color:red!important'>" + this.searchText + "</font>"
+					)
+					return value
+				} else {
+					return value
+				}
+			},
+			drawerClick() {
+				this.$refs['drawer'].open()
+			},
+			openDate(type) {
+				switch (type) {
+					case 1:
+						this.datetimeIndex = "1"
+						this.datetimeShow = true
+						break;
+					case 2:
+						this.datetimeIndex = "2"
+						this.datetimeShow = true
+						break;
+					default:
+						break;
+				}
+			},
+			formatter(type, value) {
+
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+			cancelClick() {
+				this.datetimeShow = false
+			},
+			confirmClick(date) {
+				console.log('confirmClick', date)
+				console.log('confirmClick', formatTimeTwo(parseInt(date.value), "Y-M-D"))
+
+				switch (this.datetimeIndex) {
+					case "1":
+						this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						break;
+					case "2":
+						this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						break;
+					default:
+						break;
+				}
+				this.datetimeShow = false
+
+			},
+			// 点击item 选中
+			select(id) {
+
+				for (var i = 0; i < this.personnelList.length; i++) {
+					let item = this.personnelList[i]
+
+					if (item.id == id) {
+						item.checked = !item.checked
+					} else {
+						item.checked = false
+					}
+
+				}
+
+				let index = this.personnelList.findIndex((item) => item.id == id)
+				console.log("我被点击了", this.personnelList[index].name);
+
+				this.search.promoter = this.personnelList[index].checked ? this.personnelList[index].name : ""
+				console.log("promoter", this.search.promoter);
+
+				// 	this.personnelList[index].checked = !this.personnelList[index].checked
+			},
+			resetClik() {
+				this.search = {
+					startDate: "",
+					endDate: "",
+					promoter: ""
+				}
+			},
+
+			assignClick() {
+				console.log('confirm', this.search)
+				this.datetimeShow = false
+
+				this.$refs['drawer'].close()
+				
+				uni.showToast({
+					icon: "none",
+					title:  JSON.stringify( this.search),
+					duration: 5000,
+				});
+			},
+
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+
+				var list = []
+
+				this.$api.storeHouseListPage(this.listQuery).then((resp) => {
+					// if (resp.success) {
+					console.log('1111', resp)
+
+					this.listQuery = {
+						current: resp.current,
+						size: 10,
+						params: {
+
+						}
+					}
+					list = resp.records
+
+					console.log("消息列表", list)
+					// this.goodsList = list;
+					// let goodsList = await this.$api.json('goodsList');
+					if (type === 'refresh') {
+						this.dataList = [];
+					}
+
+					this.dataList = this.dataList.concat(list);
+					console.log("消息列表>>>>>", this.dataList.length)
+					//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+					this.loadingType = this.dataList.length > list.total ? 'nomore' : 'more';
+					if (type === 'refresh') {
+						if (loading == 1) {
+							uni.hideLoading();
+						} else {
+							uni.stopPullDownRefresh();
+						}
+					}
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.popup-show {
+		overflow: hidden;
+		position: fixed;
+		height: 100%;
+		width: 100%;
+	}
+
+	.page {
+		width: 100%;
+		height: 100%;
+
+		.drawerView {
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			padding: 15px 20px;
+			background: #fff;
+
+			.drawerView-date {
+				margin-top: 20px;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+
+				.drawerView-date-text {
+					text-align: center;
+					background-color: #F4F5F9;
+					border-radius: 20px;
+					padding: 10px 20px;
+					font-size: 14px;
+				}
+			}
+
+			.to_do_content_list {
+				position: relative;
+				padding: 15px;
+				margin: 15px;
+				border-radius: 5px;
+				background: #eee;
+				color: #666;
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+			}
+
+			// .to_do_content_list::after {
+			// 	position: absolute;
+			// 	content: "";
+			// 	top: 0;
+			// 	bottom: 0;
+			// 	left: 0;
+			// 	width: 10px;
+			// 	background: #2C405A;
+
+			// }
+
+			.to_do_content_list_checkbox {
+				padding-right: 20px;
+				padding-left: 10px;
+			}
+
+			.checkbox {
+				width: 20px;
+				height: 20px;
+				border-radius: 50%;
+				background: #FFFFFF;
+			}
+
+			.to_do_finish .checkbox {
+				position: relative;
+				background: #FFFFFF;
+			}
+
+			.to_do_finish .checkbox:after {
+				position: absolute;
+				content: "";
+				height: 10px;
+				width: 10px;
+				top: 0;
+				right: 0;
+				bottom: 0;
+				left: 0;
+				margin: auto;
+				border-radius: 50%;
+				background: #007AFF;
+			}
+
+			.to_do_finish .to_do_content_list_cont {
+				color: #007AFF;
+			}
+
+			// .to_do_finish.to_do_content_list:before {
+
+			// 	position: absolute;
+			// 	content: "";
+			// 	left: 40px;
+			// 	right: 10px;
+			// 	top: 0;
+			// 	bottom: 0;
+			// 	height: 2px;
+			// 	margin: auto 0;
+			// 	background: #007AFF;
+			// }
+
+			.to_do_finish.to_do_content_list::after {
+				background: #C35CDF;
+			}
+
+
+			.drawerView-bom {
+				width: 85%;
+				position: fixed;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				bottom: 0;
+				min-height: 40px;
+				margin-bottom: 50px;
+				background: #EA4726;
+				border-radius: 20px;
+				padding: 1px;
+
+				.drawerView-bom-text1 {
+					flex: 1;
+					text-align: center;
+					min-height: 38px;
+					line-height: 38px;
+					color: #EA4726;
+					background: #fff;
+					font-size: 14px;
+					border-radius: 20px 0px 20px 20px;
+					// border-top-left-radius: 20px;
+					// border-bottom-left-radius: 20px;
+					// border-bottom-right-radius:20px;
+				}
+
+				.drawerView-bom-text2 {
+					flex: 1;
+					line-height: 38px;
+					color: #fff;
+					font-size: 14px;
+					text-align: center;
+				}
+			}
+
+		}
+
+		.search {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background: #007AFF;
+			width: 100%;
+			padding: 10px;
+
+			.search-input {
+				flex: 1;
+				margin-left: 15px;
+				background: #fff;
+				border-radius: 30px;
+				padding: 5px;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				margin-right: 20px;
+
+				.search-input-img {
+					margin-left: 10px;
+					width: 20px;
+					height: 20px;
+				}
+
+				.search-input-text {
+					margin-left: 10px;
+					font-size: 14px;
+					color: #000;
+				}
+			}
+
+			.search-text {
+				margin-right: 30px;
+				font-size: 15px;
+				color: #fff;
+			}
+		}
+
+		.scrollviewCss {
+			overflow-y: hidden;
+			height: 90vh;
+
+			.newslist {
+				display: flex;
+				flex-direction: column;
+				background: #fff;
+				border-radius: 12px;
+				margin-left: 12px;
+				margin-right: 12px;
+				margin-top: 12px;
+				padding: 15px 20px;
+
+				.item-top {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					padding-bottom: 12px;
+					padding-left: 5px;
+					padding-right: 5px;
+					border-bottom: 1px solid #F1F3F5;
+
+					.item-top-img {
+						width: 18px;
+						height: 18px;
+					}
+
+					.item-top-text {
+						flex: 1;
+						margin-left: 5px;
+						margin-right: 10px;
+						font-size: 16px;
+						color: #101010;
+						font-weight: 600;
+						font-family: sans-serif;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.item-top-text2 {
+						font-size: 14px;
+						color: #0A59F7;
+					}
+				}
+
+				.item-con {
+					margin-top: 12px;
+					display: flex;
+					flex-direction: column;
+
+					.item-con-text {
+						font-size: 15px;
+						color: #666666;
+					}
+				}
+
+				.item-bom {
+					width: 100%;
+					margin-top: 12px;
+					padding-top: 10px;
+					border-top: 1px solid #F1F3F5;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: end;
+
+					.item-bom-img {
+						width: 14px;
+						height: 14px;
+					}
+
+					.item-bom-text {
+						margin-left: 5px;
+						font-size: 14px;
+						color: #999;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/InventorySummary.vue b/supervise-uniapp/pages/index/InventorySummary.vue
new file mode 100644
index 00000000..899cf273
--- /dev/null
+++ b/supervise-uniapp/pages/index/InventorySummary.vue
@@ -0,0 +1,467 @@
+<template>
+	<view class="pages">
+		<uni-card title="36524快消品动产质押项目" :isFull="true" extra="点击下载Excel文件" :thumbnail="avatar"
+			style="padding-top: 10px;">
+			<template v-slot:title>
+				<uni-section :title="info.projectName" title-font-size="25" type="line">
+					<template v-slot:decoration>
+						<uni-icons type="location-filled" size="18" color="green"></uni-icons>
+					</template>
+					<template v-slot:right> <uni-tag :inverted="true" text="下载Excel文件" type="primary"
+							@click="onClick" /> </template>
+				</uni-section>
+			</template>
+
+			<view style="display: flex;flex-direction: column;">
+
+				<view class="item">
+					<text class="text1">仓库数量</text>
+					<text class="text2">{{info.stockNumber}}</text>
+				</view>
+
+				<view class="item">
+					<text class="text1">汇总时间</text>
+					<text class="text2">{{info.reportTime}}</text>
+				</view>
+
+				<view class="item" style="border-bottom: none;">
+					<text class="text1">库存货值</text>
+					<text class="text2">{{info.countAmount}}</text>
+				</view>
+
+
+			</view>
+
+			<!-- <uni-list>
+				<uni-list-item title="上报日期:" :rightText="logInfo.reportTime"></uni-list-item>
+				<uni-list-item title="货值总计:" :right-text="logInfo.countAmount"></uni-list-item>
+			</uni-list> -->
+
+			<!-- 	<view v-for="(item, index) in tableData1" style="margin-top: 10px;">
+				<view>
+					<uni-title type="h3" :title="item.storeType" color="#444"></uni-title>
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-header tleft"><text>仓库数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>品种数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>品种货值</text></view>
+						</uni-col>
+					</uni-row>
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-body tleft"><text>{{item.storeNumber}}</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-body"><text>{{item.productCountNumber}}</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-body"><text>{{item.productAmount}}</text></view>
+						</uni-col>
+					</uni-row>
+
+				</view>
+			</view> -->
+
+		</uni-card>
+
+		<view v-for="(item, index) in list" style="margin-top: 10px;">
+
+			<view class="layout" @click="itemClick(item)">
+
+				<image src="../../static/baseIcon/warehouse.png" mode="aspectFill" style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">{{item.storeName}}</text>
+					<text class="content-text2">{{item.productAmount }}</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+
+
+		</view>
+
+		<!-- 
+		<uni-collapse style="margin-top: 10px;">
+
+			<uni-collapse-item title="仓库库存明细表" style="font-size: 18px;" :open="false">
+
+				<view style="display: flex;flex-direction: row;margin-left: 16px;">
+
+					<view style="flex: 1;">
+						<text>商品数量合计：</text>
+						<text>{{logInfo2.countProductNumber}}</text>
+					</view>
+
+					<view style="flex: 1;">
+						<text>商品货值合计：</text>
+						<text>{{logInfo2.countAmount}}</text>
+					</view>
+
+				</view>
+				<view class="ttbale" style="margin-top: 10px;">
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-header tleft"><text>序号</text></view>
+						</uni-col>
+						<uni-col :span="16">
+							<view class="table-header"><text>仓库名称</text></view>
+						</uni-col>
+					</uni-row>
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-header tleft"><text>商品数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>商品品种数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>货值</text></view>
+						</uni-col>
+					</uni-row>
+				</view>
+
+				<view v-for="(item, index) in tableData2">
+
+					<view class="ttbale">
+						<uni-row>
+							<uni-col :span="8">
+								<view class="table-body tleft"><text>{{index+1}}</text></view>
+							</uni-col>
+							<uni-col :span="16">
+								<view class="table-body"><text>{{item.storeCodeName}}</text></view>
+							</uni-col>
+						</uni-row>
+						<uni-row>
+							<uni-col :span="8">
+								<view class="table-body tleft"><text>{{ item.productCountNumber}}</text></view>
+							</uni-col>
+							<uni-col :span="8">
+								<view class="table-body"><text>{{item.typeNumber}}</text></view>
+							</uni-col>
+							<uni-col :span="8">
+								<view class="table-body"><text>{{item.productAmount}}</text></view>
+							</uni-col>
+						</uni-row>
+					</view>
+				</view>
+
+			</uni-collapse-item>
+
+			<uni-collapse-item title="烟草库存明细表" style="font-size: 18px;" :open="false">
+
+				<view style="display: flex;flex-direction: row;margin-left: 16px;">
+
+					<view style="flex: 1;">
+						<text>商品数量合计：</text>
+						<text>{{logInfo3.countProductNumber}}</text>
+					</view>
+
+					<view style="flex: 1;">
+						<text>商品货值合计：</text>
+						<text>{{logInfo3.countAmount}}</text>
+					</view>
+
+				</view>
+				<view class="ttbale" style="margin-top: 10px;">
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-header tleft"><text>序号</text></view>
+						</uni-col>
+						<uni-col :span="16">
+							<view class="table-header"><text>仓库名称</text></view>
+						</uni-col>
+					</uni-row>
+					<uni-row>
+						<uni-col :span="8">
+							<view class="table-header tleft"><text>商品数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>商品品种数量</text></view>
+						</uni-col>
+						<uni-col :span="8">
+							<view class="table-header"><text>货值</text></view>
+						</uni-col>
+					</uni-row>
+				</view>
+
+				<view v-for="(item, index) in tableData3">
+
+					<view class="ttbale">
+						<uni-row>
+							<uni-col :span="8">
+								<view class="table-body tleft"><text>{{index+1}}</text></view>
+							</uni-col>
+							<uni-col :span="16">
+								<view class="table-body"><text>{{item.storeCodeName}}</text></view>
+							</uni-col>
+						</uni-row>
+						<uni-row>
+							<uni-col :span="8">
+								<view class="table-body tleft"><text>{{ item.productCountNumber}}</text></view>
+							</uni-col>
+							<uni-col :span="8">
+								<view class="table-body"><text>{{item.typeNumber}}</text></view>
+							</uni-col>
+							<uni-col :span="8">
+								<view class="table-body"><text>{{item.productAmount}}</text></view>
+							</uni-col>
+						</uni-row>
+					</view>
+				</view>
+
+
+			</uni-collapse-item>
+
+
+		</uni-collapse> -->
+
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				params: {
+					projectSid: "",
+					orderDate: "",
+				},
+				info: {
+					fullUrl: "",
+					projectName: "",
+					stockNumber: "",
+					reportTime: "",
+					countAmount: "",
+				},
+				list: [
+					// {
+					// 	sid: "",
+					// 	name: "",
+					// 	price: ""
+					// },
+					// {
+					// 	sid: "",
+					// 	name: "",
+					// 	price: ""
+					// },
+				],
+
+			}
+		},
+		onLoad(option) {
+
+			this.params = option
+			
+			this.params = {
+				projectSid: option.projectSid,
+				orderDate: option.orderDate
+			}
+
+			this.getData()
+
+
+
+		},
+		onShow() {
+			wx.hideHomeButton()
+		},
+		methods: {
+			onClick(e) {
+				if (this.info.fullUrl == '') {
+					uni.showToast({
+						icon: "none",
+						title: "下载地址错误，请重新进入页面。",
+						duration: 5000
+					})
+					return
+				}
+
+
+				uni.downloadFile({
+					url: this.info.fullUrl, // 网络文档地址
+					success: (data) => {
+						if (data.statusCode === 200) {
+							uni.saveFile({
+								tempFilePath: data.tempFilePath, //临时路径
+								success: function(res) {
+									// 保存路径
+									uni.showToast({
+										title: "文件已保存：" + res.savedFilePath,
+										duration: 5000
+									})
+									setTimeout(() => {
+										//打开文档查看
+										uni.openDocument({
+											filePath: res.savedFilePath,
+											showMenu: true, //右上角是否有可以转发分享的功能
+											success: function(res) {
+												console.log('打开文档成功')
+											}
+										})
+									}, 3000);
+								}
+							});
+						}
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '失败请重新下载'
+						});
+					},
+				});
+
+			},
+			getData() {
+				console.log('getData', this.params)
+				this.$api.getDayGather(this.params).then((resp) => {
+					console.log('1111>>>>>>', resp)
+
+					this.info = resp
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+				
+				this.$api.getDayStore(this.params).then((resp) => {
+					console.log('1111>>>>>>', resp)
+				
+					this.list = resp
+				
+				
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+			},
+
+			itemClick(item) {
+				console.log('itemClick>>', item)
+				uni.navigateTo({
+					url: 'InventorySummaryDetail?sid=' + item.sid + "&projectName=" + item.storeName +
+						"&stockPrice=" + item.productAmount
+				});
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {}
+
+	$uni-success: #18bc37 !default;
+
+	.item {
+
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-left: 20px;
+		margin-right: 20px;
+		border-bottom: 1px solid #F1F3F5;
+		padding: 10px;
+
+		.text1 {
+			flex: 1;
+			font-size: 14px;
+			color: #191919;
+		}
+
+
+		.text2 {
+			flex: 1;
+			font-size: 14px;
+			color: #717171;
+		}
+
+	}
+
+	.layout {
+		background: #fff;
+		border-radius: 10px;
+		padding: 15px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-bottom: 10px;
+
+		.content {
+			margin-left: 10px;
+			margin-right: 10px;
+			flex: 1;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+
+			.content-text1 {
+				font-size: 14px;
+				color: #191919;
+			}
+
+			.content-text2 {
+				font-size: 14px;
+				color: #6c6c6c;
+			}
+		}
+	}
+
+	.table-header {
+		text-align: center;
+		border: 0.5px solid #ccc;
+		font-weight: bold;
+		font-size: 15px;
+		border-left: 0.0px;
+		padding: 5px;
+	}
+
+	.table-body {
+		text-align: center;
+		border: 0.5px solid #ccc;
+		font-size: 13px;
+		padding: 5px;
+		border-left: 0.0px;
+		border-top: 0.0px;
+	}
+
+	.tleft {
+		border-left: 0.5px solid #ccc;
+	}
+
+	.ttbale {
+		margin: 0px 10px 0px 10px;
+		// border-bottom: 1px solid #ccc;
+	}
+
+	.uni-wrap {
+		flex-direction: column;
+		/* #ifdef H5 */
+		height: calc(100vh - 44px);
+		/* #endif */
+		/* #ifndef H5 */
+		height: 100vh;
+		/* #endif */
+		flex: 1;
+	}
+
+	.mb-10 {
+		margin-bottom: 10px;
+	}
+
+	.decoration {
+		width: 8px;
+		height: 8px;
+		margin-right: 4px;
+		border-radius: 50%;
+		background-color: $uni-success;
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/InventorySummaryDetail.vue b/supervise-uniapp/pages/index/InventorySummaryDetail.vue
new file mode 100644
index 00000000..65813c98
--- /dev/null
+++ b/supervise-uniapp/pages/index/InventorySummaryDetail.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="pages">
+		<uni-card itle="36524快消品动产质押项目" :isFull="true" extra="点击下载Excel文件" :thumbnail="avatar"
+			style="padding-top: 10px;">
+			<template v-slot:title>
+				<uni-section :title="page.projectName" title-font-size="25" type="circle">
+					<template v-slot:decoration>
+						<uni-icons type="location-filled" size="18" color="green"></uni-icons>
+					</template>
+					<!-- 	<template v-slot:right> <uni-tag :inverted="true" text="下载Excel文件" type="primary"
+							@click="onClick" /> </template> -->
+				</uni-section>
+			</template>
+
+			<view style="display: flex;flex-direction: row; justify-content: space-between;margin: 10px;">
+				<text style="color: #494949;font-size: 14px;">货值合计</text>
+				<text
+					style="color: #000000;font-size: 14px;font-weight: 600;font-family: sans-serif;">{{page.stockPrice}}</text>
+			</view>
+
+		</uni-card>
+
+		<view class="list" style="padding-bottom: 10px;">
+
+			<view class="top">
+
+				<text class="item-text" >商品名称</text>
+				<text class="item-text" >数量</text>
+				<text class="item-text" >单价</text>
+				<text class="item-text" >货值</text>
+
+			</view>
+
+			<view v-for="(item, index) in list" style="margin-top: 10px;">
+				<view class="top1" :class="{'top2':index==list.length-1}">
+
+					<text class="item-text" >{{item.productName}}</text>
+					<text class="item-text" >{{item.prodNumber}}</text>
+					<text class="item-text" >{{item.prodPrice}}</text>
+					<text class="item-text">{{item.prodAmount}}</text>
+
+				</view>
+
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				page: {
+					sid: "",
+					projectName: "",
+					stockPrice: "",
+				},
+				list: [
+					// {
+					// 	sid: "1",
+					// 	name: "可口可乐",
+					// 	price: "3.5",
+					// 	value: "100",
+					// 	number: "350"
+					// },
+					// {
+					// 	sid: "2",
+					// 	name: "百事可乐",
+					// 	price: "3.5",
+					// 	value: "100",
+					// 	number: "350"
+					// },
+				],
+
+			}
+		},
+		onLoad(option) {
+			console.log('option>>>>>>', option)
+			this.page = option
+
+			this.getData(this.page.sid)
+
+		},
+		methods: {
+
+			getData(sid) {
+				console.log('itemClick>>', sid)
+
+				this.$api.getDayProduct(sid).then((resp) => {
+					console.log('1111>>>>>>', resp)
+					this.list = resp
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		width: 100%;
+
+		.list {
+			display: flex;
+			flex-direction: column;
+			margin-top: 10px;
+			background: #fff;
+			border-radius: 10px;
+			padding-left: 25px;
+			padding-right: 25px;
+			padding-top: 20px;
+
+			.top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				border-bottom: 3px solid #F1F3F5;
+				padding-left: 10px;
+				padding-right: 10px;
+				padding-bottom: 10px;
+			}
+
+			.top1 {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				border-bottom: 1px solid #F1F3F5;
+				padding-left: 10px;
+				padding-right: 10px;
+				padding-bottom: 10px;
+			}
+
+			.top2 {
+				border-bottom: none;
+			}
+
+			.item-text {
+				flex-shrink: 0;
+				flex: 1;
+				text-align: center;
+				margin-left: 5px;
+				margin-right: 5px;
+				font-size: 14px;
+				color: #BCBCBC;
+			}
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/MyProject.vue b/supervise-uniapp/pages/index/MyProject.vue
index f3779108..e55b3cef 100644
--- a/supervise-uniapp/pages/index/MyProject.vue
+++ b/supervise-uniapp/pages/index/MyProject.vue
@@ -13,7 +13,7 @@
 
 				</view>
 
-				<image src="../../static/user/zy.png" mode="aspectFill" style="width: 15px;height: 15px;"></image>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 15px;height: 15px;"></image>
 
 			</view>
 
diff --git a/supervise-uniapp/pages/index/WaitingProcessed.vue b/supervise-uniapp/pages/index/WaitingProcessed.vue
new file mode 100644
index 00000000..59b44fc6
--- /dev/null
+++ b/supervise-uniapp/pages/index/WaitingProcessed.vue
@@ -0,0 +1,877 @@
+<template>
+	<view class="page" @touchome.stop.prevent="preventHandler">
+
+		<view class="search">
+
+			<view class="search-input">
+				<image class="search-input-img" src="../../static/baseIcon/search.png" mode="aspectFill"></image>
+				<input class="search-input-text" placeholder="输入待办工作名称" @input="searchInput" :disabled="false" />
+			</view>
+
+			<text class="search-text" @click="drawerClick">筛选</text>
+
+		</view>
+
+		<scroll-view class="scrollviewCss" scroll-y="false" refresher-enabled="true" :refresher-triggered="triggered"
+			:refresher-threshold="45" refresher-background="#f8f8f8" @refresherrefresh="onRefresh"
+			@refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem">
+
+			<view>
+				<view v-for="(item,index) in dataList" class="newslist">
+
+					<view class="item-top">
+
+						<image class="item-top-img" src="../../static/baseIcon/work.png" mode="aspectFill"></image>
+						<view class="item-top-text" v-html="highLight(item.workName)">{{item.workName}}</view>
+						<text class="item-top-text2">{{item.state}}</text>
+					</view>
+
+					<view class="item-con">
+						<view >
+							<text class="item-con-text">发起人：</text>
+							<text class="item-con-text">{{item.name}}</text>
+						</view>
+						<view style="margin-top: 8px;">
+							<text class="item-con-text">发起部门：</text>
+							<text class="item-con-text">{{item.department}}</text>
+						</view>
+						<view  style="margin-top: 8px;">
+							<text class="item-con-text">发起日期：</text>
+							<text class="item-con-text">{{item.startDate}}</text>
+						</view>
+
+					</view>
+
+					<view class="item-bom">
+						<view style="flex: 1;"></view>
+						<image class="item-bom-img" src="../../static/baseIcon/submitTime.png" mode="aspectFill">
+						</image>
+						<text class="item-bom-text">{{item.submitDate}}</text>
+					</view>
+
+
+				</view>
+
+				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
+
+			</view>
+			<!-- 加载....没有更多 -->
+			<view style="line-height: 60rpx;margin-bottom: 50rpx;">
+				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+			</view>
+		</scroll-view>
+
+		<uni-drawer ref="drawer" width="320" mode="right">
+
+			<view class="drawerView">
+				<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
+				<view class="drawerView-date">
+					<input class="drawerView-date-text" v-model="search.startDate" placeholder="开始日期" :disabled="true"
+						@click="openDate(1)">
+					<text style="margin-left: 10px;margin-right: 10px;color: #777;">至</text>
+					<input class="drawerView-date-text" v-model="search.endDate" placeholder="结束日期" :disabled="true"
+						@click="openDate(2)">
+				</view>
+
+				<text
+					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text>
+
+				<!-- 		<uni-data-checkbox @change="checkboxChange"  selectedColor="#007AFF" mode="list" :localdata="personnelList" :multiple="false" >
+					
+				</uni-data-checkbox> -->
+
+				<scroll-view scroll-y :show-scrollbar="true"
+					style="display: flex;flex-direction: column; margin-top: 20px;width: 100%; height:50%; overflow:auto;">
+
+					<view class="to_do_content_list" :class="{'to_do_finish':item.checked}"
+						v-for="(item,index) in personnelList" :key="index" @click="select(item.id)">
+						<view class="to_do_content_list_checkbox">
+							<view class="checkbox"></view>
+						</view>
+						<!-- 内容 -->
+						<view class="to_do_content_list_cont">{{item.name}}</view>
+					</view>
+
+
+
+				</scroll-view>
+
+
+
+
+				<view class="drawerView-bom">
+
+					<text class="drawerView-bom-text1" @click="resetClik">重置</text>
+					<text class="drawerView-bom-text2" @click="assignClick">确定</text>
+
+				</view>
+
+				<u-datetime-picker ref="datetimePicker" :closeOnClickOverlay='true' @close="cancelClick"
+					@cancel="cancelClick" @confirm="confirmClick" :show="datetimeShow" v-model="selectDate" mode="date"
+					:formatter="formatter">
+
+				</u-datetime-picker>
+
+			</view>
+
+		</uni-drawer>
+	</view>
+
+
+</template>
+
+<script>
+	import {
+		formatTimeTwo
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				searchText: "",
+				search: {
+					startDate: "",
+					endDate: "",
+					promoter: ""
+				},
+				selectDate: "",
+				datetimeShow: false,
+				datetimeIndex: "1",
+				personnelList: [{
+						id: "1",
+						name: "张安1",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "2",
+						name: "张安2",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "3",
+						name: "张安3",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "4",
+						name: "张安4",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "5",
+						name: "张安5",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "6",
+						name: "张安6",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "7",
+						name: "张安7",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "8",
+						name: "张安8",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "9",
+						name: "张安9",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "10",
+						name: "张安10",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "11",
+						name: "张安11",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "12",
+						name: "张安12",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "13",
+						name: "张安13",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "14",
+						name: "张安14",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "1",
+						name: "张安1",
+						department: "研发部",
+						checked: false
+					},
+					{
+						id: "15",
+						name: "张安16",
+						department: "研发部",
+						checked: false
+					},
+
+				],
+				triggered: true,
+				status: 'loadmore',
+				iconType: 'flower',
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '拉也没用，没有了'
+				},
+				listQuery: {
+					current: 1,
+					size: 10,
+					params: {
+						woekName: "",
+					}
+				},
+				loadingType: 'more', //加载更多状态
+				dataList: [{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+					{
+						workName: "测试XXXX申请",
+						state: "经理审核",
+						name: "张磊",
+						department: "研发部",
+						startDate: "2022-01-23-10:26",
+						currentProcessor:"张衡、吴",
+						submitDate: "2022.01.28  10:28"
+
+					},
+
+				],
+
+			};
+		},
+		// onShow() {
+		// 	this.listQuery.current = 1
+		// 	this.dataList = [];
+		// 	this.loadData();
+		// },
+		// onLoad() {
+
+		// },
+		// onPullDownRefresh() {
+		// 	this.listQuery.current = 1
+		// 	this.loadData('refresh');
+		// 	setTimeout(function() {
+		// 		uni.stopPullDownRefresh();
+		// 	}, 2000);
+		// },
+		// //加载更多
+		// onReachBottom() {
+		// 	this.listQuery.current = this.listQuery.current + 1
+		// 	this.loadData();
+		// },
+		onReady() {
+			/*  #ifdef  MP-WEIXIN */
+			// 微信小程序需要用此写法
+			this.$refs.datetimePicker.setFormatter(this.formatter)
+			/* #endif */
+		},
+		methods: {
+			// 禁止滑动
+			preventHandler() {
+				return
+			},
+			/* 滚动到底部 */
+			scrollBottem() {
+				console.log("滚动高度")
+				this.status = "nomore"
+			},
+			onRefresh() {
+				setTimeout(() => {
+					this.triggered = false;
+				}, 2000)
+				console.log("进入");
+			},
+			/* 下拉被复位 */
+			onRestore() {
+				this.triggered = true; // 需要重置
+				console.log(this.triggered);
+				console.log("停止");
+			},
+			/* 下拉被中止，没下拉完就松手就会触发 */
+			onAbort() {
+				console.log("onAbort");
+			},
+			searchInput(e) {
+				console.log("searchText》》》", e.detail.value);
+				this.searchText = e.detail.value
+			},
+			highLight(value) {
+				console.log("highLight》》》", value);
+				if (value.includes(this.searchText)) {
+					value = value.replace(
+						this.searchText,
+						"<font style='color:red!important'>" + this.searchText + "</font>"
+					)
+					return value
+				} else {
+					return value
+				}
+			},
+			drawerClick() {
+				this.$refs['drawer'].open()
+			},
+			openDate(type) {
+				switch (type) {
+					case 1:
+						this.datetimeIndex = "1"
+						this.datetimeShow = true
+						break;
+					case 2:
+						this.datetimeIndex = "2"
+						this.datetimeShow = true
+						break;
+					default:
+						break;
+				}
+			},
+			formatter(type, value) {
+
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+			cancelClick() {
+				this.datetimeShow = false
+			},
+			confirmClick(date) {
+				console.log('confirmClick', date)
+				console.log('confirmClick', formatTimeTwo(parseInt(date.value), "Y-M-D"))
+
+				switch (this.datetimeIndex) {
+					case "1":
+						this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						break;
+					case "2":
+						this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						break;
+					default:
+						break;
+				}
+				this.datetimeShow = false
+
+			},
+			// 点击item 选中
+			select(id) {
+
+				for (var i = 0; i < this.personnelList.length; i++) {
+					let item = this.personnelList[i]
+
+					if (item.id == id) {
+						item.checked = !item.checked
+					} else {
+						item.checked = false
+					}
+
+				}
+
+				let index = this.personnelList.findIndex((item) => item.id == id)
+				console.log("我被点击了", this.personnelList[index].name);
+
+				this.search.promoter = this.personnelList[index].checked ? this.personnelList[index].name : ""
+				console.log("promoter", this.search.promoter);
+
+				// 	this.personnelList[index].checked = !this.personnelList[index].checked
+			},
+			resetClik() {
+				this.search = {
+					startDate: "",
+					endDate: "",
+					promoter: ""
+				}
+			},
+
+			assignClick() {
+				console.log('confirm', this.search)
+				this.datetimeShow = false
+
+				this.$refs['drawer'].close()
+				
+				uni.showToast({
+					icon: "none",
+					title:  JSON.stringify( this.search),
+					duration: 5000,
+				});
+			},
+
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+
+				var list = []
+
+				this.$api.storeHouseListPage(this.listQuery).then((resp) => {
+					// if (resp.success) {
+					console.log('1111', resp)
+
+					this.listQuery = {
+						current: resp.current,
+						size: 10,
+						params: {
+
+						}
+					}
+					list = resp.records
+
+					console.log("消息列表", list)
+					// this.goodsList = list;
+					// let goodsList = await this.$api.json('goodsList');
+					if (type === 'refresh') {
+						this.dataList = [];
+					}
+
+					this.dataList = this.dataList.concat(list);
+					console.log("消息列表>>>>>", this.dataList.length)
+					//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+					this.loadingType = this.dataList.length > list.total ? 'nomore' : 'more';
+					if (type === 'refresh') {
+						if (loading == 1) {
+							uni.hideLoading();
+						} else {
+							uni.stopPullDownRefresh();
+						}
+					}
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.popup-show {
+		overflow: hidden;
+		position: fixed;
+		height: 100%;
+		width: 100%;
+	}
+
+	.page {
+		width: 100%;
+		height: 100%;
+
+		.drawerView {
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			padding: 15px 20px;
+			background: #fff;
+
+			.drawerView-date {
+				margin-top: 20px;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+
+				.drawerView-date-text {
+					text-align: center;
+					background-color: #F4F5F9;
+					border-radius: 20px;
+					padding: 10px 20px;
+					font-size: 14px;
+				}
+			}
+
+			.to_do_content_list {
+				position: relative;
+				padding: 15px;
+				margin: 15px;
+				border-radius: 5px;
+				background: #eee;
+				color: #666;
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+			}
+
+			// .to_do_content_list::after {
+			// 	position: absolute;
+			// 	content: "";
+			// 	top: 0;
+			// 	bottom: 0;
+			// 	left: 0;
+			// 	width: 10px;
+			// 	background: #2C405A;
+
+			// }
+
+			.to_do_content_list_checkbox {
+				padding-right: 20px;
+				padding-left: 10px;
+			}
+
+			.checkbox {
+				width: 20px;
+				height: 20px;
+				border-radius: 50%;
+				background: #FFFFFF;
+			}
+
+			.to_do_finish .checkbox {
+				position: relative;
+				background: #FFFFFF;
+			}
+
+			.to_do_finish .checkbox:after {
+				position: absolute;
+				content: "";
+				height: 10px;
+				width: 10px;
+				top: 0;
+				right: 0;
+				bottom: 0;
+				left: 0;
+				margin: auto;
+				border-radius: 50%;
+				background: #007AFF;
+			}
+
+			.to_do_finish .to_do_content_list_cont {
+				color: #007AFF;
+			}
+
+			// .to_do_finish.to_do_content_list:before {
+
+			// 	position: absolute;
+			// 	content: "";
+			// 	left: 40px;
+			// 	right: 10px;
+			// 	top: 0;
+			// 	bottom: 0;
+			// 	height: 2px;
+			// 	margin: auto 0;
+			// 	background: #007AFF;
+			// }
+
+			.to_do_finish.to_do_content_list::after {
+				background: #C35CDF;
+			}
+
+
+			.drawerView-bom {
+				width: 85%;
+				position: fixed;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				bottom: 0;
+				min-height: 40px;
+				margin-bottom: 50px;
+				background: #EA4726;
+				border-radius: 20px;
+				padding: 1px;
+
+				.drawerView-bom-text1 {
+					flex: 1;
+					text-align: center;
+					min-height: 38px;
+					line-height: 38px;
+					color: #EA4726;
+					background: #fff;
+					font-size: 14px;
+					border-radius: 20px 0px 20px 20px;
+					// border-top-left-radius: 20px;
+					// border-bottom-left-radius: 20px;
+					// border-bottom-right-radius:20px;
+				}
+
+				.drawerView-bom-text2 {
+					flex: 1;
+					line-height: 38px;
+					color: #fff;
+					font-size: 14px;
+					text-align: center;
+				}
+			}
+
+		}
+
+		.search {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background: #007AFF;
+			width: 100%;
+			padding: 10px;
+
+			.search-input {
+				flex: 1;
+				margin-left: 15px;
+				background: #fff;
+				border-radius: 30px;
+				padding: 5px;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				margin-right: 20px;
+
+				.search-input-img {
+					margin-left: 10px;
+					width: 20px;
+					height: 20px;
+				}
+
+				.search-input-text {
+					margin-left: 10px;
+					font-size: 14px;
+					color: #000;
+				}
+			}
+
+			.search-text {
+				margin-right: 30px;
+				font-size: 15px;
+				color: #fff;
+			}
+		}
+
+		.scrollviewCss {
+			overflow-y: hidden;
+			height: 90vh;
+
+			.newslist {
+				display: flex;
+				flex-direction: column;
+				background: #fff;
+				border-radius: 12px;
+				margin-left: 12px;
+				margin-right: 12px;
+				margin-top: 12px;
+				padding: 15px 20px;
+
+				.item-top {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					padding-bottom: 12px;
+					padding-left: 5px;
+					padding-right: 5px;
+					border-bottom: 1px solid #F1F3F5;
+
+					.item-top-img {
+						width: 18px;
+						height: 18px;
+					}
+
+					.item-top-text {
+						flex: 1;
+						margin-left: 5px;
+						margin-right: 10px;
+						font-size: 16px;
+						color: #101010;
+						font-weight: 600;
+						font-family: sans-serif;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					
+					}
+
+					.item-top-text2 {
+						font-size: 14px;
+						color: #0A59F7;
+					}
+				}
+
+				.item-con {
+					margin-top: 12px;
+					display: flex;
+					flex-direction: column;
+
+					.item-con-text {
+						font-size: 15px;
+						color: #666666;
+					}
+				}
+
+				.item-bom {
+					width: 100%;
+					margin-top: 12px;
+					padding-top: 10px;
+					border-top: 1px solid #F1F3F5;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: end;
+
+					.item-bom-img {
+						width: 14px;
+						height: 14px;
+					}
+
+					.item-bom-text {
+						margin-left: 5px;
+						font-size: 14px;
+						color: #999;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/WarehouseManagement.vue b/supervise-uniapp/pages/index/WarehouseManagement.vue
index c4930c56..58e561da 100644
--- a/supervise-uniapp/pages/index/WarehouseManagement.vue
+++ b/supervise-uniapp/pages/index/WarehouseManagement.vue
@@ -5,13 +5,13 @@
 
 			<view class="item" style="margin-right: 10px;" @click="onClick('1')">
 
-				<image class="item_img"  src="../../static/newApp/yclb.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/yclb.png" mode="aspectFit"></image>
 				<text class="item_text">云仓列表</text>
 			</view>
 
 			<view class="item"  style="margin-left: 10px;"  @click="onClick('2')">
 
-				<image class="item_img" src="../../static/newApp/jczl.png" mode="aspectFit"></image>
+				<image class="item_img" src="https://jianguan.yyundong.com/img/newApp/jczl.png" mode="aspectFit"></image>
 				<text class="item_text">基础资料</text>
 			</view>
 
@@ -22,13 +22,13 @@
 		
 			<view class="item" style="margin-right: 10px;"  @click="onClick('3')">
 		
-				<image class="item_img"  src="../../static/newApp/rkgl.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/rkgl.png" mode="aspectFit"></image>
 				<text class="item_text">入库管理</text>
 			</view>
 		
 			<view class="item"  style="margin-left: 10px;" @click="onClick('4')">
 		
-				<image class="item_img" src="../../static/newApp/ckgl.png" mode="aspectFit"></image>
+				<image class="item_img" src="https://jianguan.yyundong.com/img/newApp/ckgl.png" mode="aspectFit"></image>
 				<text class="item_text">出库管理</text>
 			</view>
 		
@@ -39,7 +39,7 @@
 		
 			<view class="item" style="margin-right: 10px;"  @click="onClick('5')">
 		
-				<image class="item_img"  src="../../static/newApp/ckdj.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/ckdj.png" mode="aspectFit"></image>
 				<text class="item_text">仓库登记</text>
 			</view>
 		
diff --git a/supervise-uniapp/pages/index/auditReport.vue b/supervise-uniapp/pages/index/auditReport.vue
index 6acf7448..c72b018d 100644
--- a/supervise-uniapp/pages/index/auditReport.vue
+++ b/supervise-uniapp/pages/index/auditReport.vue
@@ -121,8 +121,10 @@ background: #0498FD;" @click="download">
 		data() {
 			return {
 				queryParams: {
-					dataDate: "2023-06-14",
-					companyName: "河北源蜂惠民科技集团有限公司"
+					// dataDate: "2023-06-25",
+					// companyName: "河北源蜂惠民科技集团有限公司",
+					dataDate: "",
+					companyName: ""
 				},
 				loading1: false,
 				loading2: false,
@@ -165,10 +167,10 @@ background: #0498FD;" @click="download">
 		},
 		onLoad(option) {
 
-			// this.queryParams = {
-			// 	dataDate: option.dataDate,
-			// 	companyName: option.companyName
-			// }
+			this.queryParams = {
+				dataDate: option.dataDate,
+				companyName: option.companyName
+			}
 
 			console.log('1111', this.queryParams)
 			this.getData()
diff --git a/supervise-uniapp/pages/index/demoReportKc.vue b/supervise-uniapp/pages/index/demoReportKc.vue
index 5ce347ae..6311a034 100644
--- a/supervise-uniapp/pages/index/demoReportKc.vue
+++ b/supervise-uniapp/pages/index/demoReportKc.vue
@@ -64,7 +64,7 @@
 
 		<uni-collapse style="margin-top: 10px;">
 
-			<uni-collapse-item title="仓库库存明细表" style="font-size: 18px;" :open="true">
+			<uni-collapse-item title="仓库库存明细表" style="font-size: 18px;" :open="false">
 
 				<view style="display: flex;flex-direction: row;margin-left: 16px;">
 
@@ -128,7 +128,7 @@
 
 			</uni-collapse-item>
 
-			<uni-collapse-item title="烟草库存明细表" style="font-size: 18px;" :open="true">
+			<uni-collapse-item title="烟草库存明细表" style="font-size: 18px;" :open="false">
 
 				<view style="display: flex;flex-direction: row;margin-left: 16px;">
 
@@ -221,7 +221,7 @@
 					countProductNumber: "",
 					countAmount: "",
 				},
-
+				fileUrl: "",
 
 			}
 		},
@@ -229,19 +229,59 @@
 
 			// this.date = option.orderDate
 
-			// console.log('1111', this.queryParams)
 			this.getData()
 
 
 
+		},
+		onShow() {
+			wx.hideHomeButton()
 		},
 		methods: {
 			onClick(e) {
-				uni.showToast({
-					title: '点击下载文件',
-					duration: 2000
+				if (this.fileUrl == '') {
+					uni.showToast({
+						icon:"none",
+						title: "下载地址错误，请重新进入页面。",
+						duration: 5000
+					})
+					return
+				}
+
+
+				uni.downloadFile({
+					url: this.fileUrl, // 网络文档地址
+					success: (data) => {
+						if (data.statusCode === 200) {
+							uni.saveFile({
+								tempFilePath: data.tempFilePath, //临时路径
+								success: function(res) {
+									// 保存路径
+									uni.showToast({
+										title: "文件已保存：" + res.savedFilePath,
+										duration: 5000
+									})
+									setTimeout(() => {
+										//打开文档查看
+										uni.openDocument({
+											filePath: res.savedFilePath,
+											showMenu: true, //右上角是否有可以转发分享的功能
+											success: function(res) {
+												console.log('打开文档成功')
+											}
+										})
+									}, 3000);
+								}
+							});
+						}
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '失败请重新下载'
+						});
+					},
 				});
-				console.log(e)
+
 			},
 			actionsClick(text) {
 				uni.showToast({
diff --git a/supervise-uniapp/static/baseIcon/search.png b/supervise-uniapp/static/baseIcon/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..681de9ad4c37929b7bd72a8b8a3bd384b4893fd0
GIT binary patch
literal 1404
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bYNg$><{n>aRqYIU;xez4Go2eB_t#O
z84V2$FeL~&6$XGpKqipP$jC@fPlu=gGT>~WY;JBYkW5KQ0h$a^3?Z|#v*9LYW@aWQ
zCnqH(K{NtMpn9Mz$e{Fepy6=yfn10#paP&dKwUsGF)=YKD+^*Q(AhxKfNY=^xO;#M
zpa@Ve#8|jEkP8G5jX)9zfLx#~ge)v9glGgh3?d8U0xbfX1N0QoY9Is11u`J&fn1=~
zKs7)H8~{atY@l`^>EPfH9UTo(02G0^v!tX1qQ)qm=`t`HT1$fbf*Jn*_{aF3mHEk4
zj)%-YZ@kd>{h>B^-{)n!r8jJO?G}6NR0+F*CfgS|m$kyVj<*Gcczd>|h|j8N(h+-R
zv*ha^$BPOPqCC^v1<a=^a24z|pFcn9u=l0jmSj)<IY%wB;&eF|os_y}RWIkq=b<X0
zVmvX(c*VVp%}z=?5|**>iRg#fF634Z(Yt5;iGhJx+|$J|q+-t7u<+<d0RpK^jV=@V
zN(5M0xSKdSn5J!AzxVsSYjM{%?fvs%?t&kRJ3T)n?my3dUU=r=lRnSRosqq1eUB+i
z>D%phB_W@)7QT9MKs=i3{@s+epwG=;*H8R5Pkq~!sUJ8j&qh7VI?ZSPWC^eTDfIx~
zlh-zF`F2|CPqm)+c7NX`X|l#v%Bt?p;pf}7Y}?jay!33(pO9zsMb~mK3zU6s8>YV0
zcEz#(E6t_t#iX}i&v9!w)oxa}_9vI~8nb#0!_|J1^uFYZezjfkbj$tFnq`NkyWX!B
zJ#?#9|Co)i>g0BlN#9$(+bwz~l)261N&1ef3~!U2ayZVfc)d9xrqP1=LC1uXaq7>0
zz881gxaMaM(_@vH*2nvAiSS4*d~t(uXX*@>Od+-lW?dPAYFrY=oiDyQy}RCh>%rmm
z&0d$2pYCn>&9!Ouqo|ohk_tKM0(M+6P3(aV_Vb>y-j5MJ96V)?)LaHVr#K~VhTx#6
zn}!XEv+}pKGpeZ^HCm(0zuzVQJwwo?B(a2+`S0FIH$-L{Ui)rpZ~T%+Y~2#G2Hoti
z4`(hazH!^PlclO*!R-8NOP(y4EHiO3gAe;bJOAcFM=u+`2UmsPH0uPYalTCwo|kUi
zxMF)lO-Xc&%%X*>8fVO~<SNN-GVVIuV9Fl#X~oK;Gji0GqL#KZI^S0}n#p3I=Gyjp
zqA%Z@T?{vGwc0)wzVc7*&_&;WNqn{<4&MSg-nyG9%iM6|(NDc4t56s(Y;k3~$MFz{
zyUhDyW%HjMU3Mk<<EgY|uFG9#i`E*aFBP?TAbE8AE2*lZTV7Q6@9rx1`L}3UZ`&H4
zvdQ0$FY=N1?_R0>?zZL5yq)_$OUN_VSN+;j!spwUucgzvpf}{!`G8)_o;z}lE0V7I
z@8`*3p8mW-V8K!STRSFtatGgN{bZ2!``YKOExhyR2yq|Ua8o2L_UBZM6F#b8*4(Bm
zpPPxDUb!P`*_L<{ziPL2XW#MtbqJhOx5w+?ZtaE776fH^?f1W!c5v^ys---poXg{U
z9{pHtc1r2Zqit86_AEVp@YIgW%7x<H3+m#RyuSbO{s;bxx1;=yKGUcM=2-?$S3j3^
HP6<r_XE<!4

literal 0
HcmV?d00001

diff --git a/supervise-uniapp/static/baseIcon/submitTime.png b/supervise-uniapp/static/baseIcon/submitTime.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b9f89fc71ff3e2cc4c613820140e3fa27268500
GIT binary patch
literal 1693
zcmZ8h4K$N`7@sue>qb7Ch$5tQrIC_+<YV$poWgL+SJZUf`F67_ABBk7%*<wp*~~{#
zX-N*&ErrrqA^IRCv8%+zviq<1oSn{n&Uv5r_xnA+=lMVHd*1V2^7eF5l1IwJU@#?D
zjH55OqrP7V>F-MKW)=*#VWYSEF(*LFe*~3Eg}~3WtE=m0QG$W_e}1UMX0yx6$|N=k
zpin3POIip70-&X(r67Y+NlA&s36*|~r-G7LEC!{@%1TKu)B-Y4z;Pf~R8&Cikmu)2
zr_&)nBmxY~wY9Z?lF4L1!M0EdoF(x90AXltkU;=Hqyr3fK@?<Y0Z3#rnLuGM7(fI-
zayr1EvAVh%*z)u9Ast|7C1?}SE1`vjg<t}WMuUa}okSvmAy9l@=tqDm(7_xK;C%uO
z><OM4P_P4$NCX)S0Rb9;85kf1P)G#t(2x=(1HOYsysxJpO#HXcXWf4ZB+*9W#f6T!
z^|i^ACDhE9sSnZ`^u}2(ytpB>Yb<TUL)Gc)vT<83z>`cJ&q~!R;qUGkdA#3NW~XNS
zlcG0ufft{tt1Xzxx48boRB1p7!*>a8Jo0p{u${QovoFlr-K?z)?XJ&v=}>La-_v{g
zz~XD7f}R33{h;&Ks0i&%#|q?57+87x>kxa+_&J?QRU`zMVvKYgl#z%dn<GNdT9(JH
zFUzSr=ADMYq-m~>_Q#TGmq|&XNDt-vNs9E2b1o^mwXz!!#_}64Vutk|>-N|1CoIUU
z){2R=I4@!6od;1x@!8fy(fUZ`h%hQC3OB8BsV((+#6;r=nm6B+rwLD8Opf83@2){)
zR)zPF%Ny<&6^8%$7mFSsWu(q+PU!Q*w051h;TV}Y7=9|hS8m4-iS5>y8NpL}&$V=3
zfRT11DK9qRZVK9QvWz7s@`6t<i@VZx#fGOMkRE!I?L;h2Kw66f5wWgAfkuP!ukWVn
zL~kx$$+@PgJ>AKZt>OqLC$+T#mJUbnqGIEGZw{!x_izg^<QsMLFDjl)Zpm)foSk_I
z7sQ-+kU20KZ0=!+%Bk<DDfGAN+dJUiWNaU68ads|v)X#RqtXc-)2eGH!s-iK4_I{Y
zdW*O;XSZg|*WiM3i@VDNL6E#R6?f|tY;etaS}<9=>(F4R>Tq;)o`EVi`DtD5Jp4C$
zA3Akfsz>Kg;puw=S7(h^wf9Byl|K%$!-VTDGizy8PrK~&6}INQ+;(-GdBpp$iwcsQ
zmSyUTMjn(qXp5}U`(r`%!`S(u#p)2HWL__Rwf#;Nrw^Y{M_}0xay!>DKca>nekH=+
zo&Qx0GrlEfJ>~b%e{}NE^;~^jZ0X(`f^>Gch-fV;AkAI6XgS|jG?roVrcAJ%aeZ~N
zD}K~!(U(IusWZ%wfv@0Tt-*wMrW)UZWz|t}IJ$GZ9X4|3{M@XD7w-<L>BOr8@yqq?
zW+H7}ZDBbnP|RS>*po2@Ell}@)h+NGJypM^il&n>%MY`%-HR~7^(n(EI?11ICi(5z
zHmvz!)WBnBqJePTQt7Cz^e}tDoyCy5VQ%5ZeqLdixcui;nfFPE@n;;nn#PQLtnG@D
zIqdDL&)a*bm<u@NT>N09Wzg4}voHKpf^80mS&FeC;RvjjUKl#dsQ%=GsZrDV9bSIr
z#o^c7@I=mBpxGhOwP=6SytYS%q++)QEAOB){ppmYl;PUjZ<W^c+3Gnaxjn^sN1t@F
zeSEQL>k0xNuD3SL^S$Eu9Lg&Z`zk>i5r*f*xOYceruz+j!-cw4IY?*0_#Q^hk!p=o
z!Af=c9OC}O1zv<!>|{58K$Aopco%zb{I*J~Q~Rwa_=Q{>(b2VuSnC0k(hP^DPbr@_
zO`j7SUZ~N#@<qp-uC_8p5vehmsF8l#(g{Y%R5K^}b^=OB(`Ajwrw7p=i=~1**k1P$
SWNYw$fw?+)IyO0kW&Q`h<zwpr

literal 0
HcmV?d00001

diff --git a/supervise-uniapp/static/baseIcon/warehouse.png b/supervise-uniapp/static/baseIcon/warehouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..216d79bfebf7c6cce541d2de3bcfb4404c6b3691
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZECYN(Twl(00y1CCae6-6;rVQ*
z*K@63%yoJ>$NA+v=a+LGUjf-*^2H)IpvqVC9AC_FelZUy==7NDN+eLHa7mC~@PCF-
zhX&qd0monUZ=cV-et*Q7_wp6@V}Q~VJzX3_D&{=Byq)iW0*`B8`<J+X|C5<p8gjdi
z^X!y<(ecpJ;b`{t7g|oQq^7oryx5U+VwOkX6P|FE%EKaVCjwdp3|&}{@Px^^vaJ+X
z^$Flp?G5KYH6uK7im9Juh(Z6Q6&Y)oPD-#Yy2w=~IoHTA*GTfg3{~T=WoLvwcGtJh
ric(kl_sKtCy1Vy}pftzuM-g`qhB7Pc3EC9`bR2`HtDnm{r-UW|H(Grd

literal 0
HcmV?d00001

diff --git a/supervise-uniapp/static/baseIcon/work.png b/supervise-uniapp/static/baseIcon/work.png
new file mode 100644
index 0000000000000000000000000000000000000000..f745c3277783c29d92ae0501f97dc3ffe44d2596
GIT binary patch
literal 1927
zcmaJ?Yg7_x7^XU5UNAG=Y}a)sOjDC#0535@NuY@ZnVQmFgds>_2*w24ZOgJuD=VvG
zl2(?QwwmOoT`a@atTemrdhDj?Zg<Vn?7G<wm9;<CojEh#_kQPnp7-|5nT-*`86=x;
zZ3qMci66#`#Mc1JGm416H-#*_i!bA`5D^xI%CKay1|e{yXgmV&mExsHBqEmTmtRC!
z1i}bUMYISL31-0(R0)bLKA=vi#?b@<Yno0imLwn;5RWWXsMzG5Q?+D3A!U<e{RNOf
z%|+yjuoMjvl_HFmq$Eg~Qu4H^080ns1WE)G13G1*N(<}Q<d3{CzPB7x$-qY!EP+k_
zl$1yi0dP?b0x&^{B7q<X2xNk^K$?UeC=<u~0(6K@r$SSxv;Yd74m12=KN|4)BI5xy
zQW+e{3;i4px7cJkhN)pHH90vMOlE+nW+|1%WHPA`ol2)ua1V-BufoJSic0G~$iPFi
z5{*KQDNq$)VHC%sNf?`qC;O=irTPo4O8dD}c+aRhv6@N)Axl+*jsn5|yDF7mytP;)
z@-^T8B-Tdj)d)2b(V|Hj2|hcSyCsww=4uczhH9cwG;y$z5ponmwQ^Jq(EUIN@QPKa
zq-e6%`y)UgfcYvdCRRxhK95btDL{on3PXWB$e+s#VL)_<MhgjH;s!UAL*vjGety##
z+(9f4l_V(<6*h>Ke#M3kiM7Z<sm3Go5RGC5A`R7`O5kJ7uwv+3xI^-N#!83Ig*POY
ziYG(0O!i-s9z4S3W7&R@E^d4gKcd1Fufe6Aq{2M#FXk1W$BEY6>dNKIqc|=NOKym6
z=c=AkK<6hdF;{(jTAa&(jMVv@-wjqK1CXkFL4M4?Q||mY1T6r(I>C&B9T~Sq9*dEe
zRmm6JKDhD2kv9$NpKTAEkS+6hW1bPF)1w2Z><l8KYhLv)s1TT44iViNUHjGwBdnU&
z*gK^6Z)khl)iFD;briT}H_%9LTo~s##V+Hl_cMNfR)e>Xp<TexztQjeCb}Xoysnhg
z<sCGcV9VM6_;&i9D3Y1-P`E$c&fau7pz}^?9a+FzG_uUwX_xgS<+>A{<7>CI2<G%e
zv5sgQ`{56Tg=v=Cqy61)-z_=6=6P=K*<oe|M+COo*voY*f{qVw%K>Jk9NyIFcub}~
zcW{4BiFb8V_<h&eL8EUuWS%CHt_;|%GLUCo>OPeiUC?4RHHX|}J3kB#E>0_Ky*o3{
zk8`ea!$THP;NWR2zHU>VJ#ks&)wW8f*t}5p!ct>uV;oG+s`9EE-sEm@U-iM1-vTE7
z+H~dK#<gQ=e;&C=GB4+ah^otdnPL4hM`uhh7Zx=gxaK6DS`^jpN2)ftv{gGL5-XX$
z$mzZb--iWPR}kvoY@d=*w7T2u;3dBEg2AdGjx*U7zh0W#ccD7<)U+98=5Y1#(OyJG
z>wSjshRN>%ZCqE?80Vv`^Vj_23Yy)rDSJF>j2TJwbM8wcTIX*V2fmZeHBWtDsPfPH
z!@RDuzb81m0MaX>OnzwzGxN$bV@2}HePPev)=bHtFf+xi{!xd~HGm+<m2iEfb8QzN
zX?E*l6dgKm>{-6U<30B1XWs|iq7yyTygH%_7xY@(Zn9hK|GHW$jDc(JWYxqNAiW`r
zPyc1-%@F-2#r1Q+?-Ad6T1l-6-r-s8ov8M;9&6QWv*+H{O4}cj{&v+OGbgR=K6%-d
zManPH%^sUZq8*S|?QRzc+pb27x5r!@wsU99vmaxnvZI-9H=bi#yl?(Q>#IfLhD8;H
z8>*ffQyaEOJ?6h0ov%I9zuVJyFCQhP?KHY&wv^91m}MKZ*^ZqoN+-r!8?08yOSf}r
z4Pe-8VvuQ7#U6cO>Aj<QktE-deH=DpAUG_CI^AqDaPcrlWSdzRVAyt)<T@;KtP2x-
z8An-Jo6W^uuXpTzu<mZn>W6p(S2T8bbd}f$Zg6g$$}efTxHW!W(%bPKfM;W==>8Ly
z(5v`fOWNp-eO<=6*fDUkc;BS($A2OVdlgvR+74RtWyjzxMXC<o3n>3#h5Y9G5$eq6
za(J>faCv>YaiHRg!{P+#=HA}g)fdh+m)M-oJWEWer#GLTZhy_y(AHHMTDAA&@xOrP
kPHWx7+BEy156*FfGrRBB=O3QD%kpdFhX{G))8kVA0pzv~Y5)KL

literal 0
HcmV?d00001

diff --git a/supervise-uniapp/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/supervise-uniapp/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
index d62a6a71..806235e1 100644
--- a/supervise-uniapp/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
+++ b/supervise-uniapp/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -287,8 +287,8 @@
 				line-height: 48px;
 				background-color: #fff;
 				color: #303133;
-				font-size: 13px;
-				font-weight: 500;
+				font-size: 18px;
+				font-weight: 600;
 				/* #ifdef H5 */
 				cursor: pointer;
 				outline: none;
diff --git a/supervise-uniapp/utils/index.js b/supervise-uniapp/utils/index.js
new file mode 100644
index 00000000..e2a6bd72
--- /dev/null
+++ b/supervise-uniapp/utils/index.js
@@ -0,0 +1,47 @@
+function formatTime(date) {
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1
+    var day = date.getDate()
+
+    var hour = date.getHours()
+    var minute = date.getMinutes()
+    var second = date.getSeconds()
+
+
+    return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+function formatNumber(n) {
+    n = n.toString()
+    return n[1] ? n : '0' + n
+}
+
+/** 
+ * 时间戳转化为年 月 日 时 分 秒 
+ * number: 传入时间戳 
+ * format：返回格式，支持自定义，但参数必须与formateArr里保持一致 
+*/
+function formatTimeTwo(number, format) {
+
+    var formateArr = ['Y', 'M', 'D', 'h', 'm', 's'];
+    var returnArr = [];
+
+    var date = new Date(number);
+    returnArr.push(date.getFullYear());
+    returnArr.push(formatNumber(date.getMonth() + 1));
+    returnArr.push(formatNumber(date.getDate()));
+
+    returnArr.push(formatNumber(date.getHours()));
+    returnArr.push(formatNumber(date.getMinutes()));
+    returnArr.push(formatNumber(date.getSeconds()));
+
+    for (var i in returnArr) {
+        format = format.replace(formateArr[i], returnArr[i]);
+    }
+    return format;
+}
+
+module.exports = {
+    formatTime: formatTime,
+    formatTimeTwo: formatTimeTwo  
+}
\ No newline at end of file