转仓功能添加，bug修改

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"default" : 
      	{
      		"launchtype" : "local"

pages.json

@@ -238,9 +238,29 @@
 			"style": {
 				"navigationBarTitleText": "面料修正"
 			}
+		},
+		{
+			"path": "pages/materialTransfer/materialTransfer",
+			"style": {
+				"navigationBarTitleText": "面料转仓"
+			}
+		},
+		{
+			"path": "pages/materialTransfer/transferCompositeList",
+			"style": {
+				"navigationBarTitleText": "转仓复核"
+			}
+		},
+		{
+			"path": "pages/materialTransfer/transferComposite",
+			"style": {
+				"navigationBarTitleText": "转仓复核详情"
+			}
 		}
 		
 		
+		
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/home.vue

@@ -57,7 +57,18 @@
 						面料修正
 					</view>
 				</view>
-				
+				<view class="menu-list-box" @click="toRouter('/materialTransfer/materialTransfer')">
+					<image :src="'../static/xcjj.png'" mode=""></image>
+					<view class="">
+						面料转仓
+					</view>
+				</view>
+				<view class="menu-list-box" @click="toRouter('/materialTransfer/transferCompositeList')"  v-if="isRoom2">
+					<image :src="'../static/fh.png'" mode=""></image>
+					<view class="">
+						转仓复核
+					</view>
+				</view>
 				
 			</view>
 			
@@ -78,6 +89,7 @@
 				userInfoData: [],
 				notificationData: [],
 				isRoom: false,
+				isRoom2:false,
 			}
 		},
 		onLoad() {
@@ -97,6 +109,12 @@
 				Vue.prototype.$token.role_id == '1552550978346041346') {
 				this.isRoom = true
 			}
+			if (
+				Vue.prototype.$token.role_id == '1569881723951472642' ||
+				Vue.prototype.$token.role_id == '1552550978346041346' ||
+				Vue.prototype.$token.role_id == '1552548151620026370') {
+				this.isRoom2 = true
+			}
 			// v.$post('/wx/login/getUserInfo').then(res => {
 			// 	v.userInfoData = res.data
 			// 	Vue.prototype.$userInfo = res.data

pages/materialTransfer/materialTransfer.vue

