hwq 1 éve
szülő
commit
46efdf53c7

+ 2 - 2
manifest.json

@@ -3,7 +3,7 @@
 	"appid": "__UNI__C4D20F6",
 	"description": "",
 	"versionName": "1.0.0",
-	"versionCode": 122,
+	"versionCode": 100,
 	"transformPx": false,
 	"app-plus": {
 		/* 5+App特有相关 */
@@ -144,7 +144,7 @@
 		"requiredBackgroundModes": ["location"]
 	},
 	"h5": {
-		"title": "绿津",
+		"title": "鞋众网",
 		"domain": "",
 		"router": {
 			"base": "/index/",

+ 130 - 4
pages.json

@@ -24,6 +24,12 @@
 				"navigationBarTitleText": "我的订单"
 			}
 		},
+		{
+			"path": "pages/user/sfjl",
+			"style": {
+				"navigationBarTitleText": "奖罚记录"
+			}
+		},
 		{
 			"path": "pages/user/myorderDetail",
 			"style": {
@@ -43,11 +49,65 @@
 			}
 		},
 		{
-			"path": "pages/order/foreignOrder",
+			"path": "pages/foreign/foreignOrder",
 			"style": {
 				"navigationBarTitleText": "外发检验订单"
 			}
 		},
+		{
+			"path": "pages/foreign/rejectDetail",
+			"style": {
+				"navigationBarTitleText": "外发不合格处理"
+			}
+		},
+		{
+			"path": "pages/foreign/checkout",
+			"style": {
+				"navigationBarTitleText": "检验记录"
+			}
+		},
+		{
+			"path": "pages/foreign/orderDetail",
+			"style": {
+				"navigationBarTitleText": "外派订单详情"
+			}
+		},
+		{
+			"path": "pages/foreign/forOrder",
+			"style": {
+				"navigationBarTitleText": "外发不合格处理"
+			}
+		},
+		{
+			"path": "pages/foreign/administration",
+			"style": {
+				"navigationBarTitleText": "外发订单管理"
+			}
+		},
+		{
+			"path": "pages/inform/wp",
+			"style": {
+				"navigationBarTitleText": "外发不合格通知"
+			}
+		},
+		{
+			"path": "pages/inform/dd",
+			"style": {
+				"navigationBarTitleText": "订单状态预警"
+			}
+		},
+		{
+			"path": "pages/inform/cl",
+			"style": {
+				"navigationBarTitleText": "材料未到通知"
+			}
+		},
+		{
+			"path": "pages/inform/wpwd",
+			"style": {
+				"navigationBarTitleText": "外派未到通知"
+			}
+		},
 		{
 			"path": "pages/order/record",
 			"style": {
@@ -84,6 +144,54 @@
 				"navigationBarTitleText": "领单"
 			}
 		},
+		{
+			"path": "pages/leader/outgoing",
+			"style": {
+				"navigationBarTitleText": "订单外发"
+			}
+		},
+		{
+			"path": "pages/leader/Addcheckout",
+			"style": {
+				"navigationBarTitleText": "添加抽检记录"
+			}
+		},
+		{
+			"path": "pages/leader/spot",
+			"style": {
+				"navigationBarTitleText": "订单抽检"
+			}
+		},
+		{
+			"path": "pages/leader/punish",
+			"style": {
+				"navigationBarTitleText": "处罚管理"
+			}
+		},
+		{
+			"path": "pages/leader/addpunish",
+			"style": {
+				"navigationBarTitleText": "添加处罚"
+			}
+		},
+		{
+			"path": "pages/leader/supervise",
+			"style": {
+				"navigationBarTitleText": "订单监管"
+			}
+		},
+		{
+			"path": "pages/leader/pending",
+			"style": {
+				"navigationBarTitleText": "待处理办件"
+			}
+		},
+		{
+			"path": "pages/leader/superviseDetail",
+			"style": {
+				"navigationBarTitleText": "监管订单详情"
+			}
+		},
 		{
 			"path": "pages/leader/receive",
 			"style": {
@@ -91,15 +199,33 @@
 			}
 		},
 		{
-			"path": "pages/leader/gxlist",
+			"path": "pages/leader/image",
+			"style": {
+				"navigationBarTitleText": "相册"
+			}
+		},
+		{
+			"path": "pages/scrap/dispose",
+			"style": {
+				"navigationBarTitleText": "报废返工处理"
+			}
+		},
+		{
+			"path": "pages/scrap/gxlist",
 			"style": {
 				"navigationBarTitleText": "工序列表"
 			}
 		},
 		{
-			"path": "pages/leader/image",
+			"path": "pages/scrap/processing",
 			"style": {
-				"navigationBarTitleText": "相册"
+				"navigationBarTitleText": "报废返工处理"
+			}
+		},
+		{
+			"path": "pages/scrap/scrap",
+			"style": {
+				"navigationBarTitleText": "报废返工处理"
 			}
 		}
 

+ 460 - 0
pages/foreign/administration.vue

