需求微调

components/commons-select-time/index2.vue

@@ -0,0 +1,132 @@
+<template>
+	
+	<view>
+		<view class="" style="height:1rpx"> 
+			
+		</view>
+		<view class="picker-warp">
+			<view class="left-icon" @click="nextDate(-1)">
+				<uni-icons type="back" size="30"></uni-icons>
+				
+			</view>
+			<view class="picker-content">
+				<uni-datetime-picker type="date" :clear-icon="false" v-model="dateNum" @change="maskClick" />
+			</view>
+			<view class="right-icon"  @click="nextDate(1)">
+				<uni-icons type="forward" size="30"></uni-icons>
+			</view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import {format} from '../../util/uitl.js'
+	export default {
+		props: {
+			date: {
+				type: String,
+				default:null
+				
+			}
+		},
+		watch: {
+
+			value: {
+				handler() {
+					this.$emit("input", this.value)
+				},
+				deep: true,
+				immediate: true,
+			},
+		},
+		data() {
+			return {
+				dateNum:this.date,
+				typeList:[{
+					name:"本日",
+					type:0,
+				},{
+					name:"昨日",
+					type:1,
+				},{
+					name:"本周",
+					type:2,
+				},{
+					name:"上周",
+					type:3,
+				},{
+					name:"本月",
+					type:4,
+				},{
+					name:"上月",
+					type:5,
+				}],
+				modalTimeList:[
+					{
+						name:"昨日",
+						type:1,
+					},{
+						name:"前日",
+						type:2,
+					},{
+						name:"上周",
+						type:3,
+					},{
+						name:"上月",
+						type:4,
+					},{
+						name:"近三个月",
+						type:5,
+					},{
+						name:"近半年",
+						type:6,
+					}
+				],
+				modalTimeType:null,
+			}
+		},
+		methods:{
+			maskClick(e){
+				this.$emit('change', e)
+			},
+			nextDate(num){
+				
+				this.dateNum = this.getNextDate(this.dateNum,num)
+				this.$emit('change', this.dateNum)
+			},
+			getNextDate(date, day) { 
+			　　var dd = new Date(date);
+			　　dd.setDate(dd.getDate() + day);
+			　　var y = dd.getFullYear();
+			　　var m = dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
+			　　var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
+			　　return y + "-" + m + "-" + d;
+			}
+		},
+		created() {
+			console.log()
+		},
+	}
+</script>
+
+<style lang="less">
+	.picker-content{
+		
+	}
+	.picker-warp{
+		display: flex;
+		background-color: #fff;
+		margin: 10rpx 30rpx;
+		.left-icon,.right-icon{
+			width: 10%;
+			text-align: center;
+			position: relative;
+			top: 10rpx;
+		}
+		.picker-content{
+			width: 80%;
+		}
+		
+	}
+</style>

pages.json

@@ -172,6 +172,13 @@
 			}
 		},
 		{
+			"path": "pages/total/personalStat",
+			"style": {
+				"navigationBarTitleText": "个人面料概况"
+			}
+		},
+		
+		{
 			"path": "pages/total/summary",
 			"style": {
 				"navigationBarTitleText": "面料库存详情"
@@ -222,6 +229,13 @@
 			}
 		},
 		{
+			"path": "pages/usedTotal/materialReceiving",
+			"style": {
+				"navigationBarTitleText": "待物料接收"
+			}
+		},
+		
+		{
 			"path": "pages/submit/submit",
 			"style": {
 				"navigationBarTitleText": "面料问题反馈"

pages/home.vue

@@ -32,6 +32,12 @@
 						库存统计
 					</view>
 				</view>
+				<view class="menu-list-box" @click="toRouter('/total/personalStat')">
+					<image :src="'../static/czzj.png'" mode=""></image>
+					<view class="">
+						个人面料概况
+					</view>
+				</view>
 			</view>
 		</uni-card>
 		<uni-card>
@@ -45,6 +51,12 @@
 						物料接收
 					</view>
 				</view>
+				<view class="menu-list-box" @click="toRouter('/usedTotal/materialReceiving')" v-if="isRoom3">
+					<image :src="'../static/kcpd.png'" mode=""></image>
+					<view class="">
+						待物料接收
+					</view>
+				</view>
 				<view class="menu-list-box" @click="toRouter('/usedTotal/return-warehouse')">
 					<image :src="'../static/tc.png'" mode=""></image>
 					<view class="">
@@ -57,12 +69,12 @@
 						面料修正
 					</view>
 				</view>
-				<view class="menu-list-box" @click="toRouter('/materialTransfer/materialTransfer')">
+				<!-- <view class="menu-list-box" @click="toRouter('/materialTransfer/materialTransfer')">
 					<image :src="'../static/xcjj.png'" mode=""></image>
 					<view class="">
 						面料转仓
 					</view>
-				</view>
+				</view> -->
 				<view class="menu-list-box" @click="toRouter('/materialTransfer/transferCompositeList')"  v-if="isRoom2">
 					<image :src="'../static/fh.png'" mode=""></image>
 					<view class="">
@@ -90,6 +102,7 @@
 				notificationData: [],
 				isRoom: false,
 				isRoom2:false,
+				isRoom3:false,
 			}
 		},
 		onLoad() {
@@ -115,6 +128,12 @@
 				Vue.prototype.$token.role_id == '1552548151620026370') {
 				this.isRoom2 = true
 			}