@@ -0,0 +1,534 @@
+<template>
+	<div class="materialTransfer">
+		<view class="add-header">
+			转仓面料： <button @click="openModal">添加物料</button>
+		</view>
+		<view class="ul">
+			<view class="li" v-for="(i,index) in form.backDetailList" :key="i.materialId">
+				<view class="label">
+					物料名称:{{i.name}}
+				</view>
+				<view class="lists">
+					<view class="list-box" v-for="(j,jindex) in i.stockTransferDetailsList" :key="jindex">
+						<view>卷{{jindex + 1}}</view>
+						<view>
+							<span>{{j.quantity}}</span>
+						</view>
+					</view>
+					<view class="user-select">
+						<view style="width:30%">
+							接收人：
+						</view>
+						<view class="" style="width:70%;border: 1rpx solid #dcdcdc;padding:0 20rpx">
+							<picker :value="i.receiveUser" :range="selectOneList"
+								@change="(e)=>printingWorkersSelect(e,index)" range-key="realName" style="width:100%">
+								<view class="uni-input">{{i.userName || '请选择人员'}}</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="list-btn-warp">
+					<button @click="listDelete(index)">删除</button>
+					<button @click="listUpdate(i,index)">{{i.isEdit ? '确认' : '修改'}}</button>
+				</view>
+			</view>
+		</view>
+		<view class="footer-btn-warp" style="margin-top: 20rpx;" v-if="form.backDetailList.length != 0">
+			<button class="cancel" style="background-color:red" @click="backFn">取消</button>
+			<button class="upload" style="background-color:blue" @click="submitBack()">确定</button>
+		</view>
+		<uni-popup ref="addModal" type="bottom">
+			<view class="addModal-content">
+				<view class="select-warp">
+					<view class="label">
+						选择面料
+					</view>
+					<view class="show-text" @click="openSelectModal">
+						{{!selectMaterialDtl.name ? '请选择物料' : selectMaterialDtl.name }}
+					</view>
+					<view class="add-icon">
+						+
+					</view>
+				</view>
+				<view style="height:40rpx;border-bottom: 1px solid #ccc;">
+
+				</view>
+				<view class="ul">
+					<view class="li" v-for="(i,index) in selectMaterialDtl.stockTransferDetailsList" :key="index">
+						<view class="delete-icon" @click="stockTransferDetailsListDelete(index)">
+							-
+						</view>
+						<view class="li-label">
+							卷{{index + 1}}
+						</view>
+						<view class="input">
+
+							<input type="number" :value="i.quantity" @input="((e)=>inputChange(e,index))">
+						</view>
+					</view>
+
+				</view>
+				<button class="add-btn" @click="addList">再添加一卷</button>
+				<view class="footer-btn-warp" style="margin-top: 20rpx;">
+					<button class="cancel" style="background-color:red" @click="cancelFn">取消</button>
+					<button class="upload" style="background-color:blue" @click="pushList">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="bottom">
+			<view class="tabs">
+				<view class="tab-box" @click="tabChange(0)">
+					今日领取的面料
+					<view class="blue-line"  :class="current === 1 ? 'op0':''">
+
+					</view>
+				</view>
+				<view class="tab-box" @click="tabChange(1)">
+					选择其他
+					<view class="blue-line"  :class="current === 0 ? 'op0':''">
+
+					</view>
+				</view>
+			</view>
+			<view class="search-box" v-if="current == 0">
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
+						{{i.name}}
+					</li>
+					<view class="no-data" v-if="pickingToday.length == 0">
+						暂无今日领取面料数据
+					</view>
+				</ul>
+			</view>
+			<view class="search-box" v-if="current == 1">
+				<view class="input-warp">
+					<input v-model="req.search" confirm-type="search" placeholder="请输入物料名称或编码"
+						@input="getSelectMaterialList" class="search-input" />
+				</view>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
+						{{i.name}}
+					</li>
+					<view class="no-data" v-if="materialData.length == 0">
+						暂无数据
+					</view>
+				</ul>
+			</view>
+		</uni-popup>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: "xx",
+		data() {
+			return {
+				isEdit: false,
+				swiperCurrent: 0,
+				current: 0,
+				list: [{
+					name: '今日领取的面料'
+				}, {
+					name: '选择其他'
+				}],
+				userInfo: {},
+				form: {
+					submitUser: null,
+					backDetailList: [],
+				},
+				req: {
+					userId: null,
+					pageNum: 1,
+					pageSize: 10,
+					search: null,
+					materialCode: null,
+				},
+				pickingToday: [],
+				materialData: [],
+				selectMaterialDtl: {},
+				updateIndex: null,
+				selectOneList: [],
+			}
+		},
+		created() {
+			const v = this
+			uni.getStorage({
+				key: 'Authorization',
+				success: (res => {
+					console.log(res)
+					v.form.submitUser = res.data.account
+					v.req.userId = res.data.account
+					v.userInfo = res.data
+					console.log(v.req, 'req')
+					v.selectList()
+					v.getSelectMaterialList()
+					v.getBackUser()
+				})
+
+			})
+
+		},
+		methods: {
+			printingWorkersSelect(e, index) {
+				console.log(e, index)
+				this.form.backDetailList[index].receiveUser = this.selectOneList[e.detail.value].userId
+				this.form.backDetailList[index].userName = this.selectOneList[e.detail.value].realName
+
+			},
+			getBackUser() {
+				this.$post('/stockBack/getBackUser', {}).then(res => {
+					this.selectOneList = res.data.A007.concat(res.data.A008, res.data.A012)
+				})
+			},
+			tabChange(_type) {
+				this.current = _type
+			},
+			submitBack() {
+				const v = this
+				console.log(v.form)
+				for (var i = 0; i < this.form.backDetailList.length; i++) {
+					this.form.backDetailList[i]
+					for (var j = 0; j < this.form.backDetailList[i].stockTransferDetailsList.length; j++) {
+						if(this.form.backDetailList[i].stockTransferDetailsList[j].quantity === 0){
+							uni.showToast({
+								title: '请输入数量！',
+								icon:"none" 
+							})
+							return
+						}
+					}
+				}
+				v.$post('/stockTransfer/add', this.form.backDetailList).then(res => {
+					console.log(res)
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功，跳转中！'
+						})
+						setTimeout(() => {
+							wx.reLaunch({
+								url: '/pages/home'
+							})
+						}, 2000)
+					}
+				})
+			},
+			stockTransferDetailsListDelete(index) {
+				this.selectMaterialDtl.stockTransferDetailsList.splice(index, 1)
+			},
+			listUpdate(i, index) {
+				this.selectMaterialDtl = i
+				this.updateIndex = index
+				this.$refs.addModal.open()
+			},
+			listDelete(index) {
+				this.form.backDetailList.splice(index, 1)
+			},
+			backFn() {
+				uni.navigateBack()
+			},
+			cancelFn() {
+				this.$refs.addModal.close()
+			},
+			pushList() {
+				if (this.updateIndex === null) {
+					this.form.backDetailList.push(this.selectMaterialDtl)
+				} else {
+					this.form.backDetailList[this.updateIndex] = this.selectMaterialDtl
+				}
+
+				this.selectMaterialDtl = {}
+				this.$refs.addModal.close()
+			},
+			inputChange(e, index) {
+				this.selectMaterialDtl.stockTransferDetailsList[index].quantity = e.detail.value
+				console.log(this.selectMaterialDtl)
+			},
+			tabsChange(index) {
+				this.swiperCurrent = index;
+				this.current = index;
+			},
+			addList() {
+				if (!this.selectMaterialDtl.name) {
+					uni.showToast({
+						title: '请选择物料',
+						icon: "none"
+					})
+					return
+				}
+				this.selectMaterialDtl.stockTransferDetailsList.push({
+					quantity: 0,
+				})
+			},
+			selectMaterialList(i) {
+				const v = this
+				v.selectMaterialDtl = {
+					materialId: i.id,
+					stockTransferDetailsList: [],
+					name: i.name,
+					isEdit: false,
+					userName: null,
+					receiveUser: null,
+					submitUser: v.form.submitUser
+				}
+				this.$refs.popup2.close()
+			},
+			openSelectModal() {
+				this.selectMaterialDtl = {}
+				this.updateIndex = null
+				this.$refs.popup2.open()
+			},
+
+			getSelectMaterialList() {
+				const v = this
+				v.$post('/material/selectList', v.req).then(res => {
+					console.log(res, 1231231231)
+					this.materialData = res.data
+				})
+
+			},
+			selectList() {
+				const v = this
+				v.$post('/stockBack/getPickingToday', v.req).then(res => {
+					for (var i = 0; i < res.data.length; i++) {
+						res.data[i].id = res.data[i].materialId
+						res.data[i].name = res.data[i].materialName
+					}
+					this.pickingToday = res.data
+				})
+
+			},
+			openModal() {
+				this.$refs.addModal.open('bottom')
+			},
+		},
+	}
+</script>
+
+<style scoped lang="less">
+	
+	.materialTransfer {
+		background-color: #f2f2f2;
+		min-height: 100vh;
+
+		.user-select {
+			display: flex;
+			justify-content: space-between;
+			height: 80rpx;
+			line-height: 80rpx;
+			padding: 0 20rpx;
+		}
+	}
+
+	.tabs {
+		background-color: #fff;
+		display: flex;
+		justify-content: space-between;
+
+		.tab-box {
+			width: 49%;
+			text-align: center;
+			height: 80rpx;
+			line-height: 80rpx;
+			position: relative;
+			color: #000;
+			.blue-line {
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				height: 4rpx;
+				width: 100rpx;
+				margin-left: -50rpx;
+				background-color: blue;
+			}
+			.op0{
+				opacity: 0;
+			}
+		}
+
+		
+
+		.active {
+			color: #000 !important;
+		}
+
+		.active::before {
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			content: " ";
+			height: 4rpx;
+			width: 100rpx;
+			margin-left: -50rpx;
+			background-color: blue;
+		}
+	}
+
+	.footer-btn-warp {
+		display: flex;
+		padding: 20rpx;
+
+		button {
+			width: 48%;
+			color: #fff;
+		}
+	}
+
+	.search-box {
+		.input-warp {
+			padding: 40rpx;
+		}
+
+		.search-input {
+			border: 1rpx solid #dcdcdc;
+			padding: 20rpx;
+		}
+
+		background-color: #fff;
+
+		text-align: center;
+
+		ul {
+			li {
+				padding: 25rpx 30rpx;
+				border-bottom: 1rpx solid #dcdcdc;
+				list-style: none;
+			}
+		}
+
+		.no-data {
+			padding: 100rpx;
+		}
+	}
+
+	.addModal-content {
+		background-color: #fff;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		padding-top: 40rpx;
+
+		.footer-btn-warp {
+			display: flex;
+			padding: 20rpx;
+
+			button {
+				width: 48%;
+				color: #fff;
+			}
+		}
+
+		.ul {
+
+			.li {
+				display: flex;
+				justify-content: space-between;
+				height: 80rpx;
+				line-height: 80rpx;
+				margin-top: 20rpx;
+
+				.input {
+					width: 70%;
+
+					input {
+						border: 1rpx solid #dcdcdc;
+						height: 78rpx;
+						line-height: 78rpx;
+						padding: 0 20rpx;
+					}
+				}
+			}
+
+			.delete-icon {
+				height: 80rpx;
+				width: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				font-size: 40rpx;
+				color: #fff;
+				background-color: #ccc;
+			}
+		}
+
+		.select-warp {
+			height: 80rpx;
+			line-height: 80rpx;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: space-between;
+
+			.show-text {
+				width: 60%;
+				border: 1rpx solid #dcdcdc;
+				padding: 0 20rpx;
+				overflow: hidden;
+				height: 80rpx;
+			}
+
+			.add-icon {
+				height: 80rpx;
+				width: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				font-size: 40rpx;
+				color: #fff;
+				background-color: #ccc;
+			}
+		}
+	}
+
+	.ul {
+		.li {
+			background-color: #fff;
+			border-radius: 5rpx;
+			margin: 20rpx 20rpx 0;
+
+			.label {
+				height: 100rpx;
+				line-height: 100rpx;
+				font-weight: 30rpx;
+				border-bottom: 1rpx solid #ccc;
+				padding: 0 20rpx;
+				overflow: hidden;
+
+			}
+
+			.lists {
+				border-bottom: 1rpx solid #ccc;
+
+				.list-box {
+					height: 100rpx;
+					line-height: 100rpx;
+					display: flex;
+					justify-content: space-between;
+					padding: 0 20rpx;
+				}
+			}
+
+			.list-btn-warp {
+				display: flex;
+				padding: 20rpx;
+
+				button {
+					width: 48%;
+				}
+			}
+		}
+	}
+
+	.add-header {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+		overflow: hidden;
+		padding: 20rpx;
+
+		button {
+			width: 200rpx;
+			color: #fff;
+			background-color: red;
+			float: right;
+			margin: 14rpx 0;
+		}
+	}
+</style>