@@ -0,0 +1,460 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<view class="main" v-for="(item,index) in 10" @click="navTo('/pages/foreign/orderDetail')">
+						<view class="main-id flex">
+							<view class="">产品货号:9876543211025666</view>
+							<view class="type1" v-if="index%2 == 0">
+								进行中
+							</view>
+							<view class="type2" v-else>
+								已完成
+							</view>
+						</view>
+						<view class="main-info flex">
+							<scroll-view scroll-x="true" class="main-price">
+								<view class="image-box">
+									<view class="image-item" v-for="(itm,ind) in 10">
+										<image src="../../static/img/user-item2.png" mode=""></image>
+									</view>
+								</view>
+							</scroll-view>
+							<view class="main-more">
+								<view class="mainm-font">
+									查看详细
+								</view>
+								<image class="mainm-jt" src="../../static/img/jt.png" mode=""></image>
+							</view>
+						</view>
+						<view class="main-name flex">
+							<view class="">创建日期:2022年10月30日</view>
+							<view class="">到货日期:2022年10月30日</view>
+						</view>
+						<view class="main-name flex">
+							<view class="mainnum-item">
+								合作公司:浙江皮革厂有限公司 13526232012
+							</view>
+						</view>
+						<view class="main-name flex">
+							<view class="mainnum-item">
+								不合格数量: <text class="red">285</text> 合格数量:<text class="red">285</text>
+							</view>
+						</view>
+						<view class="bottom flex">
+							<view class="btn-box">
+								<view class="box2" @click.stop="navTo('/pages/foreign/checkout')">检验记录</view>
+								<view v-if="tabCurrentIndex !=2" class="box2">立即联系</view>
+								<view v-if="tabCurrentIndex !=2" class="box1" @click.stop="open()">提交检验</view>
+							</view>
+
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="popup-title">
+					检验数量
+				</view>
+				<view class="popup-main">
+					<view class="popup-jian" @click="jj('0')">
+						-
+					</view>
+					<input v-model="num" placeholder="请输入检验数量" class="popup-main-font" />
+					<view class="popup-jia" @click="jj('1')">
+						+
+					</view>
+				</view>
+				<view class="popup-tip">
+					请输入检验数量
+				</view>
+				<view class="popup-btn-box flex">
+					<view class="popup-btn-item qx" @click="cancel()">
+						取消
+					</view>
+					<view class="popup-btn-item qd">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				num: 0,
+				navList: [{
+						state: '',
+						text: '全部',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '进行中',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '已完成',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				]
+			}
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			loadData() {
+
+			},
+			open() {
+				this.$refs.popup.open()
+			},
+			cancel() {
+				this.$refs.popup.close()
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			jj(opt) {
+				if (opt == 0) {
+					this.num = this.num * 1 - 1
+				} else {
+					this.num = this.num * 1 + 1
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: #FF4C4C;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #FF4C4C;
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		height: calc(100vh - 40px);
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+
+	.popup-box {
+		width: 582rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx;
+		padding: 64rpx 32rpx 20rpx;
+
+		.popup-title {
+			text-align: center;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.popup-main {
+			margin: 42rpx auto 0;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.popup-jian {
+				width: 89rpx;
+				height: 77rpx;
+				background: #FFFFFF;
+				border: 1px solid #CFCFCF;
+				border-radius: 3rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 43rpx;
+				font-family: Microsoft YaHei;
+				font-weight: 400;
+				color: #333333;
+			}
+
+			.popup-jia {
+				width: 89rpx;
+				height: 77rpx;
+				background: #FFFFFF;
+				border: 1px solid #CFCFCF;
+				border-radius: 3rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 43rpx;
+				font-family: Microsoft YaHei;
+				font-weight: 400;
+				color: #F35B64;
+			}
+
+			.popup-main-font {
+				padding: 0 10rpx;
+				text-align: center;
+				width: 140rpx;
+				height: 77rpx;
+				font-size: 32rpx;
+				font-family: Microsoft YaHei;
+				font-weight: 400;
+				color: #333333;
+				border-bottom: 1px solid #CFCFCF;
+				border-top: 1px solid #CFCFCF;
+			}
+		}
+
+		.popup-tip {
+			text-align: center;
+			margin-top: 34rpx;
+		}
+
+		.popup-btn-box {
+			margin-top: 50rpx;
+
+			.popup-btn-item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 248rpx;
+				height: 78rpx;
+				border-radius: 5rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+			}
+
+			.qd {
+				color: #FF4C4C;
+			}
+
+		}
+	}
+
+	.main {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin: 20rpx auto 0;
+		padding: 0 15rpx;
+		line-height: 1;
+
+		.main-id {
+			padding: 35rpx 14rpx 30rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			border-bottom: 1px solid #ededed;
+		}
+
+		.type1 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FF2D2D;
+		}
+
+		.type2 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+
+		.main-name {
+			padding: 0 14rpx 20rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #363636;
+		}
+
+		.main-info {
+			padding: 20rpx 14rpx;
+
+			.main-price {
+				width: 480rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+			.main-more {
+				display: flex;
+				align-items: center;
+
+				.mainm-font {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.mainm-jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+
+		.main-num {
+			padding: 24rpx 14rpx 20rpx;
+			border-bottom: 1px solid #ededed;
+
+			.mainnum-item {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+			}
+		}
+
+		.red {
+			color: #FF4C4C
+		}
+
+		.bottom {
+			border-top: 1px solid #eeeeee;
+			padding: 20rpx 0;
+
+
+			.btn-box {
+				width: 100%;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+			}
+
+			.bottom-font {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+				.red {
+					color: #FF4C4C
+				}
+			}
+
+			.box2 {
+				margin-left: 10rpx;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #EBEBEB;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.box1 {
+				margin-left: 10rpx;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF2D2D;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF2D2D;
+			}
+		}
+	}
+</style>

+ 113 - 0
pages/foreign/checkout.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item" v-for="(item,index) in 10">
+				<view class="main-title flex">
+					<view class="title">
+						黄色,37码,数量3
+					</view>
+					<view class="type" v-if="index%2==0">
+						合格
+					</view>
+					<view class="type1" v-else>
+						报废
+					</view>
+				</view>
+				<view class="main-info flex">
+					<scroll-view scroll-x="true" class="main-price">
+						<view class="image-box">
+							<view class="image-item" v-for="(itm,ind) in 10">
+								<image src="../../static/img/user-item2.png" mode=""></image>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		padding-bottom: 100rpx;
+	}
+
+	.main-item {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin: 20rpx auto 0;
+		padding: 28rpx 16rpx;
+
+		.main-title {
+			padding: 0 14rpx 30rpx 10rpx;
+			border-bottom: 1px solid #fafafa;
+
+			.title {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #323333;
+			}
+
+			.type {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #999999;
+			}
+
+			.type1 {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+		}
+
+		.main-info {
+			padding: 20rpx 14rpx;
+
+			.main-price {
+				width: 100%;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+		}
+	}
+</style>

+ 386 - 0
pages/foreign/forOrder.vue

@@ -0,0 +1,386 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<view class="main" v-for="(item,index) in 10" @click="navTo('/pages/foreign/rejectDetail')">
+						<view class="main-id flex">
+							<view class="">产品货号:9876543211025666</view>
+							<view class="type1" v-if="index%2 == 0">
+								待处理
+							</view>
+							<view class="type2" v-else>
+								已处理
+							</view>
+						</view>
+						<view class="main-name flex">
+							<view class="">产品名称</view>
+							<view class="">检验日期:2022年10月30日</view>
+						</view>
+						<view class="main-info flex">
+							<scroll-view scroll-x="true" class="main-price">
+								<view class="image-box">
+									<view class="image-item" v-for="(itm,ind) in 10">
+										<image src="../../static/img/user-item2.png" mode=""></image>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+						<view class="main-num flex">
+							<view class="mainnum-item">
+								合作公司:浙江皮革厂有限公司 13526232012
+							</view>
+						</view>
+						<view class="bottom flex">
+							<view class="bottom-font">
+								不合格数量:<text class="red">285</text>
+							</view>
+							<view class="btn-box">
+								<view class="box2" @click.stop="open()">处理</view>
+								<view class="box2" @click.stop="navTo('/pages/user/myorderDispose?type=2')">联系厂家</view>
+							</view>
+
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="popup-title">
+					输入意见
+				</view>
+				<view class="popup-main">
+					<textarea placeholder="请点击输入..." class="popup-main-font" name="" id="" cols="30"
+						rows="10"></textarea>
+				</view>
+				<view class="popup-btn-box flex">
+					<view class="popup-btn-item qx" @click="cancel()">
+						取消
+					</view>
+					<view class="popup-btn-item qd">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				navList: [{
+						state: '',
+						text: '全部',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '待处理',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '已处理',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				]
+			}
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			loadData() {
+
+			},
+			open() {
+				this.$refs.popup.open()
+			},
+			cancel() {
+				this.$refs.popup.close()
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: #FF4C4C;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #FF4C4C;
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		height: calc(100vh - 40px);
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+
+	.popup-box {
+		width: 582rpx;
+		background: #FFFFFF;
+		border-radius: 7rpx;
+		padding: 64rpx 32rpx 54rpx;
+
+		.popup-title {
+			text-align: center;
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #2D2D2D;
+		}
+
+		.popup-main {
+			margin-top: 42rpx;
+			width: 100%;
+			height: 194rpx;
+			background: #F4F4F4;
+			border-radius: 10rpx;
+			padding: 20rpx;
+
+			.popup-main-font {
+				width: 100%;
+				height: 100%;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+
+		.popup-btn-box {
+			margin-top: 50rpx;
+
+			.popup-btn-item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 248rpx;
+				height: 78rpx;
+				border-radius: 5rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+			}
+
+			.qx {
+				color: #333333;
+				background: #FFFFFF;
+				border: 1px solid #999999;
+			}
+
+			.qd {
+				background: #069CFA;
+				color: #FFFFFF;
+			}
+		}
+	}
+
+	.main {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin: 20rpx auto 0;
+		padding: 0 15rpx;
+		line-height: 1;
+
+		.main-id {
+			padding: 35rpx 14rpx 30rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			border-bottom: 1px solid #ededed;
+		}
+
+		.type1 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FF2D2D;
+		}
+
+		.type2 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+
+		.main-name {
+			padding: 20rpx 14rpx 16rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #363636;
+		}
+
+		.main-info {
+			padding: 0 14rpx;
+
+			.main-price {
+				width: 100%;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+			.main-more {
+				display: flex;
+				align-items: center;
+
+				.mainm-font {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.mainm-jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+
+		.main-num {
+			padding: 24rpx 14rpx 20rpx;
+			border-bottom: 1px solid #ededed;
+
+			.mainnum-item {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+				.red {
+					color: #FF4C4C
+				}
+			}
+		}
+
+		.bottom {
+			padding: 20rpx 0;
+
+
+			.btn-box {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+			}
+
+			.bottom-font {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+				.red {
+					color: #FF4C4C
+				}
+			}
+
+
+			.box2 {
+				margin-left: 10rpx;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF2D2D;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF2D2D;
+			}
+		}
+	}
+</style>

+ 0 - 0
pages/order/foreignOrder.vue → pages/foreign/foreignOrder.vue


+ 214 - 0
pages/foreign/orderDetail.vue

@@ -0,0 +1,214 @@
+<template>
+	<view class="content">
+		<view class="title">
+			<view class="title-item flex">
+				<view class="title-title">
+					合作公司:
+				</view>
+				<view class="title-font">
+					浙江皮革厂有限公司
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					联系方式:
+				</view>
+				<view class="title-font">
+					14253621423
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					图片:
+				</view>
+				<scroll-view scroll-x="true" class="main-price">
+					<view class="image-box">
+						<view class="image-item" v-for="(itm,ind) in 10">
+							<image src="../../static/img/user-item2.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					产品货号:
+				</view>
+				<view class="title-font">
+					9876543211025666
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					到货日期:
+				</view>
+				<view class="title-font red">
+					2022年10月30日
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					创建日期:
+				</view>
+				<view class="title-font">
+					2022年10月30日
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					外发人:
+				</view>
+				<view class="title-font">
+					李丹丹
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					外包费用:
+				</view>
+				<view class="title-font red">
+					¥1000
+				</view>
+			</view>
+		</view>
+		<view class="title">
+			<view class="title-item">
+				<view class="title-title">
+					外发鞋子:
+				</view>
+				<view class="title-font cm">
+					【缝纫,黄色,37码,数量30】【缝纫,黄色,37码,数量30】
+					【缝纫,黄色,37码,数量30】【缝纫,黄色,37码,数量30】
+					【缝纫,黄色,37码,数量30】【缝纫,黄色,37码,数量30】
+				</view>
+			</view>
+		</view>
+		<view class="title">
+			<view class="title-item flex">
+				<view class="title-title">
+					已到合格品:
+				</view>
+				<view class="title-font">
+					200
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					不合格品:
+				</view>
+				<view class="title-font">
+					20
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					总外发数量:
+				</view>
+				<view class="title-font">
+					2000
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					备注:
+				</view>
+				<view class="title-font">
+					无
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+		background: #ffffff;
+	}
+
+	.title {
+		width: 700rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 20rpx auto 0;
+		padding: 0 24rpx;
+
+		.title-item {
+			padding: 24rpx 6rpx;
+
+			.title-title {
+				flex-shrink: 0;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.title-font {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #323333;
+			}
+
+			.cm {}
+
+			.red {
+				color: #FF4C4C;
+			}
+
+			.main-price {
+				width: 480rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.xian {
+		width: 100%;
+		height: 2rpx;
+		background: #EAECED;
+	}
+</style>

+ 198 - 0
pages/foreign/rejectDetail.vue

@@ -0,0 +1,198 @@
+<template>
+	<view class="content">
+		<view class="title">
+			<view class="title-item flex">
+				<view class="title-title">
+					产品货号:
+				</view>
+				<view class="title-font">
+					9876543211025666
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					产品名称:
+				</view>
+				<view class="title-font">
+					豆豆鞋
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					图片:
+				</view>
+				<scroll-view scroll-x="true" class="main-price">
+					<view class="image-box">
+						<view class="image-item" v-for="(itm,ind) in 10">
+							<image src="../../static/img/user-item2.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					合作公司:
+				</view>
+				<view class="title-font">
+					浙江皮革厂有限公司
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					不合格数量:
+				</view>
+				<view class="title-font red">
+					365
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					联系电话:
+				</view>
+				<view class="title-font">
+					15236231452
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					负责人:
+				</view>
+				<view class="title-font">
+					李丹丹
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					检验员:
+				</view>
+				<view class="title-font">
+					李丹丹
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					检验日期:
+				</view>
+				<view class="title-font">
+					2022年10月30日
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					处理日期:
+				</view>
+				<view class="title-font">
+					2022年10月30日
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					处理说明:
+				</view>
+				<view class="title-font">
+					详细处理说明内容详细处理说明内容详细处理说明内容详细处理说明内容详细处理说明内容详细处理说明内容
+				</view>
+			</view>
+			<view class="xian"></view>
+			<view class="title-item flex">
+				<view class="title-title">
+					处理人:
+				</view>
+				<view class="title-font">
+					李丹丹
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.title {
+		width: 700rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 20rpx auto 0;
+		padding: 0 24rpx;
+
+		.title-item {
+			padding: 24rpx 6rpx;
+
+			.title-title {
+				flex-shrink: 0;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.title-font {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #323333;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+
+			.main-price {
+				width: 480rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.xian {
+		width: 100%;
+		height: 2rpx;
+		background: #EAECED;
+	}
+</style>

+ 116 - 0
pages/inform/cl.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item" v-for="(item,index) in 10">
+				<view class="main-icon-box">
+					<image class="main-icon"
+						:src="index%2==0? '../../static/icon/rsyj.png':'../../static/icon/ysyj.png'" mode=""></image>
+				</view>
+				<view class="main-main">
+					<view class="main-title flex">
+						<view class="title">
+							材料未到{{index%2==0? '红色预警':'黄色预警'}}
+						</view>
+						<view class="time">
+							2022/12/09 12:00:00
+						</view>
+					</view>
+					<view class="main-tip flex">
+						<view class="tip">
+							[XX订单]的[XX材料]仍未到货,即将超过约定日期!
+						</view>
+						<view class="dian" v-if="index <= 2">
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+
+	}
+
+	.main {
+		margin-top: 20rpx;
+		background: #ffffff;
+	}
+
+	.main-item {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0 34rpx;
+
+		.main-icon-box {
+			padding-bottom: 20rpx;
+		}
+
+		.main-icon {
+			flex-shrink: 0;
+			width: 60rpx;
+			height: 60rpx;
+		}
+
+		.main-main {
+			padding-bottom: 20rpx;
+			width: 100%;
+			margin-left: 24rpx;
+			border-bottom: 1px solid #f0f0f0;
+
+			.main-title {
+				line-height: 1;
+
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.time {
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-tip {
+				line-height: 1;
+				margin-top: 18rpx;
+
+				.tip {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+
+				.dian {
+					width: 13rpx;
+					height: 13rpx;
+					background: #FB555C;
+					border-radius: 50%;
+				}
+			}
+		}
+	}
+</style>

+ 116 - 0
pages/inform/dd.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item" v-for="(item,index) in 10">
+				<view class="main-icon-box">
+					<image class="main-icon"
+						:src="index%2==0? '../../static/icon/rsyj.png':'../../static/icon/ysyj.png'" mode=""></image>
+				</view>
+				<view class="main-main">
+					<view class="main-title flex">
+						<view class="title">
+							[XX订单]{{index%2==0? '红色预警':'黄色预警'}}
+						</view>
+						<view class="time">
+							2022/12/09 12:00:00
+						</view>
+					</view>
+					<view class="main-tip flex">
+						<view class="tip">
+							[采购]时间即将到期,到期时间2022年02月30日
+						</view>
+						<view class="dian" v-if="index <= 2">
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+
+	}
+
+	.main {
+		margin-top: 20rpx;
+		background: #ffffff;
+	}
+
+	.main-item {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0 34rpx;
+
+		.main-icon-box {
+			padding-bottom: 20rpx;
+		}
+
+		.main-icon {
+			flex-shrink: 0;
+			width: 60rpx;
+			height: 60rpx;
+		}
+
+		.main-main {
+			padding-bottom: 20rpx;
+			width: 100%;
+			margin-left: 24rpx;
+			border-bottom: 1px solid #f0f0f0;
+
+			.main-title {
+				line-height: 1;
+
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.time {
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-tip {
+				line-height: 1;
+				margin-top: 18rpx;
+
+				.tip {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+
+				.dian {
+					width: 13rpx;
+					height: 13rpx;
+					background: #FB555C;
+					border-radius: 50%;
+				}
+			}
+		}
+	}
+</style>

+ 115 - 0
pages/inform/wp.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item" v-for="(item,index) in 10">
+				<view class="main-icon-box">
+					<image class="main-icon" src="../../static/icon/wptz.png" mode=""></image>
+				</view>
+				<view class="main-main">
+					<view class="main-title flex">
+						<view class="title">
+							外发不合格通知
+						</view>
+						<view class="time">
+							2022/12/09 12:00:00
+						</view>
+					</view>
+					<view class="main-tip flex">
+						<view class="tip">
+							[XX订单]新增3件不合格,请立即处理!
+						</view>
+						<view class="dian" v-if="index <= 2">
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+
+	}
+
+	.main {
+		margin-top: 20rpx;
+		background: #ffffff;
+	}
+
+	.main-item {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0 34rpx;
+
+		.main-icon-box {
+			padding-bottom: 20rpx;
+		}
+
+		.main-icon {
+			flex-shrink: 0;
+			width: 60rpx;
+			height: 60rpx;
+		}
+
+		.main-main {
+			padding-bottom: 20rpx;
+			width: 100%;
+			margin-left: 24rpx;
+			border-bottom: 1px solid #f0f0f0;
+
+			.main-title {
+				line-height: 1;
+
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.time {
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-tip {
+				line-height: 1;
+				margin-top: 18rpx;
+
+				.tip {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+
+				.dian {
+					width: 13rpx;
+					height: 13rpx;
+					background: #FB555C;
+					border-radius: 50%;
+				}
+			}
+		}
+	}
+</style>

+ 115 - 0
pages/inform/wpwd.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-item" v-for="(item,index) in 10">
+				<view class="main-icon-box">
+					<image class="main-icon" src="../../static/icon/wpwd.png" mode=""></image>
+				</view>
+				<view class="main-main">
+					<view class="main-title flex">
+						<view class="title">
+							外派未到通知
+						</view>
+						<view class="time">
+							2022/12/09 12:00:00
+						</view>
+					</view>
+					<view class="main-tip flex">
+						<view class="tip">
+							[XX订单]的外派未到,请及时联系!
+						</view>
+						<view class="dian" v-if="index <= 2">
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+
+	}
+
+	.main {
+		margin-top: 20rpx;
+		background: #ffffff;
+	}
+
+	.main-item {
+		display: flex;
+		align-items: center;
+		padding: 32rpx 24rpx 0 34rpx;
+
+		.main-icon-box {
+			padding-bottom: 20rpx;
+		}
+
+		.main-icon {
+			flex-shrink: 0;
+			width: 60rpx;
+			height: 60rpx;
+		}
+
+		.main-main {
+			padding-bottom: 20rpx;
+			width: 100%;
+			margin-left: 24rpx;
+			border-bottom: 1px solid #f0f0f0;
+
+			.main-title {
+				line-height: 1;
+
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.time {
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-tip {
+				line-height: 1;
+				margin-top: 18rpx;
+
+				.tip {
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+
+				.dian {
+					width: 13rpx;
+					height: 13rpx;
+					background: #FB555C;
+					border-radius: 50%;
+				}
+			}
+		}
+	}
+</style>

+ 375 - 0
pages/leader/Addcheckout.vue

@@ -0,0 +1,375 @@
+<template>
+	<view class="content">
+		<view class="top"></view>
+		<!-- <view class="title">
+			<view class="title-item flex">
+				<view class="title-font">
+					提交人:
+				</view>
+				<view class="title-font">
+					全包员工
+				</view>
+			</view>
+			<view class="xian">
+			</view>
+			<view class="title-item flex">
+				<view class="title-font">
+					当前检验阶段:
+				</view>
+				<view class="title-font">
+					下料
+				</view>
+			</view>
+		</view> -->
+		<view v-for="(item,index) in list">
+			<view class="main">
+				<view class="main-top">
+					<image class="main-icon" src="../../static/icon/order.png" mode=""></image>
+					<view class="main-font">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="main-bottom flex">
+					<view class="num">
+						合格/不合格:
+					</view>
+					<view class="main-input">
+						合格
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom flex">
+					<view class="num">
+						总数量:
+					</view>
+					<view class="main-input red">
+						363
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom flex">
+					<view class="num">
+						合格数量:
+					</view>
+					<view class="main-input">
+						<input type="number" v-model="item.hnumber" placeholder="请填写合格数量">
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom flex">
+					<view class="num">
+						品质评级:
+					</view>
+					<view class="main-input">
+						<picker :range="pjlist" @change="choosePj($event,item)">
+							<view v-if="item.pj">{{item.pj}}</view>
+							<view v-else>请选择评级</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="main">
+				<view class="main-top">
+					<image class="main-icon" src="../../static/icon/order.png" mode=""></image>
+					<view class="main-font">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="main-bottom flex">
+					<view class="num">
+						合格/不合格:
+					</view>
+					<view class="main-input">
+						不合格
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom flex">
+					<view class="num">
+						总数量:
+					</view>
+					<view class="main-input red">
+						363
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom flex">
+					<view class="num">
+						不合格数量:
+					</view>
+					<view class="main-input">
+						<input type="number" v-model="item.bnumber" placeholder="请填写不合格数量">
+					</view>
+				</view>
+				<view class="xian"></view>
+				<view class="main-bottom">
+					<view class="num">
+						图片:
+					</view>
+					<view class="banner-box">
+						<view class="banner" v-for="(imgitem,imgindex) in item.images" :key="index">
+							<view class="banner-main">
+								<image :src="imgitem" mode=""></image>
+							</view>
+							<image class="cha" @click.stop="delImg(imgindex)" src="../../static/img/cha.png" mode="">
+							</image>
+						</view>
+						<view class="banner" @click="imgsub(index)">
+							<image src="../../static/img/addP.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn">
+			确认提交
+		</view>
+		<view class="" style="height: 80rpx;"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		upload
+	} from '@/api/user.js'
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '规格1(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格2(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格3(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格4(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格5(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格6(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格7(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}, {
+					name: '规格8(黄色,37码)',
+					hnumber: '',
+					bnumber: '',
+					pj: '',
+					images: []
+				}],
+				type: 0,
+				pjlist: ['优', '良', '及', '不及']
+			};
+		},
+		onLoad(opt) {
+			this.type = opt.type
+		},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			choosePj(e, opt) {
+				console.log(e);
+				opt.pj = this.pjlist[e.detail.value]
+			},
+			delImg(i) {
+				uni.showModal({
+					content: '确定删除这张吗',
+					success: res => {
+						if (res.confirm) {
+							this.imageList.splice(i, 1);
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			imgsub(index) {
+				let obj = this;
+				console.log('上传头像');
+				upload({
+					filename: ''
+				}).then(res => {
+					console.log(res[0].url);
+					obj.list[index].images.push(res[0].url)
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+		background: #ffffff;
+	}
+
+	.top {
+		width: 100%;
+		height: 20rpx;
+		background: #f8f8f8;
+	}
+
+	.xian {
+		width: 100%;
+		height: 2rpx;
+		background: #EAECED;
+	}
+
+	.title {
+		width: 700rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 20rpx auto 0;
+		padding: 0 24rpx;
+
+		.title-item {
+			padding: 24rpx 6rpx;
+
+			.title-font {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #323333;
+			}
+		}
+	}
+
+	.main {
+		margin: 20rpx auto 0;
+		padding: 0 20rpx;
+		width: 700rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.main-top {
+			display: flex;
+			align-items: center;
+			padding: 16rpx 0;
+			border-bottom: 1px solid #EAECED;
+
+			.main-icon {
+				width: 32rpx;
+				height: 37rpx;
+			}
+
+			.main-font {
+				margin-left: 10rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+
+		.main-bottom {
+			padding: 20rpx 0;
+
+			.num {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.main-input {
+				text-align: right;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+		}
+	}
+
+	.btn {
+		text-align: center;
+		margin: 100rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		line-height: 85rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.banner-box {
+		background: #ffffff;
+		padding: 20rpx;
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.banner {
+			position: relative;
+			width: 110rpx;
+			height: 110rpx;
+			margin-right: 10rpx;
+
+			.banner-main {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 20rpx;
+
+				image {
+					border-radius: 20rpx;
+				}
+			}
+
+			.cha {
+				position: absolute;
+				top: 0;
+				right: 0;
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+</style>

+ 167 - 0
pages/leader/addpunish.vue

@@ -0,0 +1,167 @@
+<template>
+	<view class="content">
+		<view class="main-box">
+			<view class="main-item">
+				<view class="main-font">
+					扣款类型
+				</view>
+				<picker @change="bindPickerType" :range="typelist" class="input">
+					<text>{{ type }}</text>
+				</picker>
+			</view>
+			<view class="main-item">
+				<view class="main-font">
+					扣款人
+				</view>
+				<input class="input" type="text" v-model="name" placeholder="请填写姓名">
+			</view>
+			<view class="main-item">
+				<view class="main-font">
+					处罚日期
+				</view>
+				<view class="input">
+					<view class="uni-list-cell">
+						<picker mode="date" :value="date" @change="bindDateChange">
+							<view class="uni-input">{{date}}</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="main-item">
+				<view class="main-font">
+					扣款金额
+				</view>
+				<input class="input" type="text" v-model="money" placeholder="请填写金额">
+			</view>
+			<view class="main-item">
+				<view class="main-font">
+					是否征求员工意见
+				</view>
+				<picker class="input" @change="bindPickerSf" :range="array">
+					<text>{{ sex }}</text>
+				</picker>
+			</view>
+			<view class="info-box">
+				<view class="info-title">
+					处罚说明<text class="info-tip">(限XX字)</text>
+				</view>
+				<textarea class="info-box" placeholder="请填写处罚说明..." v-model="info" id="" cols="30" rows="10"></textarea>
+			</view>
+		</view>
+		<view class="btn">
+			确认添加
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				name: '',
+				money: '',
+				type: '请选择扣款类型',
+				typelist: ['迟到', '早退', '旷工'],
+				date: '请选择日期',
+				array: ['是', '否'],
+				sex: '请选择是否',
+				info: ''
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			// 选择类型
+			bindPickerType: function(e) {
+				this.type = this.typelist[e.target.value];
+			},
+			bindDateChange: function(e) {
+				this.date = e.detail.value;
+				console.log(e);
+			},
+			bindPickerSf: function(e) {
+				this.sex = this.array[e.target.value];
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+
+	.main-box {
+		margin-top: 20rpx;
+		padding: 0 30rpx 20rpx;
+		background: #ffffff;
+
+		.main-item {
+			padding: 35rpx 18rpx;
+			border-bottom: 1px solid #f5f5f5;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.main-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #222222;
+			}
+
+			.input {
+				text-align: right;
+				padding: 0 20rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+			}
+		}
+	}
+
+	.info-box {
+		margin-top: 20rpx;
+
+		.info-title {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #222222;
+
+			.info-tip {
+				font-size: 24rpx;
+				color: #666666;
+			}
+		}
+
+		.info-box {
+			width: 100%;
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+	}
+
+	.btn {
+		margin: 100rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		text-align: center;
+		line-height: 85rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+</style>

+ 236 - 0
pages/leader/outgoing.vue

@@ -0,0 +1,236 @@
+<template>
+	<view class="content">
+		<view class="main-item" v-for="(item,index) in list">
+			<view class="main-top flex">
+				<view class="orderId">
+					产品货号:{{item.orderId}}
+				</view>
+				<view class="type">
+					{{item.type}}
+				</view>
+			</view>
+			<view class="main-main">
+				<view class="main-title">
+					产品名称
+				</view>
+				<view class="main-info flex">
+					<view class="image-box" v-if="item.image.length >= 4">
+						<view class="image" v-for="itm in 4">
+							<image :src="item.image[itm-1]" mode=""></image>
+						</view>
+					</view>
+					<view class="image-box" v-if="item.image.length < 4">
+						<view class="image" v-for="itm in item.image">
+							<image :src="itm" mode=""></image>
+						</view>
+					</view>
+					<view class="more" @click="navTo('/pages/leader/image')">
+						<view class="more-font">更多图片</view>
+						<view class="more-icon">
+							<image src="../../static/img/jt.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="mun">
+					总数量:<text>{{item.num}}</text>
+				</view>
+			</view>
+			<view class="btn-box">
+				<view class="btn1" @click="navTo('/pages/leader/image')">查看样图</view>
+				<view class="btn" @click="navTo('/pages/leader/receive?type=1')">订单外发</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						image: ['../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png'
+						],
+						orderId: '9876543211025666',
+						type: '下料',
+						num: '285'
+					},
+					{
+						image: ['../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png',
+						],
+						orderId: '9876543211025777',
+						type: '下料',
+						num: '280'
+					},
+					{
+						image: ['../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png',
+						],
+						orderId: '9876543211025888',
+						type: '下料',
+						num: '275'
+					},
+					{
+						image: ['../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png', '../../static/img/avatar.png',
+							'../../static/img/avatar.png'
+						],
+						orderId: '9876543211025999',
+						type: '下料',
+						num: '265'
+					}
+				]
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main-item {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		padding: 0 15rpx;
+		margin: 20rpx auto 0;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.main-top {
+			padding: 30rpx 14rpx;
+			border-bottom: 1px solid #f5f5f5;
+
+			.orderId {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.type {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF2D2D;
+			}
+		}
+
+		.main-main {
+			padding: 20rpx 14rpx;
+			border-bottom: 1px solid #f5f5f5;
+
+			.main-title {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #363636;
+			}
+
+			.main-info {
+				margin-top: 16rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image {
+						width: 110rpx;
+						height: 110rpx;
+						margin-right: 10rpx;
+					}
+				}
+
+				.more {
+					display: flex;
+					align-items: center;
+					line-height: 1;
+
+					.more-font {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #333333;
+						margin-right: 10rpx;
+					}
+
+					.more-icon {
+						display: inline-flex;
+						width: 12rpx;
+						height: 22rpx;
+					}
+				}
+			}
+
+			.mun {
+				margin-top: 24rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+				text {
+					color: #FF4C4C;
+				}
+			}
+		}
+
+		.btn-box {
+			padding: 20rpx 14rpx;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+
+			.btn1 {
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #EBEBEB;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				line-height: 24rpx;
+			}
+
+			.btn {
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF2D2D;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF2D2D;
+				line-height: 24rpx;
+				margin-left: 14rpx;
+			}
+		}
+	}
+</style>

+ 367 - 0
pages/leader/pending.vue

@@ -0,0 +1,367 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<view class="main" v-for="(item,index) in 10" :key="index">
+						<view class="main-top flex">
+							<view class="main-title ">
+								旷工处罚
+							</view>
+							<view class="main-type" :class="{red:index%3==1}">
+								{{index%3 ==1?'待处理':index%3 ==2?'已反对':'已完成'}}
+							</view>
+						</view>
+						<view class="main-time">
+							处罚日期:2023年10月10日
+						</view>
+						<view class="main-info">
+							<view class="main-info-item">
+								<text
+									class="main-info-title">处罚说明:</text>处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由
+							</view>
+							<view class="main-info-item" v-if="index%3 !=1">
+								<text
+									class="main-info-title">领导处理说明:</text>领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明
+							</view>
+						</view>
+						<view class="main-name flex">
+							<view class="main-name-left">
+								提交人:李丹丹 <text v-if="index%3 !=1">领导:高启强</text>
+							</view>
+							<view class="main-name-right">
+								¥200
+							</view>
+						</view>
+						<view class="btn-box" v-if="index%3 == 1" @click="open()">
+							<view class="btn1">
+								拒绝扣款
+							</view>
+							<view class="btn2">
+								同意扣款
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="popup-title">
+					输入意见
+				</view>
+				<view class="popup-main">
+					<textarea placeholder="请点击输入..." class="popup-main-font" name="" id="" cols="30"
+						rows="10"></textarea>
+				</view>
+				<view class="popup-btn-box flex">
+					<view class="popup-btn-item qx" @click="cancel()">
+						取消
+					</view>
+					<view class="popup-btn-item qd">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				navList: [{
+						state: '',
+						text: '全部',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '待处理',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '已反对',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: '',
+						text: '已完成',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				]
+			}
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			loadData() {
+
+			},
+			open() {
+				this.$refs.popup.open()
+			},
+			cancel() {
+				this.$refs.popup.close()
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: #FF4C4C;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #FF4C4C;
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		height: calc(100vh - 40px);
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+	.main {
+		margin: 20rpx auto 0;
+		width: 706rpx;
+		background: #FFFFFF;
+		border-radius: 15rpx;
+		padding: 34rpx 20rpx 0rpx;
+
+		.main-top {
+			padding: 0 16rpx;
+
+			.main-title {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.main-type {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+		}
+
+		.main-time {
+			margin-top: 20rpx;
+			padding: 0 16rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+
+		.main-info {
+			padding: 0 14rpx;
+			margin-top: 20rpx;
+			padding: 26rpx 26rpx 26rpx 20rpx;
+			background: #f2f2f2;
+
+			.main-info-item {
+				.main-info-title {
+					color: #333333;
+				}
+
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #666666;
+			}
+
+			.main-info-item:first-child {
+				margin-top: 0;
+			}
+		}
+
+		.main-name {
+			padding: 28rpx 16rpx;
+
+			.main-name-left {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.main-name-right {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+		}
+
+		.btn-box {
+			border-top: 1px solid #f6f6f6;
+			padding: 28rpx 12rpx 20rpx;
+			display: flex;
+			justify-content: flex-end;
+
+			.btn1 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #EBEBEB;
+				border-radius: 28rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.btn2 {
+				margin-left: 20rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF4C4C;
+				border-radius: 28rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF4C4C;
+			}
+		}
+	}
+
+	.popup-box {
+		width: 582rpx;
+		background: #FFFFFF;
+		border-radius: 7rpx;
+		padding: 64rpx 32rpx 54rpx;
+
+		.popup-title {
+			text-align: center;
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #2D2D2D;
+		}
+
+		.popup-main {
+			margin-top: 42rpx;
+			width: 100%;
+			height: 194rpx;
+			background: #F4F4F4;
+			border-radius: 10rpx;
+			padding: 20rpx;
+
+			.popup-main-font {
+				width: 100%;
+				height: 100%;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+
+		.popup-btn-box {
+			margin-top: 50rpx;
+
+			.popup-btn-item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 248rpx;
+				height: 78rpx;
+				border-radius: 5rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+			}
+
+			.qx {
+				color: #333333;
+				background: #FFFFFF;
+				border: 1px solid #999999;
+			}
+
+			.qd {
+				background: #069CFA;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>

+ 301 - 0
pages/leader/punish.vue

@@ -0,0 +1,301 @@
+<template>
+	<view class="content">
+		<view class="main" v-for="(item,index) in 10" :key="index">
+			<view class="main-top flex">
+				<view class="main-title ">
+					旷工处罚
+				</view>
+				<view class="main-type" :class="{red:index%3==1}">
+					{{index%3 ==1?'待处理':index%3 ==2?'已反对':'已完成'}}
+				</view>
+			</view>
+			<view class="main-time">
+				处罚日期:2023年10月10日
+			</view>
+			<view class="main-info">
+				<view class="main-info-item">
+					<text
+						class="main-info-title">处罚说明:</text>处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由处罚理由
+				</view>
+				<view class="main-info-item" v-if="index%3 !=1">
+					<text
+						class="main-info-title">领导处理说明:</text>领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明领导处理说明
+				</view>
+			</view>
+			<view class="main-name flex">
+				<view class="main-name-left">
+					扣款人:李丹丹
+				</view>
+				<view class="main-name-right">
+					¥200
+				</view>
+			</view>
+			<view class="btn-box" @click="open()">
+				<view class="btn1">
+					修改处罚
+				</view>
+				<view class="btn2">
+					撤销处罚
+				</view>
+			</view>
+		</view>
+		<view class="add-box" @click="navTo('/pages/leader/addpunish')">
+			<image class="add-icon" src="../../static/icon/add.png" mode=""></image>
+			<view class="add-font">
+				添加处罚
+			</view>
+		</view>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="popup-title">
+					撤销说明
+				</view>
+				<view class="popup-main">
+					<textarea placeholder="请点击输入..." class="popup-main-font" name="" id="" cols="30"
+						rows="10"></textarea>
+				</view>
+				<view class="popup-btn-box flex">
+					<view class="popup-btn-item qx" @click="cancel()">
+						取消
+					</view>
+					<view class="popup-btn-item qd">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			open() {
+				this.$refs.popup.open()
+			},
+			cancel() {
+				this.$refs.popup.close()
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		margin: 20rpx auto 0;
+		width: 706rpx;
+		background: #FFFFFF;
+		border-radius: 15rpx;
+		padding: 34rpx 20rpx 0rpx;
+
+		.main-top {
+			padding: 0 16rpx;
+
+			.main-title {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.main-type {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+		}
+
+		.main-time {
+			margin-top: 20rpx;
+			padding: 0 16rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+
+		.main-info {
+			padding: 0 14rpx;
+			margin-top: 20rpx;
+			padding: 26rpx 26rpx 26rpx 20rpx;
+			background: #f2f2f2;
+
+			.main-info-item {
+				.main-info-title {
+					color: #333333;
+				}
+
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #666666;
+			}
+
+			.main-info-item:first-child {
+				margin-top: 0;
+			}
+		}
+
+		.main-name {
+			padding: 28rpx 16rpx;
+
+			.main-name-left {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.main-name-right {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+		}
+
+		.btn-box {
+			border-top: 1px solid #f6f6f6;
+			padding: 28rpx 12rpx 20rpx;
+			display: flex;
+			justify-content: flex-end;
+
+			.btn1 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #EBEBEB;
+				border-radius: 28rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.btn2 {
+				margin-left: 20rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF4C4C;
+				border-radius: 28rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF4C4C;
+			}
+		}
+	}
+
+	.add-box {
+		margin: 100rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.add-icon {
+			width: 38rpx;
+			height: 38rpx;
+		}
+
+		.add-font {
+			margin-left: 10rpx;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+	}
+
+	.popup-box {
+		width: 582rpx;
+		background: #FFFFFF;
+		border-radius: 7rpx;
+		padding: 64rpx 32rpx 54rpx;
+
+		.popup-title {
+			text-align: center;
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #2D2D2D;
+		}
+
+		.popup-main {
+			margin-top: 42rpx;
+			width: 100%;
+			height: 194rpx;
+			background: #F4F4F4;
+			border-radius: 10rpx;
+			padding: 20rpx;
+
+			.popup-main-font {
+				width: 100%;
+				height: 100%;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+
+		.popup-btn-box {
+			margin-top: 50rpx;
+
+			.popup-btn-item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 248rpx;
+				height: 78rpx;
+				border-radius: 5rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+			}
+
+			.qx {
+				color: #333333;
+				background: #FFFFFF;
+				border: 1px solid #999999;
+			}
+
+			.qd {
+				background: #069CFA;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>

+ 92 - 5
pages/leader/receive.vue

@@ -1,7 +1,41 @@
 <template>
 	<view class="content">
 		<view class="box">
-			<view class="title" @click="navTo('/pages/leader/gxlist')">
+			<view class="foreign" v-if="type == 1">
+				<view class="foreign-item">
+					<view class="foreign-font">
+						外发合作公司
+					</view>
+					<picker @change="bindPickerCompany" :range="companylist" class="input">
+						<text>{{ company }}</text>
+					</picker>
+				</view>
+				<view class="foreign-item">
+					<view class="foreign-font">
+						到货时间
+					</view>
+					<view class="input">
+						<view class="uni-list-cell">
+							<picker mode="date" :value="date" @change="bindDateChange">
+								<view class="uni-input">{{date}}</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="foreign-item">
+					<view class="foreign-font">
+						外发费用
+					</view>
+					<input class="input" type="text" v-model="money" placeholder="请填写金额">
+				</view>
+				<view class="foreign-item">
+					<view class="foreign-font">
+						备注
+					</view>
+					<input class="input" type="text" v-model="bz" placeholder="请填写备注">
+				</view>
+			</view>
+			<view class="title" @click="navTo('/pages/scrap/gxlist')">
 				<view class="title-main">
 					<text class="gray">工序:</text>(下料,20件,¥100)(下料,20件,¥100)(下料,20件,¥100)(下料,20件,¥100)
 				</view>
@@ -69,10 +103,23 @@
 				}, {
 					name: '规格8(黄色,37码)',
 					number: '',
-				}]
+				}],
+				type: 0,
+				companylist: ['尚宇公司', '浙江六牛'],
+				company: '请选择外发公司',
+				date: '请选择日期',
+				money: '',
+				bz: ''
 			};
 		},
-		onLoad() {},
+		onLoad(option) {
+			if (option.type) {
+				this.type = option.type
+				uni.setNavigationBarTitle({
+					title: '订单外发'
+				});
+			}
+		},
 		onShow() {},
 		onReachBottom() {},
 		onReady() {},
@@ -81,7 +128,14 @@
 				uni.navigateTo({
 					url
 				})
-			}
+			},
+			bindPickerCompany: function(e) {
+				this.company = this.companylist[e.target.value];
+			},
+			bindDateChange: function(e) {
+				this.date = e.detail.value;
+				console.log(e);
+			},
 		}
 	};
 </script>
@@ -99,9 +153,42 @@
 		padding: 32rpx 0;
 	}
 
+	.foreign {
+		margin: 20rpx auto 0;
+		width: 702rpx;
+		background: #FFFFFF;
+		border: 2px solid #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+
+		.foreign-item {
+			padding: 26rpx 18rpx 20rpx;
+			border-bottom: 1px solid #f5f5f5;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.foreign-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #222222;
+			}
+
+			.input {
+				text-align: right;
+				padding: 0 20rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+			}
+		}
+	}
+
 	.title {
 		padding: 20rpx;
-		margin: 0 auto;
+		margin: 20rpx auto 0;
 		width: 700rpx;
 		background: #FFFFFF;
 		border: 2px solid #EAECED;

+ 200 - 0
pages/leader/spot.vue

@@ -0,0 +1,200 @@
+<template>
+	<view class="content">
+		<view class="main" v-for="(item,index) in 10">
+			<view class="main-title flex">
+				<view class="main-id">产品货号:987654321025666</view>
+				<view class="main-type">待检验</view>
+			</view>
+			<view class="main-info">
+				<view class="main-name flex">
+					<view>
+						产品名称
+					</view>
+				</view>
+				<scroll-view scroll-x="true">
+					<view class="image-box">
+						<view class="image-item" v-for="(itm,ind) in 10">
+							<image src="../../static/img/user-item2.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="main-info flex">
+				<view class="main-name">
+					下料待检验:
+				</view>
+				<view class="btn-box">
+					<view class="btn gray" @click="navTo('/pages/order/record?type=1')">检验记录</view>
+					<view class="btn red" @click="navTo('/pages/leader/Addcheckout?type=1')">添加检验</view>
+				</view>
+			</view>
+			<view class="main-info flex">
+				<view class="main-name">
+					备料待检验:
+				</view>
+				<view class="btn-box">
+					<view class="btn gray" @click="navTo('/pages/order/record?type=2')">检验记录</view>
+					<view class="btn red" @click="navTo('/pages/leader/Addcheckout?type=2')">添加检验</view>
+				</view>
+			</view>
+			<view class="main-info flex">
+				<view class="main-name">
+					针车待检验:
+				</view>
+				<view class="btn-box">
+					<view class="btn gray" @click="navTo('/pages/order/record?type=3')">检验记录</view>
+					<view class="btn red" @click="navTo('/pages/leader/Addcheckout?type=3')">添加检验</view>
+				</view>
+			</view>
+			<view class="main-info flex">
+				<view class="main-name">
+					成型待检验:
+				</view>
+				<view class="btn-box">
+					<view class="btn gray" @click="navTo('/pages/order/record?type=4')">检验记录</view>
+					<view class="btn red" @click="navTo('/pages/leader/Addcheckout?type=4')">添加检验</view>
+				</view>
+			</view>
+			<view class="main-info flex" @click="navTo('/pages/leader/image')">
+				<view class="main-name">
+					查看参考图:
+				</view>
+				<view class="main-more">
+					<view class="main-font">
+						查看详细
+					</view>
+					<image class="jt" src="../../static/img/jt.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: []
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		padding: 34rpx 20rpx 0;
+		margin: 20rpx auto;
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+
+		.main-title {
+			padding: 0 14rpx 30rpx;
+
+			.main-id {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.main-type {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF2D2D;
+			}
+		}
+
+		.main-info {
+			padding: 14rpx 0;
+			border-top: 1px solid #EAECED;
+
+			.main-name {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #363636;
+			}
+
+			.image-box {
+				padding: 16rpx 10rpx 8rpx;
+				display: flex;
+				align-items: center;
+
+				.image-item {
+					margin-left: 10rpx;
+					width: 110rpx;
+					height: 110rpx;
+					flex-shrink: 0;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.btn-box {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+
+				.btn {
+					margin-left: 10rpx;
+					background: #FFFFFF;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					padding: 6rpx 16rpx;
+					border-radius: 60rpx;
+				}
+
+				.gray {
+					color: #999999;
+					border: 2px solid #EBEBEB;
+				}
+
+				.red {
+					color: #FF2D2D;
+					border: 2px solid #FF2D2D;
+				}
+			}
+
+			.main-more {
+				display: flex;
+				align-items: center;
+
+				.main-font {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-right: 10rpx;
+				}
+
+				.jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+	}
+</style>

+ 185 - 0
pages/leader/supervise.vue

@@ -0,0 +1,185 @@
+<template>
+	<view class="content">
+		<view class="main" v-for="(item,index) in 10">
+			<view class="main-num flex">
+				<view class="main-id">订单号:9876543211025666</view>
+				<view class="main-type">
+					进行中
+				</view>
+			</view>
+			<view class="main-name flex">
+				<view class="main-name">产品名称</view>
+				<view class="main-name">
+					数量:<text class="red">230</text>
+				</view>
+			</view>
+
+			<view class="main-info flex">
+				<scroll-view scroll-x="true" class="main-price">
+					<view class="image-box">
+						<view class="image-item" v-for="(itm,ind) in 10">
+							<image src="../../static/img/user-item2.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="main-more" @click="navTo('/pages/leader/superviseDetail')">
+					<view class="mainm-font">
+						查看详细
+					</view>
+					<image class="mainm-jt" src="../../static/img/jt.png" mode=""></image>
+				</view>
+			</view>
+			<view class="main-num flex">
+				<view class="mainnum-item">
+					进行阶段: <text class="bload">下料</text>
+				</view>
+				<view class="mainnum-item">
+					预警时间:<text class="bload">2023年04月30日</text>
+				</view>
+			</view>
+			<view class="btn-box">
+				<view class="box">主材状态:正常到货</view>
+				<view class="box">辅材状态:<text class="red">超时到货</text></view>
+				<view class="box">包材状态:正常到货</view>
+				<view class="box">订单状态:进行中</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin: 20rpx auto 0;
+		padding: 0 15rpx;
+		line-height: 1;
+
+		.main-id {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+
+		.main-type {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FF2D2D;
+		}
+
+		.main-name {
+			padding: 20rpx 14rpx 16rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #363636;
+		}
+
+		.main-info {
+			padding: 0 14rpx;
+
+			.main-price {
+				width: 480rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+			.main-more {
+				display: flex;
+				align-items: center;
+
+				.mainm-font {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.mainm-jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+
+		.main-num {
+			padding: 24rpx 14rpx 20rpx;
+			border-bottom: 1px solid #ededed;
+
+			.mainnum-item {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+			}
+		}
+
+		.red {
+			color: #FF4C4C
+		}
+
+		.btn-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			flex-wrap: wrap;
+			padding: 0 0 20rpx;
+
+			.box {
+				padding-left: 20rpx;
+				margin-top: 20rpx;
+				width: 50%;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+
+		}
+	}
+</style>

+ 134 - 0
pages/leader/superviseDetail.vue

@@ -0,0 +1,134 @@
+、<template>
+	<view class="content">
+		<view class="top"></view>
+		<view class="title-box">
+			<view class="title-item flex">
+				<view class="title-font">订单号:</view>
+				<view class="title-main">9876543211025666</view>
+			</view>
+			<view class="title-item flex">
+				<view class="title-font">名称:</view>
+				<view class="title-main">豆豆鞋</view>
+			</view>
+			<view class="title-item flex">
+				<view class="title-font">数量:</view>
+				<view class="title-main">2000</view>
+			</view>
+			<view class="title-item flex">
+				<view class="title-font">进行阶段:</view>
+				<view class="title-main">打样</view>
+			</view>
+			<view class="title-item flex">
+				<view class="title-font">阶段预警时间:</view>
+				<view class="title-main">2022年03月22日</view>
+			</view>
+		</view>
+		<view class="main-box flex">
+			<view class="main" v-for="(item,index) in 7">
+				<view class="main-title">下料:</view>
+				<view class="main-font">计划:2022年02月25日</view>
+				<view class="main-font">实际:2022年02月25日</view>
+				<view class="main-font">已完成数量:230</view>
+				<view class="main-font">剩余完成数量:653</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+		background: #ffffff;
+	}
+
+	.top {
+		width: 100%;
+		height: 20rpx;
+		background: #f8f8f8;
+	}
+
+	.title-box {
+		margin: 20rpx auto 0;
+		width: 702rpx;
+		background: #FFFFFF;
+		border: 2px dashed #EAECED;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		padding: 0 20rpx;
+
+		.title-item {
+			padding: 20rpx 0;
+			border-bottom: 2px dashed #EAECED;
+		}
+
+		.title-item:last-child {
+			border-bottom: none;
+		}
+
+		.title-font {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+		}
+
+		.title-main {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+
+	.main-box {
+		padding: 0 20rpx;
+		flex-wrap: wrap;
+
+		.main {
+			padding: 0 20rpx;
+			margin-top: 20rpx;
+			width: 342rpx;
+			background: #FFFFFF;
+			border: 2px dashed #EAECED;
+			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 20rpx;
+
+			.main-title {
+				padding: 20rpx 0;
+				border-bottom: 1px dashed #EAECED;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.main-font {
+				padding: 20rpx 0;
+				border-bottom: 1px dashed #EAECED;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.main-font:last-child {
+				border-bottom: none;
+			}
+		}
+	}
+</style>

+ 24 - 0
pages/scrap/add.vue

@@ -0,0 +1,24 @@
+<template>
+	<view class="content"></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	onLoad() {},
+	onShow() {},
+	onReachBottom() {},
+	onReady() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	min-height: 100%;
+	height: auto;
+}
+</style>

+ 211 - 0
pages/scrap/dispose.vue

@@ -0,0 +1,211 @@
+<template>
+	<view class="content">
+		<view class="main-item" v-for="(item,index) in 10" @click="navTo('/pages/scrap/processing')">
+			<view class="main-top flex">
+				<view class="main-top-left">
+					<image class="icon" src="../../static/icon/order-icon.png" mode=""></image>
+					<view class="title">
+						规格{{index}}(黄色,37码,数量3)
+					</view>
+				</view>
+				<view class="main-top-right">
+					<view class="type1" v-if="index%2==0">
+						未处理
+					</view>
+					<view class="type2" v-else>
+						已处理
+					</view>
+					<image class="jt" src="../../static/img/jt.png" mode=""></image>
+				</view>
+			</view>
+			<view class="main-info">
+				<scroll-view scroll-x="true" class="main-price">
+					<view class="image-box">
+						<view class="image-item" v-for="(itm,ind) in 4">
+							<image src="../../static/img/user-item2.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="main-bottom flex">
+				<view class="main-bottom-item">
+					处理金额:
+				</view>
+				<view class="main-bottom-item red">
+					¥0
+				</view>
+			</view>
+		</view>
+		<view class="all flex">
+			<view class="all-item">
+				总金额:
+			</view>
+			<view class="all-item all">
+				¥1000
+			</view>
+		</view>
+		<view class="btn">
+			提交处理
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.main-item {
+		margin: 20rpx auto 0;
+		width: 702rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 24rpx 16rpx 0;
+
+		.main-top {
+			padding: 0 14rpx 0 8rpx;
+
+			.main-top-left {
+				display: flex;
+				align-items: center;
+
+				.icon {
+					width: 74rpx;
+					height: 74rpx;
+					border-radius: 50%;
+				}
+
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #323333;
+					margin-left: 16rpx;
+				}
+			}
+
+			.main-top-right {
+				display: flex;
+				align-items: center;
+
+				.type1 {
+					margin-right: 10rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF4C4C;
+				}
+
+				.type2 {
+					margin-right: 10rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #323333;
+				}
+
+				.jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+
+		.main-info {
+			padding: 20rpx 14rpx 30rpx;
+			border-bottom: 1px solid #f6f6f6;
+
+			.main-price {
+				width: 100%;
+
+				.image-box {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+		}
+
+		.main-bottom {
+			padding: 24rpx 15rpx 24rpx 10rpx;
+
+			.main-bottom-item {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #363636;
+			}
+
+			.red {
+				color: #FF4C4C;
+			}
+		}
+	}
+
+	.all {
+		margin: 20rpx auto 0;
+		width: 702rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 30rpx;
+
+		.all-item {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #323333;
+		}
+
+		.red {
+			color: #FF4C4C;
+		}
+	}
+
+	.btn {
+		margin: 60rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		text-align: center;
+		line-height: 85rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+</style>

+ 1 - 1
pages/leader/gxlist.vue → pages/scrap/gxlist.vue

@@ -6,7 +6,7 @@
 				<view class=" input-content flex">
 					<view class="iconfont iconsearch"></view>
 					<view class="input"><input type="text" placeholder-class="place" v-model="name"
-							placeholder="请输入搜索门店名字" />
+							placeholder="请输入关键词搜索" />
 					</view>
 					<view class="btn" @click="search">
 						搜索

+ 206 - 0
pages/scrap/processing.vue

@@ -0,0 +1,206 @@
+<template>
+	<view class="content">
+		<view class="box"></view>
+		<view class="main-title">
+			<image class="title-icon" src="../../static/icon/order.png" mode=""></image>
+			<view class="title">
+				规格1(<text class="red">黄色,37码,3双</text>)
+			</view>
+		</view>
+		<view class="main">
+			<view class="main-item">
+				<view class="main-item-item flex">
+					<view class="main-item-font">检验员:</view>
+					<view class="main-item-font">李丹丹</view>
+				</view>
+				<view class="main-item-item flex">
+					<view class="main-item-font">提交人:</view>
+					<view class="main-item-font">林一</view>
+				</view>
+				<view class="main-item-item flex">
+					<view class="main-item-font">类别:</view>
+					<view class="main-item-font">组长</view>
+				</view>
+			</view>
+			<view class="main-item">
+				<view class="main-item-item flex">
+					<view class="main-item-type">类型:</view>
+					<view class="main-item-font">返工</view>
+				</view>
+				<view class="main-item-item flex">
+					<view class="main-item-type">数量:</view>
+					<input type="number" class="main-item-type right" placeholder="请填写数量">
+				</view>
+				<view class="main-item-item fcenter">
+					<image class="main-icon" src="../../static/icon/add-b.png" mode=""></image>
+					<view class="main-item-font mleft">
+						添加材料
+					</view>
+				</view>
+				<view class="main-item-item fcenter" @click="navTo('/pages/scrap/gxlist')">
+					<image class="main-icon" src="../../static/icon/add-b.png" mode=""></image>
+					<view class="main-item-font mleft">
+						添加工序
+					</view>
+				</view>
+				<view class="main-item-item fcenter">
+					<image class="main-icon" src="../../static/icon/add-b.png" mode=""></image>
+					<view class="main-item-font mleft">
+						添加责任人
+					</view>
+				</view>
+			</view>
+			<view class="main-item">
+				<view class="main-item-item flex">
+					<view class="main-item-type">类型:</view>
+					<view class="main-item-font">报废</view>
+				</view>
+				<view class="main-item-item flex">
+					<view class="main-item-type">数量:</view>
+					<input type="number" class="main-item-type right" placeholder="请填写数量">
+				</view>
+				<view class="main-item-item fcenter">
+					<image class="main-icon" src="../../static/icon/add-b.png" mode=""></image>
+					<view class="main-item-font mleft">
+						添加责任人
+					</view>
+				</view>
+			</view>
+			<view class="main-item">
+				<view class="main-item-item fcenter">
+					<image class="main-icon" src="../../static/icon/add-c.png" mode=""></image>
+					<view class="main-item-font mleft">
+						添加处理
+					</view>
+				</view>
+			</view>
+			<view class="btn">
+				保存提交
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady() {},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+		background: #ffffff;
+	}
+
+	.box {
+		width: 100%;
+		height: 20rpx;
+		background: #f8f8f8;
+	}
+
+	.main-title {
+		padding: 20rpx 48rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #eaeced;
+
+		.title-icon {
+			width: 32rpx;
+			height: 37rpx;
+		}
+
+		.title {
+			margin-left: 10rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.red {
+			color: #FF4C4C;
+		}
+	}
+
+	.main {
+		padding: 0 24rpx;
+
+		.main-item {
+			margin-top: 20rpx;
+			padding: 0 20rpx;
+			width: 100%;
+			background: #FFFFFF;
+			border: 2px solid #EAECED;
+			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 20rpx;
+
+			.main-item-item {
+				padding: 20rpx 0;
+				border-bottom: 1px dashed #EAECED;
+
+				.main-item-font {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #323333;
+				}
+
+				.mleft {
+					margin-left: 10rpx;
+				}
+
+				.main-item-type {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+
+				.right {
+					text-align: right;
+				}
+
+				.main-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.fcenter {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+
+	.btn {
+		margin: 100rpx auto 0;
+		width: 622rpx;
+		height: 85rpx;
+		background: #069CFA;
+		border-radius: 15rpx;
+		text-align: center;
+		line-height: 85rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+</style>

+ 379 - 0
pages/scrap/scrap.vue

@@ -0,0 +1,379 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex == index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height  }" class="swiper-box" duration="300"
+			@change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<view class="main" v-for="(item,index) in 10">
+						<view class="main-id flex">
+							<view class="">产品货号:9876543211025666</view>
+							<view class="type1" v-if="tabCurrentIndex != 3">
+								{{tabCurrentIndex ==2?'未同意':'未分责'}}
+							</view>
+							<view class="type2" v-else>
+								已分责
+							</view>
+						</view>
+						<view class="main-name flex">
+							<view class="">产品名称</view>
+						</view>
+						<view class="main-info flex">
+							<scroll-view scroll-x="true" class="main-price">
+								<view class="image-box">
+									<view class="image-item" v-for="(itm,ind) in 10">
+										<image src="../../static/img/user-item2.png" mode=""></image>
+									</view>
+								</view>
+							</scroll-view>
+							<view class="main-more">
+								<view class="mainm-font">
+									查看详细
+								</view>
+								<image class="mainm-jt" src="../../static/img/jt.png" mode=""></image>
+							</view>
+						</view>
+						<view class="main-num flex" v-if="tabCurrentIndex !=0 && tabCurrentIndex!=1">
+							<view class="mainnum-item">
+								处理时间:2022年10月30日
+							</view>
+							<view class="mainnum-item">
+								金额:<text class="red">¥200</text>
+							</view>
+						</view>
+						<view class="main-num flex" v-if="tabCurrentIndex ==3">
+							<view class="mainnum-item">
+								处理数量: <text class="red">285</text>
+							</view>
+							<view class="mainnum-item">
+								处理人:李丹丹
+							</view>
+						</view>
+						<view class="main-num flex">
+							<view class="mainnum-item">
+								检验员:拉丹丹
+							</view>
+							<view class="mainnum-item">
+								提交人:李丹丹(组长)
+							</view>
+						</view>
+						<view class="main-num flex" v-if="tabCurrentIndex ==3">
+							<view class="mainnum-item gray">
+								责任人1(李丹丹):
+							</view>
+							<view class="mainnum-item red">
+								20%
+							</view>
+						</view>
+						<view class="main-num flex" v-if="tabCurrentIndex ==3">
+							<view class="mainnum-item gray">
+								责任人2(李丹丹):
+							</view>
+							<view class="mainnum-item red">
+								80%
+							</view>
+						</view>
+						<view class="main-tip" v-if="tabCurrentIndex ==2">
+							反馈理由:责任分配不对,请重新填写,李丹丹的责任应为20%,请重新修改。
+						</view>
+						<view class=" bottom flex" v-if="tabCurrentIndex !=3">
+							<view class="bottom-font">
+								{{tabCurrentIndex==2?'处理数量':'不合格数量'}}:<text class="red">285</text>
+							</view>
+							<view class="btn-box" @click.stop="navTo('/pages/scrap/dispose')">
+								<view class="box2">
+									{{tabCurrentIndex==2?'修改处理':'立即处理'}}
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<!-- 订单列表 -->
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				height: '',
+				navList: [{
+						state: 1,
+						text: '全部',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '未分责',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 3,
+						text: '处理中',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 4,
+						text: '已分责',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+				],
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		methods: {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: #999999;
+			position: relative;
+
+			&.current {
+				color: #333333;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #FF4C4C;
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		padding-top: 10rpx;
+	}
+
+	.main {
+		width: 700rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin: 20rpx auto 0;
+		padding: 0 15rpx;
+		line-height: 1;
+
+		.main-id {
+			padding: 35rpx 14rpx 30rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			border-bottom: 1px solid #ededed;
+		}
+
+		.type1 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FF2D2D;
+		}
+
+		.type2 {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+
+		.main-name {
+			padding: 20rpx 14rpx 16rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #363636;
+		}
+
+		.main-info {
+			padding: 0 14rpx;
+
+			.main-price {
+				width: 480rpx;
+
+				.image-box {
+					display: flex;
+					align-items: center;
+
+					.image-item {
+						margin-left: 10rpx;
+						width: 110rpx;
+						height: 110rpx;
+						flex-shrink: 0;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+			.main-more {
+				display: flex;
+				align-items: center;
+
+				.mainm-font {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.mainm-jt {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+		}
+
+		.main-num {
+			padding: 24rpx 14rpx 20rpx;
+			border-bottom: 1px solid #ededed;
+
+			.mainnum-item {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.red {
+				color: #FF4C4C
+			}
+
+			.gray {
+				color: #666666;
+			}
+		}
+
+		.main-tip {
+			padding: 24rpx 14rpx 20rpx;
+			border-bottom: 1px solid #ededed;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			line-height: 1.5;
+		}
+
+		.bottom {
+			padding: 20rpx 0;
+
+
+			.btn-box {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+			}
+
+			.bottom-font {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+
+				.red {
+					color: #FF4C4C
+				}
+			}
+
+
+			.box2 {
+				margin-left: 10rpx;
+				width: 144rpx;
+				height: 55rpx;
+				border: 2px solid #FF2D2D;
+				border-radius: 28rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF2D2D;
+			}
+		}
+	}
+</style>

+ 173 - 0
pages/user/sfjl.vue

@@ -0,0 +1,173 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex == index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height  }" class="swiper-box" duration="300"
+			@change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-else v-for="(item, index) in 10" :key="index" class="order-item flex">
+						<view class="main-left">
+							<view class="main-title">
+								标题
+							</view>
+							<view class="main-time">
+								2019-06-09 13:00:00
+							</view>
+						</view>
+						<view class="main-right">
+							¥200
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				height: '',
+				navList: [{
+						state: 1,
+						text: '奖励记录',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
+					{
+						state: 2,
+						text: '处罚记录',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					}
+				],
+			};
+		},
+		onLoad() {},
+		onShow() {},
+		onReachBottom() {},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		methods: {
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		min-height: 100%;
+		height: auto;
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: #999999;
+			position: relative;
+
+			&.current {
+				color: #333333;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #FF4C4C;
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		padding-top: 10rpx;
+
+		.order-item {
+			background: #ffffff;
+			padding: 28rpx 24rpx 22rpx;
+			border-bottom: 1px solid #F0F0F0;
+
+			.main-left {
+				line-height: 1;
+
+				.main-title {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.main-time {
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.main-right {
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF0000;
+			}
+		}
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+</style>

+ 19 - 6
pages/user/user.vue

@@ -88,7 +88,7 @@
 						name: '外发检验订单',
 						tip: '订单外发处理',
 						bg: '../../static/img/user-item1.png',
-						src: '/pages/order/foreignOrder'
+						src: '/pages/foreign/foreignOrder'
 					},
 					{
 						icon: '../../static/icon/u4.png',
@@ -115,26 +115,30 @@
 						icon: '../../static/icon/u7.png',
 						name: '奖罚记录',
 						tip: '奖励 | 处罚记录',
-						bg: '../../static/img/user-item2.png'
+						bg: '../../static/img/user-item2.png',
+						src: '/pages/user/sfjl'
 					},
 					{
 						icon: '../../static/icon/u8.png',
 						name: '订单监管',
 						tip: '订单详情',
-						bg: '../../static/img/user-item2.png'
+						bg: '../../static/img/user-item2.png',
+						src: '/pages/leader/supervise'
 					},
 					{
 						icon: '../../static/icon/u9.png',
 						name: '待处理办件',
 						tip: '处罚 | 报废返工处理',
 						bg: '../../static/img/user-item1.png',
-						num: 2
+						num: 2,
+						src: '/pages/leader/pending'
 					},
 					{
 						icon: '../../static/icon/u10.png',
 						name: '外发不合格处理',
 						tip: '订单外发处理',
 						bg: '../../static/img/user-item2.png',
+						src: '/pages/foreign/forOrder',
 						num: 2
 					},
 					{
@@ -142,6 +146,7 @@
 						name: '处罚管理',
 						tip: '奖励 | 处罚记录',
 						bg: '../../static/img/user-item1.png',
+						src: '/pages/leader/punish',
 						num: 2
 					},
 					{
@@ -149,19 +154,22 @@
 						name: '报废返工处理',
 						tip: '提交报废返工的数量',
 						bg: '../../static/img/user-item1.png',
+						src: '/pages/scrap/scrap',
 						num: 2
 					},
 					{
 						icon: '../../static/icon/u13.png',
 						name: '外发订单管理',
 						tip: '提交检验 | 检验记录',
-						bg: '../../static/img/user-item2.png'
+						bg: '../../static/img/user-item2.png',
+						src: '/pages/foreign/administration'
 					},
 					{
 						icon: '../../static/icon/u14.png',
 						name: '外发不合格通知',
 						tip: '外发不合格消息',
 						bg: '../../static/img/user-item2.png',
+						src: '/pages/inform/wp',
 						num: 2
 					},
 					{
@@ -169,6 +177,7 @@
 						name: '订单状态预警',
 						tip: '订单到期时间预警',
 						bg: '../../static/img/user-item1.png',
+						src: '/pages/inform/dd',
 						num: 2
 					},
 					{
@@ -176,6 +185,7 @@
 						name: '材料未到通知',
 						tip: '材料未到预警',
 						bg: '../../static/img/user-item1.png',
+						src: '/pages/inform/cl',
 						num: 2
 					},
 					{
@@ -183,6 +193,7 @@
 						name: '外发未到通知',
 						tip: '外发时间到期预警',
 						bg: '../../static/img/user-item2.png',
+						src: '/pages/inform/wpwd',
 						num: 2
 					},
 					{
@@ -190,13 +201,15 @@
 						name: '订单外发',
 						tip: '订单外发给合作公司',
 						bg: '../../static/img/user-item2.png',
+						src: '/pages/leader/outgoing',
 						num: 2
 					},
 					{
 						icon: '../../static/icon/u19.png',
 						name: '订单抽检',
 						tip: '订单抽取检验',
-						bg: '../../static/img/user-item1.png'
+						bg: '../../static/img/user-item1.png',
+						src: '/pages/leader/spot',
 					},
 				]
 			};

BIN
static/icon/add-b.png


BIN
static/icon/add-c.png


BIN
static/icon/add.png


BIN
static/icon/order-icon.png


BIN
static/icon/rsyj.png


BIN
static/icon/wptz.png


BIN
static/icon/wpwd.png


BIN
static/icon/ysyj.png