+			if (
+				Vue.prototype.$token.role_id == '1552548151620026370' ||
+				Vue.prototype.$token.role_id == '1552550978346041346' ||
+				Vue.prototype.$token.role_id == '1580170639715688449') {
+				this.isRoom3 = true
+			}
 			// v.$post('/wx/login/getUserInfo').then(res => {
 			// 	v.userInfoData = res.data
 			// 	Vue.prototype.$userInfo = res.data

pages/materialTransfer/materialTransfer.vue

@@ -177,7 +177,13 @@
 			},
 			getBackUser() {
 				this.$post('/stockBack/getBackUser', {}).then(res => {
-					this.selectOneList = res.data.A007.concat(res.data.A008, res.data.A012)
+					this.selectOneListCopy = res.data.A007.concat(res.data.A008, res.data.A012)
+					this.selectOneList = []
+					for (var i = 0; i < this.selectOneListCopy.length; i++) {
+						if(this.selectOneListCopy[i].account != this.req.userId){
+							this.selectOneList.push(this.selectOneListCopy[i])
+						}
+					}
 				})
 			},
 			tabChange(_type) {

pages/total/personalStat.vue

@@ -0,0 +1,300 @@
+<template>
+	<view class="personalStat">
+		<view class="header-banner">
+			<view @click="headerNavType = 1" :class="headerNavType == 1 ? 'active' : ''">
+				领料
+			</view>
+			<view  @click="headerNavType = 2" :class="headerNavType == 2 ? 'active' : ''">
+				退料
+			</view>
+			<view  @click="headerNavType = 3" :class="headerNavType == 3 ? 'active' : ''">
+				转入
+			</view>
+			<view  @click="headerNavType = 4" :class="headerNavType == 4 ? 'active' : ''">
+				转出
+			</view>
+		</view>
+		<commons-select-time :date="req.date" @change="changeTime"></commons-select-time>
+		<view class="" v-if="headerNavType === 1">
+			
+			<!-- 墨水库存汇总 -->
+			<view style="margin: 0 30rpx 30rpx;font-size: 12rpx;background:#fff" v-for="(i,index) in issueData" :key="index">
+				<view class="form-text">
+					<view class="">
+						物料名称：{{i.materialName}}
+					</view>
+					<view class="">
+						物料编码：{{i.materialCode}}
+					</view>
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" >
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th width="150rpx" align="left">卷数 {{i.count}}</uni-th>
+						<uni-th width="150rpx" align="left">米数 {{i.quantity}}</uni-th>
+						<uni-th width="150rpx" align="left">面积 {{i.area}}</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(j,jindex) in i.materialList" :key="jindex">
+						<uni-td><view  >卷{{jindex + 1}}</view></uni-td>
+						<uni-td><view  >{{j.quantity}}</view></uni-td>
+						<uni-td><view  >****{{j.rfid.slice(18,24)}}</view></uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</view>
+		<view class="" v-if="headerNavType === 2">
+			
+			<!-- 墨水库存汇总 -->
+			<view style="margin: 0 30rpx 30rpx;font-size: 12rpx;background:#fff" v-for="(i,index) in materialReturnData" :key="index">
+				<view class="form-text">
+					<view class="">
+						物料名称：{{i.materialName}}
+					</view>
+					<view class="">
+						物料编码：{{i.materialCode}}
+					</view>
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" >
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th width="150rpx" align="left">卷数 {{i.count}}</uni-th>
+						<uni-th width="150rpx" align="left">米数 {{i.quantity}}</uni-th>
+						<uni-th width="150rpx" align="left">面积 {{i.area}}</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(j,jindex) in i.materialList" :key="jindex">
+						<uni-td><view  >卷{{jindex + 1}}</view></uni-td>
+						<uni-td><view  >{{j.quantity}}</view></uni-td>
+						<uni-td><view  >****{{j.rfid.slice(18,24)}}</view></uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</view>
+		<view class="" v-if="headerNavType === 3">
+			
+			<!-- 墨水库存汇总 -->
+			<view style="margin: 0 30rpx 30rpx;font-size: 12rpx;background:#fff" v-for="(i,index) in transferInData" :key="index">
+				<view class="form-text">
+					<view class="">
+						物料名称：{{i.materialName}}
+					</view>
+					<view class="">
+						物料编码：{{i.materialCode}}
+					</view>
+					<view class="">
+						提交人：{{i.submitUser}}
+					</view>
+					<view class="">
+						接收人：{{i.receiveUser}}
+					</view>
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" >
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th width="150rpx" align="left">卷数 {{i.count}}</uni-th>
+						<uni-th width="150rpx" align="left">米数 {{i.quantity}}</uni-th>
+						<uni-th width="150rpx" align="left">面积 {{i.area}}</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(j,jindex) in i.materialList" :key="jindex">
+						<uni-td><view  >卷{{jindex + 1}}</view></uni-td>
+						<uni-td><view  ></view></uni-td>
+						<uni-td><view  >{{j.quantity}}</view></uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</view>
+		<view class="" v-if="headerNavType === 4">
+			
+			<!-- 墨水库存汇总 -->
+			<view style="margin: 0 30rpx 30rpx;font-size: 12rpx;background:#fff" v-for="(i,index) in transferOutData" :key="index">
+				<view class="form-text">
+					<view class="">
+						物料名称：{{i.materialName}}
+					</view>
+					<view class="">
+						物料编码：{{i.materialCode}}
+					</view>
+					<view class="">
+						提交人：{{i.submitUser}}
+					</view>
+					<view class="">
+						接收人：{{i.receiveUser}}
+					</view>
+				</view>
+				<uni-table border stripe emptyText="暂无更多数据" >
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th width="150rpx" align="left">卷数 {{i.count}}</uni-th>
+						<uni-th width="150rpx" align="left">米数 {{i.quantity}}</uni-th>
+						<uni-th width="150rpx" align="left">面积 {{i.area}}</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(j,jindex) in i.materialList"  :key="jindex">
+						<uni-td><view  >卷{{jindex + 1}}</view></uni-td>
+						<uni-td><view  ></view></uni-td>
+						<uni-td><view  >{{j.quantity}}</view></uni-td>
+					</uni-tr>
+				</uni-table>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import commonsSelectTime from '../../components/commons-select-time/index2.vue'
+	import {format} from '../../util/uitl.js'
+	import {
+	    getInfo
+	} from "@/util/api.js";
+	export default {
+		components:{
+			commonsSelectTime
+		},
+		data() {
+			return {
+				headerNavType:1,
+				
+				req:{
+					account:null,
+					date:format(new Date()).slice(0,10),
+					//date:'2022-10-11'
+				},
+				issueData:[],
+				materialReturnData:[],
+				transferInData:[],
+				transferOutData:[],
+			}
+		},
+		onLoad(option) {
+			const v = this
+			uni.getStorage({
+				key: 'Authorization',
+				success: function (res) {
+					//v.req.account = 2207003
+					v.req.account = res.data.account
+					v.getList()
+				}
+			});
+		},
+		methods: {
+			changeTime(e){
+				this.req.date = e
+				this.getList()
+			},
+
+			timeChangeFn(){
+				console.log(this.req)
+			},
+			toRouter(url){
+				console.log(123123)
+				uni.navigateTo({
+					url: '/pages' + url
+				})
+			},
+			//出库汇总
+			getList(){
+				const v = this
+				v.$post('/stockWater/issue',v.req).then(res=>{
+					v.issueData = res.data
+				})
+				v.$post('/stockWater/materialReturn',v.req).then(res=>{
+					v.materialReturnData = res.data
+				})
+				v.$post('/stockWater/transferIn',v.req).then(res=>{
+					v.transferInData = res.data
+				})
+				
+				v.$post('/stockWater/transferOut',v.req).then(res=>{
+					v.transferOutData = res.data
+				})
+			},
+			
+			
+		},
+	}
+</script>
+<style>
+	.personalStat .picker-content{
+		text-align: center;
+	}
+	.personalStat .uni-table-th.table--border{
+		border-top: 1px solid #000;
+	}
+	.personalStat .uni-table-th{
+		border-color: black;
+		color: #333;
+		font-weight: 500;
+	}
+	.personalStat .uni-table-th,.personalStat  .table--border{
+		border-right:none!important;
+	}
+	.personalStat .uni-date-x--border{
+		border:none!important;
+	}
+</style>
+<style lang="less">
+	.form-text{
+		font-size: 28rpx;
+		line-height: 60rpx;
+		background-color: #fff;
+		padding-left: 20rpx;
+	}
+	.commons-time-box{
+		display: flex;
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 24rpx;
+		margin:30rpx;
+		border:1px solid #dcdcdc;
+		border-radius: 8rpx;
+		.time-box{
+			width: 15%;
+			text-align: center;
+		}
+		.time-box-icon{
+			width: 10%;
+		}
+		.time-box.active{
+			background-color: #487CFF;
+			color: #fff;
+		}
+	}
+	.uni-data-checklist{
+		margin-top: 10rpx;
+		padding:16rpx 10rpx;
+	}
+	.uni-table-td{
+		font-size: 24rpx!important;
+	}
+	.uni-data-checklist .checklist-group .checklist-box{
+		margin-right: 20rpx!important;
+	}
+	.personalStat {
+		background-color: #f1f1f1;
+		min-height: 100vh;
+		color: #333;
+		.header-banner {
+			display: flex;
+			justify-content: center;
+			border-bottom: 1px solid #dcdcdc;
+			
+			view {
+				width: 40%;
+				text-align: center;
+				height: 100rpx;
+				line-height: 100rpx;
+				color: #333;
+				margin: 0 5%;
+			}
+
+			.active {
+				color: #487CFF;
+				border-bottom: 2px solid #487CFF;
+			}
+		}
+
+		
+	}
+</style>

pages/usedTotal/materialReceiving.vue

@@ -0,0 +1,136 @@
+<template>
+	<view class="materialReceiving">
+		<view class="radio">
+			<uni-data-checkbox v-model="type" :localdata="typeList"></uni-data-checkbox>
+		</view>
+		<ul>
+			<li v-for="i in listData" :key="i.id" v-if="i.status == type || type == 0">
+				<view class="text-content" style="padding: 0 20rpx;">
+					<view class="">
+						物料编码：{{i.materialCode}}
+					</view>
+					<view class="">
+						物料名称：{{i.materialName}}
+					</view>
+					<view class="" style="overflow: hidden;">
+						出库时间：{{i.submitTime}}
+						<span class="right-text">数量 <e style="color: #EF0000;">{{i.quantity}}</e></span>
+					</view>
+					<view class="" style="border-bottom: 1px solid #979797;overflow: hidden;">
+						出库人员：{{i.submitUserName}}
+						<span class="right-text">接收人员: {{i.receiveUserName}}</span>
+					</view>
+				</view>
+				<view class="list-btn-box">
+					<span>
+						待接收
+					</span>
+					<view class="canle" v-if="i.status == 4" @click="ignore(i.id)">
+						忽略
+					</view>
+				</view>
+			</li>
+		</ul>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				type:0,
+				typeList:[{
+					text: '全部',
+					value: 0
+				},{
+					text: '待接收',
+					value: 2
+				}, {
+					text: '已驳回',
+					value: 4
+				}],
+				listData:[],
+				account:null,
+			}
+		},
+		methods:{
+			
+			getList(account){
+				const v =this
+				v.$post('/materialReceiving/toBeReceivedList',{
+					submitUserAccount:account
+				}).then(res=>{
+					v.listData = res.data
+				})
+			},
+			ignore(id){
+				const v = this
+				v.$post('/materialReceiving/ignore',{
+					id:id
+				}).then(res=>{
+					if(res.code == 200){
+						uni.showToast({
+							title: '操作成功'
+						})
+						this.getList(v.account)
+					}
+					
+				})
+			},
+		},
+		onLoad(){
+			const v = this
+			uni.getStorage({
+				key: 'Authorization',
+				success: function (res) {
+					v.account = res.data.account
+					v.getList(v.account)
+				}
+			});
+			
+		},
+	}
+</script>
+
+<style lang="less">
+	.materialReceiving{
+		min-height: 100vh;
+		background: #f2f2f2;
+		.radio{
+			
+			padding: 20rpx 30rpx;
+		}
+		ul{
+			padding: 0 20rpx;
+			li{
+				background: #fff;
+				margin-bottom: 36rpx;
+				line-height: 70rpx;
+				font-size: 28rpx;
+				.right-text{
+					float: right;
+					display: inline-block;
+					width: 240rpx;
+				}
+				.list-btn-box{
+					height: 80rpx;
+					line-height: 80rpx;
+					color: #EF0000;
+					padding-left: 60rpx;
+					
+					.canle{
+						float: right;
+						margin: 10rpx 26rpx 10rpx 0;
+						background-color: #EF0000;
+						color: #fff;
+						line-height: 60rpx;
+						height: 60rpx;
+						width: 170rpx;
+						text-align: center;
+						border-radius: 10rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/usedTotal/warehouse-list.vue

@@ -10,13 +10,13 @@
 					物料名称：{{i.materialName}}
 				</view>
 				<view class="line">
-					出库时间：{{i.createTime}}
+					出库时间：{{i.submitTime}}
 					<view class="span">
-						数量：<span style="color:red">{{i.changeName}}</span>
+						数量：<span style="color:red">{{i.quantity}}</span>
 					</view>
 				</view>
 				<view class="line">
-					接收人员：{{i.realName}}
+					接收人员：{{i.receiveUserName}}
 				</view>
 				<view class="btn-warp">
 					<button @click="operation(4,i.id)">退回</button>
@@ -62,7 +62,7 @@
 					idList = [_id]
 				}
 				console.log(idList,operation)
-				v.$post('/materialReceive/operation',{
+				v.$post('/materialReceiving/operation',{
 					idList: idList,
 					operation:operation,
 				}).then(res=>{
@@ -79,8 +79,8 @@
 				uni.getStorage({
 					key: 'Authorization',
 					success: function (res) {
-						v.$post('/materialReceive/list',{
-							account:res.data.account
+						v.$post('/materialReceiving/list',{
+							receiveUserAccount:res.data.account
 						}).then(res=>{
 							console.log(res)
 							v.dataList = res.data

unpackage/dist/build/mp-weixin/app.json

@@ -25,6 +25,7 @@
     "pages/shiftHandover/shiftHandover",
     "pages/succession/succession",
     "pages/total/total",
+    "pages/total/personalStat",
     "pages/total/summary",
     "pages/total/warehouseDtl",
     "pages/total/warehousingDtl",
@@ -33,6 +34,7 @@
     "pages/usedTotal/summary",
     "pages/usedTotal/warehouseDtl",
     "pages/usedTotal/warehousingDtl",
+    "pages/usedTotal/materialReceiving",
     "pages/submit/submit",
     "pages/usedTotal/return-warehouse",
     "pages/usedTotal/fabric-correction",

unpackage/dist/build/mp-weixin/components/commons-select-time/index2.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons",
+    "uni-datetime-picker": "/node-modules/@dcloudio/uni-ui/lib/uni-datetime-picker/uni-datetime-picker"
+  }
+}

unpackage/dist/build/mp-weixin/components/commons-select-time/index2.wxml

@@ -0,0 +1 @@
+<view><view style="height:1rpx;"></view><view class="picker-warp"><view data-event-opts="{{[['tap',[['nextDate',[-1]]]]]}}" class="left-icon" bindtap="__e"><uni-icons vue-id="10f0d256-1" type="back" size="30" bind:__l="__l"></uni-icons></view><view class="picker-content"><uni-datetime-picker vue-id="10f0d256-2" type="date" clear-icon="{{false}}" value="{{dateNum}}" data-event-opts="{{[['^change',[['maskClick']]],['^input',[['__set_model',['','dateNum','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l"></uni-datetime-picker></view><view data-event-opts="{{[['tap',[['nextDate',[1]]]]]}}" class="right-icon" bindtap="__e"><uni-icons vue-id="10f0d256-3" type="forward" size="30" bind:__l="__l"></uni-icons></view></view></view>

unpackage/dist/build/mp-weixin/components/commons-select-time/index2.wxss

@@ -0,0 +1,2 @@
+.picker-warp{display:flex;background-color:#fff;margin:10rpx 30rpx}.picker-warp .left-icon,
+.picker-warp .right-icon{width:10%;text-align:center;position:relative;top:10rpx}.picker-warp .picker-content{width:80%}

unpackage/dist/build/mp-weixin/pages/total/personalStat.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "个人面料概况",
+  "usingComponents": {
+    "uni-table": "/node-modules/@dcloudio/uni-ui/lib/uni-table/uni-table",
+    "uni-tr": "/node-modules/@dcloudio/uni-ui/lib/uni-tr/uni-tr",
+    "uni-th": "/node-modules/@dcloudio/uni-ui/lib/uni-th/uni-th",
+    "uni-td": "/node-modules/@dcloudio/uni-ui/lib/uni-td/uni-td",
+    "commons-select-time": "/components/commons-select-time/index2"
+  }
+}

unpackage/dist/build/mp-weixin/pages/total/personalStat.wxss

@@ -0,0 +1 @@
+.personalStat .picker-content{text-align:center}.personalStat .uni-table-th.table--border{border-top:1px solid #000}.personalStat .uni-table-th{border-color:#000;color:#333;font-weight:500}.personalStat .uni-table-th,.personalStat  .table--border{border-right:none!important}.personalStat .uni-date-x--border{border:none!important}.form-text{font-size:28rpx;line-height:60rpx;background-color:#fff;padding-left:20rpx}.commons-time-box{display:flex;height:50rpx;line-height:50rpx;font-size:24rpx;margin:30rpx;border:1px solid #dcdcdc;border-radius:8rpx}.commons-time-box .time-box{width:15%;text-align:center}.commons-time-box .time-box-icon{width:10%}.commons-time-box .time-box.active{background-color:#487cff;color:#fff}.uni-data-checklist{margin-top:10rpx;padding:16rpx 10rpx}.uni-table-td{font-size:24rpx!important}.uni-data-checklist .checklist-group .checklist-box{margin-right:20rpx!important}.personalStat{background-color:#f1f1f1;min-height:100vh;color:#333}.personalStat .header-banner{display:flex;justify-content:center;border-bottom:1px solid #dcdcdc}.personalStat .header-banner view{width:40%;text-align:center;height:100rpx;line-height:100rpx;color:#333;margin:0 5%}.personalStat .header-banner .active{color:#487cff;border-bottom:2px solid #487cff}

unpackage/dist/build/mp-weixin/pages/usedTotal/materialReceiving.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "待物料接收",
+  "usingComponents": {
+    "uni-data-checkbox": "/node-modules/@dcloudio/uni-ui/lib/uni-data-checkbox/uni-data-checkbox"
+  }
+}

unpackage/dist/build/mp-weixin/pages/usedTotal/materialReceiving.wxml

@@ -0,0 +1 @@
+<view class="materialReceiving"><view class="radio"><uni-data-checkbox bind:input="__e" vue-id="142ab97e-1" localdata="{{typeList}}" value="{{type}}" data-event-opts="{{[['^input',[['__set_model',['','type','$event',[]]]]]]}}" bind:__l="__l"></uni-data-checkbox></view><view class="_ul"><block wx:for="{{listData}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><block wx:if="{{i.status==type||type==0}}"><view class="_li"><view class="text-content" style="padding:0 20rpx;"><view>{{'物料编码：'+i.materialCode+''}}</view><view>{{'物料名称：'+i.materialName+''}}</view><view style="overflow:hidden;">{{'出库时间：'+i.submitTime+''}}<label class="right-text _span">数量<e style="color:#EF0000;" vue-id="{{'142ab97e-2-'+__i0__}}" bind:__l="__l" vue-slots="{{['default']}}">{{i.quantity}}</e></label></view><view style="border-bottom:1px solid #979797;overflow:hidden;">{{'出库人员：'+i.submitUserName+''}}<label class="right-text _span">{{"接收人员: "+i.receiveUserName}}</label></view></view><view class="list-btn-box"><label class="_span">待接收</label><block wx:if="{{i.status==4}}"><view data-event-opts="{{[['tap',[['ignore',['$0'],[[['listData','id',i.id,'id']]]]]]]}}" class="canle" bindtap="__e">忽略</view></block></view></view></block></block></view></view>

unpackage/dist/build/mp-weixin/pages/usedTotal/materialReceiving.wxss

@@ -0,0 +1 @@
+.materialReceiving{min-height:100vh;background:#f2f2f2}.materialReceiving .radio{padding:20rpx 30rpx}.materialReceiving ._ul{padding:0 20rpx}.materialReceiving ._ul ._li{background:#fff;margin-bottom:36rpx;line-height:70rpx;font-size:28rpx}.materialReceiving ._ul ._li .right-text{float:right;display:inline-block;width:240rpx}.materialReceiving ._ul ._li .list-btn-box{height:80rpx;line-height:80rpx;color:#ef0000;padding-left:60rpx}.materialReceiving ._ul ._li .list-btn-box .canle{float:right;margin:10rpx 26rpx 10rpx 0;background-color:#ef0000;color:#fff;line-height:60rpx;height:60rpx;width:170rpx;text-align:center;border-radius:10rpx}

unpackage/dist/build/mp-weixin/pages/usedTotal/warehouse-list.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/usedTotal/warehouse-list"],{2192:function(t,e,n){"use strict";n.r(e);var a=n("df17"),o=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=o.a},4327:function(t,e,n){},5810:function(t,e,n){"use strict";(function(t){n("6b59");a(n("66fd"));var e=a(n("7e91"));function a(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=n,t(e.default)}).call(this,n("543d")["createPage"])},"7e91":function(t,e,n){"use strict";n.r(e);var a=n("9948"),o=n("2192");for(var i in o)"default"!==i&&function(t){n.d(e,t,(function(){return o[t]}))}(i);n("9e05");var u,c=n("f0c5"),r=Object(c["a"])(o["default"],a["b"],a["c"],!1,null,"9539c11a",null,!1,a["a"],u);e["default"]=r.exports},9948:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var o=function(){var t=this,e=t.$createElement;t._self._c},i=[]},"9e05":function(t,e,n){"use strict";var a=n("4327"),o=n.n(a);o.a},df17:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"xx",data:function(){return{userInfo:null,dataList:[]}},created:function(){var t=this;setTimeout((function(){t.getList()}),100)},methods:{operation:function(t,e){var n=this,a=[],o="";if("all"==t){o=3;for(var i=0;i<this.dataList.length;i++)a.push(this.dataList[i].id)}else o=t,a=[e];console.log(a,o),n.$post("/materialReceive/operation",{idList:a,operation:o}).then((function(t){console.log(t),n.getList(),200==t.data.code&&n.$msg.showToast("操作成功！")}))},getList:function(){var e=this;t.getStorage({key:"Authorization",success:function(t){e.$post("/materialReceive/list",{account:t.data.account}).then((function(t){console.log(t),e.dataList=t.data}))}})}}};e.default=n}).call(this,n("543d")["default"])}},[["5810","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/usedTotal/warehouse-list"],{"20bb":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var o=function(){var t=this,e=t.$createElement;t._self._c},i=[]},2192:function(t,e,n){"use strict";n.r(e);var a=n("df17"),o=n.n(a);for(var i in a)"default"!==i&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=o.a},5810:function(t,e,n){"use strict";(function(t){n("6b59");a(n("66fd"));var e=a(n("7e91"));function a(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=n,t(e.default)}).call(this,n("543d")["createPage"])},"7e91":function(t,e,n){"use strict";n.r(e);var a=n("20bb"),o=n("2192");for(var i in o)"default"!==i&&function(t){n.d(e,t,(function(){return o[t]}))}(i);n("d75a");var u,c=n("f0c5"),r=Object(c["a"])(o["default"],a["b"],a["c"],!1,null,"058ae94d",null,!1,a["a"],u);e["default"]=r.exports},c8c0:function(t,e,n){},d75a:function(t,e,n){"use strict";var a=n("c8c0"),o=n.n(a);o.a},df17:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"xx",data:function(){return{userInfo:null,dataList:[]}},created:function(){var t=this;setTimeout((function(){t.getList()}),100)},methods:{operation:function(t,e){var n=this,a=[],o="";if("all"==t){o=3;for(var i=0;i<this.dataList.length;i++)a.push(this.dataList[i].id)}else o=t,a=[e];console.log(a,o),n.$post("/materialReceiving/operation",{idList:a,operation:o}).then((function(t){console.log(t),n.getList(),200==t.data.code&&n.$msg.showToast("操作成功！")}))},getList:function(){var e=this;t.getStorage({key:"Authorization",success:function(t){e.$post("/materialReceiving/list",{receiveUserAccount:t.data.account}).then((function(t){console.log(t),e.dataList=t.data}))}})}}};e.default=n}).call(this,n("543d")["default"])}},[["5810","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/usedTotal/warehouse-list.wxml

@@ -1 +1 @@
-<view class="_div data-v-9539c11a"><view class="ul data-v-9539c11a"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-9539c11a"><view class="line data-v-9539c11a">{{'物料编码：'+i.materialCode+''}}</view><view class="line data-v-9539c11a">{{'物料名称：'+i.materialName+''}}</view><view class="line data-v-9539c11a">{{'出库时间：'+i.createTime+''}}<view class="span data-v-9539c11a">数量：<label style="color:red;" class="_span data-v-9539c11a">{{i.changeName}}</label></view></view><view class="line data-v-9539c11a">{{'接收人员：'+i.realName+''}}</view><view class="btn-warp data-v-9539c11a"><button data-event-opts="{{[['tap',[['operation',[4,'$0'],[[['dataList','id',i.id,'id']]]]]]]}}" bindtap="__e" class="data-v-9539c11a">退回</button><button data-event-opts="{{[['tap',[['operation',[3,'$0'],[[['dataList','id',i.id,'id']]]]]]]}}" bindtap="__e" class="data-v-9539c11a">确认接收</button></view></view></block></view><button data-event-opts="{{[['tap',[['operation',['all']]]]]}}" class="footer-btn data-v-9539c11a" bindtap="__e">批量接受物料</button></view>
+<view class="_div data-v-058ae94d"><view class="ul data-v-058ae94d"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-058ae94d"><view class="line data-v-058ae94d">{{'物料编码：'+i.materialCode+''}}</view><view class="line data-v-058ae94d">{{'物料名称：'+i.materialName+''}}</view><view class="line data-v-058ae94d">{{'出库时间：'+i.submitTime+''}}<view class="span data-v-058ae94d">数量：<label style="color:red;" class="_span data-v-058ae94d">{{i.quantity}}</label></view></view><view class="line data-v-058ae94d">{{'接收人员：'+i.receiveUserName+''}}</view><view class="btn-warp data-v-058ae94d"><button data-event-opts="{{[['tap',[['operation',[4,'$0'],[[['dataList','id',i.id,'id']]]]]]]}}" bindtap="__e" class="data-v-058ae94d">退回</button><button data-event-opts="{{[['tap',[['operation',[3,'$0'],[[['dataList','id',i.id,'id']]]]]]]}}" bindtap="__e" class="data-v-058ae94d">确认接收</button></view></view></block></view><button data-event-opts="{{[['tap',[['operation',['all']]]]]}}" class="footer-btn data-v-058ae94d" bindtap="__e">批量接受物料</button></view>

unpackage/dist/build/mp-weixin/pages/usedTotal/warehouse-list.wxss

@@ -1 +1 @@
-.ul.data-v-9539c11a{padding-bottom:200rpx}.li.data-v-9539c11a{background-color:#fff;margin:20rpx 20rpx 0;padding:20rpx;list-style:none}.li .line.data-v-9539c11a{line-height:70rpx;border:none;display:flex;padding:0 20rpx}.li .line .span.data-v-9539c11a{margin-left:50rpx}.btn-warp.data-v-9539c11a{display:flex}.btn-warp button.data-v-9539c11a{width:48%}.footer-btn.data-v-9539c11a{position:fixed;bottom:10rpx;left:10rpx;right:10rpx;background-color:red;color:#fff}
+.ul.data-v-058ae94d{padding-bottom:200rpx}.li.data-v-058ae94d{background-color:#fff;margin:20rpx 20rpx 0;padding:20rpx;list-style:none}.li .line.data-v-058ae94d{line-height:70rpx;border:none;display:flex;padding:0 20rpx}.li .line .span.data-v-058ae94d{margin-left:50rpx}.btn-warp.data-v-058ae94d{display:flex}.btn-warp button.data-v-058ae94d{width:48%}.footer-btn.data-v-058ae94d{position:fixed;bottom:10rpx;left:10rpx;right:10rpx;background-color:red;color:#fff}