pages/materialTransfer/transferComposite.vue

@@ -0,0 +1,510 @@
+<template>
+	<div class="materialTransfer">
+		
+		<view class="ul">
+			<view class="li" v-for="(i,index) in form.backDetailList" :key="i.materialId">
+				<view class="label">
+					物料名称:{{i.materialName}}
+				</view>
+				<view class="lists">
+					<view class="list-box" v-for="(j,jindex) in i.stockTransferDetailsList" :key="jindex">
+						<view>卷{{jindex + 1}}</view>
+						<view>
+							<span>{{j.quantity}}</span>
+						</view>
+					</view>
+					<view class="user-select">
+						<view style="width:30%">
+							接收人：
+						</view>
+						<view class="" style="width:70%;border: 1rpx solid #dcdcdc;padding:0 20rpx">
+							<picker :value="i.receiveUser"  :range="selectOneList" @change="(e)=>printingWorkersSelect(e,index)" range-key="realName" style="width:100%">
+								<view class="uni-input">{{i.userName || '请选择人员'}}</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="list-btn-warp">
+					<!-- <button @click="listDelete(index)">删除</button> -->
+					<button @click="listUpdate(i,index)">{{i.isEdit ? '确认' : '修改'}}</button>
+				</view>
+			</view>
+		</view>
+		<view class="footer-btn-warp" style="margin-top: 20rpx;" v-if="form.backDetailList.length != 0">
+			<button class="cancel" style="background-color:red" @click="backFn()">取消</button>
+			<button class="upload" style="background-color:blue" @click="submitBack()">确定</button>
+		</view>
+		<uni-popup ref="addModal" type="bottom">
+			<view class="addModal-content">
+				<view class="select-warp">
+					<view class="label">
+						选择面料
+					</view>
+					<view class="show-text" @click="openSelectModal">
+						{{!selectMaterialDtl.name ? '请选择物料' : selectMaterialDtl.name }}
+					</view>
+					<view class="add-icon">
+						+
+					</view>
+				</view>
+				<view style="height:40rpx;border-bottom: 1px solid #ccc;">
+
+				</view>
+				<view class="ul">
+					<view class="li" v-for="(i,index) in selectMaterialDtl.stockTransferDetailsList" :key="index">
+						<view class="delete-icon" @click="stockTransferDetailsListDelete(index)">
+							-
+						</view>
+						<view class="li-label">
+							卷{{index + 1}}
+						</view>
+						<view class="input">
+
+							<input type="number" :value="i.quantity" @input="((e)=>inputChange(e,index))">
+						</view>
+					</view>
+
+				</view>
+				<button class="add-btn" @click="addList">再添加一卷</button>
+				<view class="footer-btn-warp" style="margin-top: 20rpx;">
+					<button class="cancel" style="background-color:red" @click="cancelFn">取消</button>
+					<button class="upload" style="background-color:blue" @click="pushList">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup2" type="bottom">
+			<view class="tabs">
+				<view class="tab-box" @click="tabChange(0)">
+					今日领取的面料
+					<view class="blue-line"  :class="current === 1 ? 'op0':''">
+			
+					</view>
+				</view>
+				<view class="tab-box" @click="tabChange(1)">
+					选择其他
+					<view class="blue-line"  :class="current === 0 ? 'op0':''">
+			
+					</view>
+				</view>
+			</view>
+			<view class="search-box" v-if="current == 0">
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
+						{{i.name}}
+					</li>
+					<view class="no-data" v-if="pickingToday.length == 0">
+						暂无今日领取面料数据
+					</view>
+				</ul>
+			</view>
+			<view class="search-box" v-if="current == 1">
+				<view class="input-warp">
+					<input v-model="req.search" :searchIcon="true" :border="true" placeholder="请输入物料名称或编码"
+						@input="getSelectMaterialList" class="search-input" />
+				</view>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
+						{{i.name}}
+					</li>
+					<view class="no-data" v-if="materialData.length == 0">
+						暂无数据
+					</view>
+				</ul>
+			</view>
+		</uni-popup>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: "xx",
+		data() {
+			return {
+				isEdit: false,
+				swiperCurrent: 0,
+				current: 0,
+				list: [{
+					name: '今日领取的面料'
+				}, {
+					name: '选择其他'
+				}],
+				userInfo: {},
+				form: {
+					submitUser: null,
+					backDetailList: [],
+				},
+				req: {
+					userId: null,
+					pageNum: 1,
+					pageSize: 10,
+					search: null,
+					materialCode: null,
+				},
+				pickingToday: [],
+				materialData: [],
+				selectMaterialDtl: {},
+				updateIndex: null,
+				selectOneList:[],
+			}
+		},
+		onLoad(option) {
+			this.getDtl(option.id)
+		},
+		created() {
+			const v = this
+			uni.getStorage({
+				key: 'Authorization',
+				success: (res => {
+					console.log(res)
+					v.form.submitUser = res.data.account
+					v.req.userId = res.data.account
+					v.userInfo = res.data
+					console.log(v.req, 'req')
+					v.selectList()
+					v.getSelectMaterialList()
+					
+					
+				})
+
+			})
+
+		},
+		methods: {
+			getDtl(_id){
+				const v = this
+				v.$post('/stockTransfer/details', {id:_id}).then(res => {
+					console.log(res)
+					if (res.code == 200) {
+						v.form.backDetailList.push(res.data)
+						console.log(v.form,19837198274981749)
+						v.getBackUser(res.data.receiveUser)
+					}
+				})
+			},
+			printingWorkersSelect(e,index){
+				console.log(e,index)
+				this.form.backDetailList[index].receiveUser = this.selectOneList[e.detail.value].userId
+				this.form.backDetailList[index].userName = this.selectOneList[e.detail.value].realName
+				
+			},
+			getBackUser(_id){
+				this.$post('/stockBack/getBackUser',{}).then(res=>{
+					this.selectOneList = res.data.A007.concat(res.data.A008,res.data.A012)
+					for (var i = 0; i < this.selectOneList.length; i++) {
+						if(this.selectOneList[i].userId === _id){
+							this.form.backDetailList[0].userName = this.selectOneList[i].realName
+						}
+					}
+				})
+			},
+			tabChange(_type) {
+				this.current = _type
+			},
+			submitBack() {
+				const v = this
+				console.log(v.form)
+				this.form.backDetailList[0].checkUser = v.form.submitUser
+				v.$post('/stockTransfer/check', this.form.backDetailList[0]).then(res => {
+					console.log(res)
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功，跳转中！'
+						})
+						setTimeout(() => {
+							wx.reLaunch({
+								url: '/pages/materialTransfer/transferCompositeList'
+							})
+						}, 2000)
+					}
+				})
+			},
+			stockTransferDetailsListDelete(index) {
+				this.selectMaterialDtl.stockTransferDetailsList.splice(index, 1)
+			},
+			listUpdate(i, index) {
+				i.name = i.materialName
+				this.selectMaterialDtl = i
+				this.updateIndex = index
+				this.$refs.addModal.open()
+			},
+			listDelete(index) {
+				this.form.backDetailList.splice(index, 1)
+			},
+			backFn(){
+				uni.navigateBack()
+			},
+			cancelFn(){
+				this.$refs.addModal.close()
+			},
+			pushList() {
+				this.selectMaterialDtl.materialName = this.selectMaterialDtl.name
+				this.form.backDetailList[this.updateIndex] = this.selectMaterialDtl
+
+				this.selectMaterialDtl = {}
+				this.$refs.addModal.close()
+			},
+			inputChange(e, index) {
+				this.selectMaterialDtl.stockTransferDetailsList[index].quantity = e.detail.value
+				console.log(this.selectMaterialDtl)
+			},
+			tabsChange(index) {
+				this.swiperCurrent = index;
+				this.current = index;
+			},
+			addList() {
+				if (!this.selectMaterialDtl.name) {
+					uni.showToast({
+						title: '请选择物料',
+						icon: "none"
+					})
+					return
+				}
+				this.selectMaterialDtl.stockTransferDetailsList.push({
+					quantity:0,
+				})
+			},
+			selectMaterialList(i) {
+				const v = this
+				this.selectMaterialDtl.materialName = i.name
+				this.selectMaterialDtl.name = i.name
+				this.selectMaterialDtl.materialId = i.id
+				this.$refs.popup2.close()
+			},
+			openSelectModal() {
+				this.$refs.popup2.open()
+			},
+
+			getSelectMaterialList() {
+				const v = this
+				v.$post('/material/selectList', v.req).then(res => {
+					this.materialData = res.data
+				})
+
+			},
+			selectList(){
+				const v = this
+				v.$post('/stockBack/getPickingToday',v.req).then(res=>{
+					for (var i = 0; i < res.data.length; i++) {
+						res.data[i].id = res.data[i].materialId
+						res.data[i].name = res.data[i].materialName
+					}
+					this.pickingToday = res.data
+				})
+				
+			},
+			openModal() {
+				this.$refs.addModal.open('bottom')
+			},
+		},
+	}
+</script>
+
+<style scoped lang="less">
+	.materialTransfer {
+		background-color: #f2f2f2;
+		min-height: 100vh;
+
+		.user-select {
+			display: flex;
+			justify-content: space-between;
+			height: 80rpx;
+			line-height: 80rpx;
+			padding: 0 20rpx;
+		}
+	}
+
+	.tabs {
+		background-color: #fff;
+		display: flex;
+
+		.tab-box {
+			width: 49%;
+			text-align: center;
+			height: 80rpx;
+			line-height: 80rpx;
+			position: relative;
+			color: #000;
+			.blue-line {
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				height: 4rpx;
+				width: 100rpx;
+				margin-left: -50rpx;
+				background-color: blue;
+			}
+			.op0{
+				opacity: 0;
+			}
+		}
+	}
+
+	.footer-btn-warp {
+		display: flex;
+		padding: 20rpx;
+		
+		button {
+			width: 48%;
+			color: #fff;
+		}
+	}
+
+	.search-box {
+		.input-warp {
+			padding: 40rpx;
+		}
+
+		.search-input {
+			border:1rpx solid #dcdcdc;
+			padding: 20rpx;
+		}
+
+		background-color: #fff;
+
+		text-align: center;
+
+		ul {
+			li {
+				padding: 25rpx 30rpx;
+				border-bottom: 1rpx solid #dcdcdc;
+				list-style: none;
+			}
+		}
+
+		.no-data {
+			padding: 100rpx;
+		}
+	}
+
+	.addModal-content {
+		background-color: #fff;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		padding-top: 40rpx;
+
+		.footer-btn-warp {
+			display: flex;
+			padding: 20rpx;
+
+			button {
+				width: 48%;
+				color: #fff;
+			}
+		}
+
+		.ul {
+
+			.li {
+				display: flex;
+				justify-content: space-between;
+				height: 80rpx;
+				line-height: 80rpx;
+				margin-top: 20rpx;
+
+				.input {
+					width: 70%;
+
+					input {
+						border: 1rpx solid #dcdcdc;
+						height: 78rpx;
+						line-height: 78rpx;
+						padding: 0 20rpx;
+					}
+				}
+			}
+
+			.delete-icon {
+				height: 80rpx;
+				width: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				font-size: 40rpx;
+				color: #fff;
+				background-color: #ccc;
+			}
+		}
+
+		.select-warp {
+			height: 80rpx;
+			line-height: 80rpx;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: space-between;
+
+			.show-text {
+				width: 60%;
+				border: 1rpx solid #dcdcdc;
+				padding: 0 20rpx;
+				overflow: hidden;
+				height: 80rpx;
+			}
+
+			.add-icon {
+				height: 80rpx;
+				width: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				font-size: 40rpx;
+				color: #fff;
+				background-color: #ccc;
+			}
+		}
+	}
+
+	.ul {
+		.li {
+			background-color: #fff;
+			border-radius: 5rpx;
+			margin: 20rpx 20rpx 0;
+
+			.label {
+				height: 100rpx;
+				line-height: 100rpx;
+				font-weight: 30rpx;
+				border-bottom: 1rpx solid #ccc;
+				padding: 0 20rpx;
+				overflow: hidden;
+
+			}
+
+			.lists {
+				border-bottom: 1rpx solid #ccc;
+
+				.list-box {
+					height: 100rpx;
+					line-height: 100rpx;
+					display: flex;
+					justify-content: space-between;
+					padding: 0 20rpx;
+				}
+			}
+
+			.list-btn-warp {
+				display: flex;
+				padding: 20rpx;
+
+				button {
+					width: 98%;
+				}
+			}
+		}
+	}
+
+	.add-header {
+		height: 100rpx;
+		line-height: 100rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+		overflow: hidden;
+		padding: 20rpx;
+
+		button {
+			width: 200rpx;
+			color: #fff;
+			background-color: red;
+			float: right;
+			margin: 14rpx 0;
+		}
+	}
+</style>

pages/materialTransfer/transferCompositeList.vue

@@ -0,0 +1,104 @@
+<template>
+	<div>
+		
+		<view class="ul">
+			<view class="li" v-for="i in dataList" :key="i.id">
+				<view class="line">
+					提交人员：{{i.submitUser}}
+					<view class="span">
+						接收人员：<span>{{i.receiveUser}}</span>
+					</view>
+				</view>
+				<view class="line">
+					提交时间：{{i.submitTime}}
+				</view>
+				<view class="line">
+					面料卷数：{{i.submitNum}}
+					<view class="span">
+						面料米数：<span >{{i.submitMeters}}</span>
+					</view>
+				</view>
+				<view class="btn-warp">
+					<button @click="operation(i.id)" style="background-color: blue;color:#fff">去复核</button>
+				</view>
+			</view>
+		</view>
+	</div>
+</template>
+
+<script>
+	export default{
+		name:"xx",
+		data(){
+			return{
+				userInfo:null,
+				dataList:[],
+			}
+		},
+		created(){
+			setTimeout(()=>{
+				this.getList()
+			},100)
+		},
+		methods:{
+			operation(_id){
+				const v = this 
+				uni.navigateTo({
+					url: '/pages/materialTransfer/transferComposite?id=' + _id
+				})
+			},
+			getList(){
+				const v = this
+				uni.getStorage({
+					key: 'Authorization',
+					success: function (res) {
+						v.$post('/stockTransfer/page',{
+							account:res.data.account,
+							pageNum:1,
+							pageSize:10000,
+						}).then(res=>{
+							console.log(res)
+							v.dataList = res.data.records
+						})
+					}
+				});
+				
+			},
+		},
+	}
+</script>
+
+<style scoped lang="less">
+	.ul{
+		min-height: 100vh;
+		background-color: #f2f2f2;
+	}
+	.li{
+		background-color: #fff;
+		margin: 20rpx 20rpx 0;
+		padding: 20rpx;
+		list-style: none;
+		.line{
+			position: relative;
+			line-height: 70rpx;
+			border: none;
+			display: flex;
+			padding: 0 20rpx;
+			.span{
+				position: absolute;
+				left: 50%;
+			}
+		}
+	}
+	.btn-warp{
+		
+	}
+	.footer-btn{
+		position: fixed;
+		bottom: 10rpx;
+		left: 10rpx;
+		right: 10rpx;
+		background-color: red;
+		color: #fff;
+	}
+</style>

pages/usedTotal/return-warehouse.vue

@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view class="footer-btn-warp" style="margin-top: 20rpx;" v-if="form.backDetailList.length != 0">
-			<button class="cancel" style="background-color:red"  @tap="$utils.back()">取消</button>
+			<button class="cancel" style="background-color:red"   @click="backFn">取消</button>
 			<button class="upload" style="background-color:blue" @click="submitBack()">确定</button>
 		</view>
 		<uni-popup ref="addModal" type="bottom">
@@ -57,28 +57,32 @@
 					</view>
 					
 				</view>
-				<button class="add-btn" @click="addList">在添加一卷</button>
+				<button class="add-btn" @click="addList">再添加一卷</button>
 				<view class="footer-btn-warp" style="margin-top: 20rpx;">
-					<button class="cancel" style="background-color:red">取消</button>
+					<button class="cancel" style="background-color:red"  @click="cancelFn">取消</button>
 					<button class="upload" style="background-color:blue" @click="pushList">确定</button>
 				</view>
 			</view>
 		</uni-popup>
 		<uni-popup ref="popup2" type="bottom">
-			<!-- <u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false"
-			 swiperWidth="750"></u-tabs-swiper> -->
 			<view class="tabs">
-				<view class="tab-box" :class="current === 0 ? 'active' : ''" @click="tabChange(0)">
+				<view class="tab-box" @click="tabChange(0)">
 					今日领取的面料
+					<view class="blue-line"  :class="current === 1 ? 'op0':''">
+			
+					</view>
 				</view>
-				<view class="tab-box" :class="current === 1 ? 'active' : ''"  @click="tabChange(1)">
+				<view class="tab-box" @click="tabChange(1)">
 					选择其他
+					<view class="blue-line"  :class="current === 0 ? 'op0':''">
+			
+					</view>
 				</view>
 			</view>
 			<view class="search-box" v-if="current == 0">
 				<ul>
 					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
-						{{i.name}}
+						{{i.materialName}}
 					</li>
 					<view class="no-data" v-if="pickingToday.length == 0">
 						暂无今日领取面料数据
@@ -87,12 +91,12 @@
 			</view>
 			<view  class="search-box" v-if="current == 1">
 				<view class="input-warp">
-					<u-input
+					<input
 						v-model="req.search"
 						:searchIcon="true" 
 						:border="true" 
 						placeholder="请输入物料名称或编码"
-						@search="getSelectMaterialList"
+						@input="getSelectMaterialList"
 						class="search-input"
 						 />
 				</view>
@@ -158,6 +162,12 @@
 			
 		},
 		methods:{
+			backFn(){
+				uni.navigateBack()
+			},
+			cancelFn(){
+				this.$refs.addModal.close()
+			},
 			tabChange(_type){
 				this.current = _type
 			},
@@ -166,7 +176,7 @@
 				console.log(v.form)
 				v.$post('/stockBack/submitBack',v.form).then(res=>{
 					console.log(res)
-					if(res.data.code == 200){
+					if(res.code == 200){
 						uni.showToast({
 							title: '提交成功，跳转中！'
 						})
@@ -241,7 +251,11 @@
 			selectList(){
 				const v = this
 				v.$post('/stockBack/getPickingToday',v.req).then(res=>{
-					this.pickingToday = res.data.data
+					for (var i = 0; i < res.data.length; i++) {
+						res.data[i].id = res.data[i].materialId
+						res.data[i].name = res.data[i].materialName
+					}
+					this.pickingToday = res.data
 				})
 				
 			},
@@ -256,22 +270,25 @@
 	.tabs{
 		background-color: #fff;
 		display: flex;
-		view{
-			width: 50%;
+		.tab-box {
+			width: 49%;
 			text-align: center;
 			height: 80rpx;
 			line-height: 80rpx;
 			position: relative;
-		}
-		.active::before{
-			position: absolute;
-			bottom: 0;
-			left: 50%;
-			content:" ";
-			height: 4rpx;
-			width: 100rpx;
-			margin-left: -50rpx;
-			background-color: blue;
+			color: #000;
+			.blue-line {
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				height: 4rpx;
+				width: 100rpx;
+				margin-left: -50rpx;
+				background-color: blue;
+			}
+			.op0{
+				opacity: 0;
+			}
 		}
 	}
 	.footer-btn-warp{
@@ -286,10 +303,11 @@
 		.input-warp{
 			padding: 40rpx;
 		}
-		.search-input{
+		.search-input {
+			border:1rpx solid #dcdcdc;
+			padding: 20rpx;
 		}
 		background-color: #fff;
-		
 		text-align: center;
 		ul{
 			li{
@@ -380,7 +398,7 @@
 				font-weight: 30rpx;
 				border-bottom: 1rpx solid #ccc;
 				padding: 0 20rpx;
-				
+				overflow: hidden;
 			}
 			.lists{
 				border-bottom: 1rpx solid #ccc;

pages/user/login.vue

@@ -63,9 +63,9 @@
 		},
 		onLoad() {
 			
-			setTimeout(() => {
-				this.init()
-			}, 500)
+			// setTimeout(() => {
+			// 	this.init()
+			// }, 500)
 		},
 		methods: {
 			init() {

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

@@ -35,7 +35,10 @@
     "pages/usedTotal/warehousingDtl",
     "pages/submit/submit",
     "pages/usedTotal/return-warehouse",
-    "pages/usedTotal/fabric-correction"
+    "pages/usedTotal/fabric-correction",
+    "pages/materialTransfer/materialTransfer",
+    "pages/materialTransfer/transferCompositeList",
+    "pages/materialTransfer/transferComposite"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/build/mp-weixin/pages/home.wxml

@@ -1 +1 @@
-<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view></view></uni-card></view>
+<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/materialTransfer']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/xcjj.png" mode></image><view>面料转仓</view></view><block wx:if="{{isRoom2}}"><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/transferCompositeList']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/fh.png" mode></image><view>转仓复核</view></view></block></view></uni-card></view>

unpackage/dist/build/mp-weixin/pages/materialTransfer/materialTransfer.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "面料转仓",
+  "usingComponents": {
+    "uni-popup": "/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup"
+  }
+}

unpackage/dist/build/mp-weixin/pages/materialTransfer/transferComposite.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "转仓复核详情",
+  "usingComponents": {
+    "uni-popup": "/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup"
+  }
+}

unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/materialTransfer/transferCompositeList"],{4940:function(t,e,n){"use strict";(function(t){n("6b59");a(n("66fd"));var e=a(n("95e3"));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"])},"67a1":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(e){t.navigateTo({url:"/pages/materialTransfer/transferComposite?id="+e})},getList:function(){var e=this;t.getStorage({key:"Authorization",success:function(t){e.$post("/stockTransfer/page",{account:t.data.account,pageNum:1,pageSize:1e4}).then((function(t){console.log(t),e.dataList=t.data.records}))}})}}};e.default=n}).call(this,n("543d")["default"])},"95e3":function(t,e,n){"use strict";n.r(e);var a=n("b257"),r=n("c60b");for(var u in r)"default"!==u&&function(t){n.d(e,t,(function(){return r[t]}))}(u);n("c235");var o,c=n("f0c5"),i=Object(c["a"])(r["default"],a["b"],a["c"],!1,null,"6826106e",null,!1,a["a"],o);e["default"]=i.exports},b257:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},bad8:function(t,e,n){},c235:function(t,e,n){"use strict";var a=n("bad8"),r=n.n(a);r.a},c60b:function(t,e,n){"use strict";n.r(e);var a=n("67a1"),r=n.n(a);for(var u in a)"default"!==u&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=r.a}},[["4940","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "转仓复核",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxml

@@ -0,0 +1 @@
+<view class="_div data-v-6826106e"><view class="ul data-v-6826106e"><block wx:for="{{dataList}}" wx:for-item="i" wx:for-index="__i0__" wx:key="id"><view class="li data-v-6826106e"><view class="line data-v-6826106e">{{'提交人员：'+i.submitUser+''}}<view class="span data-v-6826106e">接收人员：<label class="_span data-v-6826106e">{{i.receiveUser}}</label></view></view><view class="line data-v-6826106e">{{'提交时间：'+i.submitTime+''}}</view><view class="line data-v-6826106e">{{'面料卷数：'+i.submitNum+''}}<view class="span data-v-6826106e">面料米数：<label class="_span data-v-6826106e">{{i.submitMeters}}</label></view></view><view class="btn-warp data-v-6826106e"><button data-event-opts="{{[['tap',[['operation',['$0'],[[['dataList','id',i.id,'id']]]]]]]}}" style="background-color:blue;color:#fff;" bindtap="__e" class="data-v-6826106e">去复核</button></view></view></block></view></view>

unpackage/dist/build/mp-weixin/pages/materialTransfer/transferCompositeList.wxss

@@ -0,0 +1 @@
+.ul.data-v-6826106e{min-height:100vh;background-color:#f2f2f2}.li.data-v-6826106e{background-color:#fff;margin:20rpx 20rpx 0;padding:20rpx;list-style:none}.li .line.data-v-6826106e{position:relative;line-height:70rpx;border:none;display:flex;padding:0 20rpx}.li .line .span.data-v-6826106e{position:absolute;left:50%}.footer-btn.data-v-6826106e{position:fixed;bottom:10rpx;left:10rpx;right:10rpx;background-color:red;color:#fff}