补出库功能添加

pages.json

@@ -1,12 +1,12 @@
 {
 
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			// uni-ui 规则如下配置
-			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
-		}
-	},
+	// "easycom": {
+	// 	"autoscan": true,
+	// 	"custom": {
+	// 		// uni-ui 规则如下配置
+	// 		"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
+	// 	}
+	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		
 		{
@@ -96,6 +96,13 @@
 				"navigationBarTitleText": "到货质检"
 			}
 		},
+		
+		{
+			"path": "pages/submit/xiuzheng",
+			"style": {
+				"navigationBarTitleText": "面料修正"
+			}
+		},
 		{
 			"path": "pages/check/checkSubmit",
 			"style": {
@@ -248,12 +255,24 @@
 			}
 		},
 		{
+			"path": "pages/usedTotal/return-warehouse-2",
+			"style": {
+				"navigationBarTitleText": "补退仓"
+			}
+		},
+		{
 			"path": "pages/usedTotal/fabric-correction",
 			"style": {
 				"navigationBarTitleText": "面料修正"
 			}
 		},
 		{
+			"path": "pages/usedTotal/fabric-correction2",
+			"style": {
+				"navigationBarTitleText": "面料修正(布头布尾)"
+			}
+		},
+		{
 			"path": "pages/materialTransfer/materialTransfer",
 			"style": {
 				"navigationBarTitleText": "面料转仓"

pages/home.vue

@@ -63,12 +63,24 @@
 						物料退仓
 					</view>
 				</view>
+				<view class="menu-list-box" @click="toRouter('/usedTotal/return-warehouse-2')">
+					<image :src="'../static/tc.png'" mode=""></image>
+					<view class="">
+						补退仓
+					</view>
+				</view>
 				<view class="menu-list-box" @click="toRouter('/usedTotal/fabric-correction')">
 					<image :src="'../static/kccx.png'" mode=""></image>
 					<view class="">
 						面料修正
 					</view>
 				</view>
+				<view class="menu-list-box" @click="toRouter('/usedTotal/fabric-correction2')">
+					<image :src="'../static/kccx.png'" mode=""></image>
+					<view class="">
+						面料修正（布头布尾）
+					</view>
+				</view>
 				<!-- <view class="menu-list-box" @click="toRouter('/materialTransfer/materialTransfer')">
 					<image :src="'../static/xcjj.png'" mode=""></image>
 					<view class="">

pages/submit/xiuzheng.vue

@@ -0,0 +1,419 @@
+<template>
+	<view class="checkSubmit">
+		<view class="commons-title">
+			面料信息
+		</view>
+		<view class="submit-warp">
+			<view class="form-text">
+				面料
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<view class="" style="color:#999;width:90%"  @click="openSelectQd('mianliao')">
+							{{formData.materialName || '请选择面料 '}}
+						</view>
+						
+						<uni-icons  @click="openSelectQd(index)" type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-warp" style="margin-top:40rpx">
+			<view class="form-text">
+				供应商
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<view class="" style="color:#999;width:90%"  @click="openSelectQd('gongyingshang')">
+							{{formData.supplierName || '请选择供应商 '}}
+						</view>
+						
+						<uni-icons  @click="openSelectQd(index)" type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="commons-title">
+			拍照上传
+		</view>
+		<view class="form-box" style="margin:0 30rpx">
+			<view class="imglist">
+				<view class="item" v-for="(item,index) in imgs" :key="item" v-if="!item.loadingType">
+					<image :src="item" alt=""></image>
+					<view class='delete' bindtap='deleteImg' @click="imgDelete(index)">
+						x
+					</view>
+				</view>
+				<view class="item" v-else>
+					<image src="../../static/loding.gif"></image>
+				</view>
+				<view class="last-item" @click="bindUpload">
+					<text class="sign">+</text>
+				</view>
+			</view>
+		</view>
+		<view class="commons-title">
+			问题选择
+		</view>
+		<view class="wenti-list">
+			<view class="list-box" :class="i.active ? 'active' : ''" v-for="(i,index) in wentiList" :key="i.type" @click="wentiSelect(i,index)">
+				{{i.name}}
+			</view>
+		</view>
+		<view class="" style="margin: 0 20rpx 20rpx;border:1px solid #dcdcdc;">
+			<textarea style="width:100%;padding:20rpx" v-model="formData.remark" placeholder="备注信息"/>
+		</view>
+		
+		<view class="submit-btn-warp">
+			<button @click="checkSubmit(2)" style="background:#EF0000;color:#fff;margin-bottom: 30rpx;">取消</button>
+			<button @click="checkSubmit(1)" style="background:#1A3AF0; color:#fff;margin-bottom: 30rpx;">提交</button>
+		</view>
+		<uni-popup ref="popup2" type="top">
+			<view class="search-box">
+				<uni-search-bar @confirm="selectList" v-model="req.search" @cancel="reload">
+				</uni-search-bar>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in range2" :key="i.id">
+						{{i.name}}
+					</li>
+				</ul>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup" type="top">
+			<view class="search-box">
+				<uni-search-bar @confirm="selectList" v-model="req.search" @cancel="reload">
+				</uni-search-bar>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in range" :key="i.id">
+						{{i.name}}
+					</li>
+				</ul>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getInfo
+	} from "@/util/api.js";
+	import Vue from 'vue'
+	import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
+	import {
+		dateFormat,
+		getTime
+	} from '../../util/uitl.js'
+	export default {
+		components: {
+			htzImageUpload,
+		},
+		data() {
+			return {
+				wentiList:[
+					{type:1,name:"短少",active:false},
+					{type:2,name:"抽纱",active:false},
+					{type:3,name:"褶皱",active:false},
+					{type:4,name:"脏污",active:false},
+					{type:5,name:"破洞",active:false},
+					{type:6,name:"缩水",active:false}
+				],
+				value: 0,
+				range: [],
+				range2:[],
+				formData: {
+					supplierId:null,
+					materialId:null,
+					problemType:'',
+					remark:null,
+					attr:[],
+					supplierName:null,
+				},
+				imgs: [],
+				option: null,
+				imgUrl: null,
+				checkListData: [],
+				optionCopy: null,
+				materialIndex:null,
+				req:{
+					pageNum:1,
+					pageSize:10,
+					search:null,
+					materialCode:null,
+				},
+				selectModalType:'gongyingshang',
+			}
+		},
+		onLoad(option) {
+			const v = this
+			v.selectList()
+		},
+		methods: {
+			selectMaterialList(i){
+				const v = this
+				if(v.selectModalType == 'gongyingshang'){
+					v.formData.supplierId = i.id
+					v.formData.supplierName = i.name
+				}else{
+					v.formData.materialId = i.id
+					v.formData.materialName = i.name
+					v.req.materialCode = i.id
+					
+				}
+				console.log(i)
+				this.$refs.popup2.close()
+				this.$refs.popup.close()
+			},
+			openSelectQd(modalType){
+				const v = this
+				if(modalType == 'gongyingshang' && v.formData.materialId == null){
+					wx.showToast({
+						title: "请先选择面料！",
+						icon: "none",
+						duration: 2000
+					})
+					return
+				}
+				
+				v.selectModalType = modalType
+				v.req.search = null
+				v.selectList()
+				if(modalType == 'gongyingshang'){
+					this.$refs.popup2.open('top')
+				}else{
+					this.$refs.popup.open('top')
+				}
+				
+			},
+			bindPickerChange(e){
+				console.log(e)
+				const v = this
+				v.formData.supplierName = v.range[e.detail.value].bankAccoutName
+				v.formData.supplierId = v.range[e.detail.value].id
+			},
+			selectList(){
+				const v = this
+				if(v.selectModalType == 'gongyingshang'){
+					v.$post('/supplier/selectList',v.req).then(res=>{
+						console.log(res)
+						this.range2 = res.data
+						
+					})
+				}else{
+					v.$post('/material/selectList',v.req).then(res=>{
+						console.log(res)
+						this.range = res.data
+						
+					})
+				}
+				
+				
+				
+			},
+			wentiSelect(item,index){
+				this.wentiList[index].active = !this.wentiList[index].active
+			},
+			imgDelete(_index) {
+				const v = this
+				v.imgs.splice(_index, 1)
+			},
+			bindUpload() {
+				const v = this
+				wx.chooseImage({
+					count: 1,
+					sizeType: ["original", "compressed"], // 可以指定是原图还是压缩图，默认二者都有
+					sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有
+					success: function(res) {
+						// 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+						var tempFilePaths = res.tempFilePaths
+						for (var i = 0; i < tempFilePaths.length; i++) {
+							v.imgs.push({
+								loadingType: true
+							})
+							wx.uploadFile({
+								url: 'https://cfm.bytesail.cn/api/storage/cloudApi/applet/uploadFile',
+								filePath: tempFilePaths[i],
+								name: "file",
+								header: {
+									'Blade-Auth': 'bearer ' + Vue.prototype.$token.access_token,
+									'Authorization':'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
+									'Content-Type':'application/json;charset=UTF-8',
+								},
+								success: function(res) {
+									console.log(res.data)
+									res.data = JSON.parse(res.data)
+									if (res.data.code == 200) {
+										wx.showToast({
+											title: "上传成功",
+											icon: "none",
+											duration: 1500
+										})
+										v.imgs.splice(-1)
+										v.imgs.push(res.data.msg)
+										console.log(v.imgs)
+									}
+
+								},
+								fail: function(err) {
+									wx.showToast({
+										title: "上传失败",
+										icon: "none",
+										duration: 2000
+									})
+								},
+								complete: function(result) {
+									console.log(result.errMsg)
+								}
+							})
+						}
+					}
+				})
+
+			},
+			zidingyiSuccess() {
+
+			},
+			checkSubmit(_type) {
+				const v = this
+				if(_type == 2){
+					wx.reLaunch({
+						url: '/pages/home'
+					})
+				}
+				
+				v.formData.problemType = ''
+				v.formData.attr = []
+				
+				for (var i = 0; i < v.imgs.length; i++) {
+					v.formData.attr.push({
+						realName:"xxx",
+						path:v.imgs[i]
+					})
+					
+				}
+				for (var i = 0; i < v.wentiList.length; i++) {
+					if(v.wentiList[i].active){
+						v.formData.problemType = v.formData.problemType + v.wentiList[i].type + ','
+					}
+				}
+				if(v.formData.problemType == ''){
+					uni.showToast({
+						title: '请选择问题类型！'
+					})
+					return
+				}
+				v.formData.problemType = v.formData.problemType.slice(0,v.formData.problemType.length - 1)
+				v.$post('/supplierProblem/add', v.formData).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功，跳转中！'
+						})
+						setTimeout(() => {
+
+							wx.reLaunch({
+								url: '/pages/home'
+							})
+						}, 2000)
+					}
+				})
+
+
+			},
+			select(e) {
+				console.log(e)
+				const v = this
+				v.$post('/wx/common/uploadFile', {
+					file: e.tempFilePaths[0]
+				}).then(res => {
+
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.search-box{
+		background-color: #fff;
+		ul{
+			li{
+				padding: 25rpx 30rpx;
+				border-bottom: 1rpx solid #dcdcdc;
+			}
+		}
+	}
+	.submit-btn-warp{
+		display: flex;
+		justify-content: space-between;
+		button{
+			width: 47%;
+		}
+	}
+	.wenti-list{
+		overflow: hidden;
+		.list-box{
+			
+			width: 28%;
+			margin: 0 2% 20rpx;
+			float: left;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			border:1px solid #DDDCDC;
+			border-radius: 10rpx;
+		}
+		.list-box.active{
+			border:1px solid #1A3AF0;
+			background-color: #1A3AF0;
+			color: #fff;
+		}
+	}
+	.submit-warp{
+		display: flex;
+		.form-text{
+			width: 20%;
+			text-align: center;
+		}
+		.form-box{
+			width: 80%;
+			padding: 0 20rpx;
+		}
+	}
+	.imglist {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	.imglist .item {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 22rpx;
+		margin-bottom: 10rpx;
+		position: relative;
+	}
+	
+	.imglist .last-item {
+		width: 150rpx;
+		height: 150rpx;
+		text-align: center;
+		line-height: 146rpx;
+		border: 2rpx dashed #8B97A9;
+		box-sizing: border-box;
+	}
+	
+	.imglist .item image {
+		width: 100%;
+		height: 100%;
+	}
+	
+	.imglist .item .delete {
+		width: 30rpx;
+		height: 30rpx;
+		position: absolute;
+		top: -25rpx;
+		right: -12rpx;
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+</style>

pages/usedTotal/fabric-correction2.vue

@@ -0,0 +1,430 @@
+<template>
+	<view class="checkSubmit">
+		<view class="commons-title">
+			面料信息
+		</view>
+		<view class="submit-warp">
+			<view class="form-text">
+				日期
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<picker mode="date" :value="correctDate" @change="bindDateChange" style="width:100%">
+							<view class="uni-input">{{correctDate || '请选择时间'}}</view>
+						</picker>
+						<uni-icons type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-warp" style="margin-top:40rpx">
+			<view class="form-text">
+				喷印人员
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<picker :value="correctUser"  :range="selectOneList" @change="printingWorkersSelect" range-key="realName" style="width:100%">
+							<view class="uni-input">{{printingWorkersName || '请选择人员'}}</view>
+						</picker>
+						<uni-icons type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-warp" style="margin-top:40rpx">
+			<view class="form-text">
+				面料
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<view class="" style="color:#999;width:90%" @click="openSelectQd('mianliao')">
+							{{formData.materialName || '请选择面料 '}}
+						</view>
+						<uni-icons @click="openSelectQd(index)" type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="submit-warp" style="margin-top:40rpx">
+			<view class="form-text">
+				供应商
+			</view>
+			<view class="form-box">
+				<view>
+					<view class="" style="text-align: left;display: flex;justify-content: space-between;">
+						<view class="" style="color:#999;width:90%" @click="openSelectQd('gongyingshang')">
+							{{formData.supplierName || '请选择供应商 '}}
+						</view>
+
+						<uni-icons @click="openSelectQd(index)" type="forward" size="20"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<view class="submit-warp" style="margin-top:40rpx">
+			<view class="form-text">
+				修正面积
+			</view>
+			<view class="form-box">
+				<view style="border:1rpx solid #dcdcdc;">
+					<input v-model="correctArea" type="number">
+				</view>
+			</view>
+		</view>
+		<view class="commons-title">
+			修正原因
+		</view>
+		<view class="wenti-list">
+			<view class="list-box" :class="i.active ? 'active' : 'active'" v-for="(i,index) in wentiList" :key="i.type"
+				>
+				{{i.name}}
+			</view>
+		</view>
+		<view class="" style="margin: 0 20rpx 20rpx;border:1px solid #dcdcdc;">
+			<textarea style="width:100%;padding:10rpx 20rpx" v-model="formData.remark" placeholder="备注信息" />
+		</view>
+
+		<view class="submit-btn-warp">
+			<button @click="checkSubmit(2)" style="background:#EF0000;color:#fff;margin-bottom: 30rpx;">取消</button>
+			<button @click="checkSubmit(1)" style="background:#1A3AF0; color:#fff;margin-bottom: 30rpx;">提交</button>
+		</view>
+		<uni-popup ref="popup2" type="top">
+			<view class="search-box">
+				<uni-search-bar @confirm="selectList" v-model="req.search" @cancel="reload">
+				</uni-search-bar>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in range2" :key="i.id">
+						{{i.name}}
+					</li>
+				</ul>
+			</view>
+		</uni-popup>
+		<uni-popup ref="popup" type="top">
+			<view class="search-box">
+				<uni-search-bar @confirm="selectList" v-model="req.search" @cancel="reload">
+				</uni-search-bar>
+				<ul>
+					<li @click="selectMaterialList(i)" v-for="i in range" :key="i.id">
+						{{i.name}}
+					</li>
+				</ul>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getInfo
+	} from "@/util/api.js";
+	import Vue from 'vue'
+	import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
+	import {
+		dateFormat,
+		getTime
+	} from '../../util/uitl.js'
+	export default {
+		components: {
+			htzImageUpload,
+		},
+		data() {
+			return {
+				correctArea:null,
+				showSelectOne:null,
+				correctDate: null,
+				wentiList: [{
+						type: 1,
+						name: "布头布尾",
+						active: false
+					},
+					
+				],
+				value: 0,
+				range: [],
+				range2: [],
+				formData: {
+					supplierId: null,
+					materialId: null,
+					problemType: '',
+					remark: null,
+					attr: [],
+					supplierName: null,
+				},
+				imgs: [],
+				option: null,
+				imgUrl: null,
+				checkListData: [],
+				optionCopy: null,
+				materialIndex: null,
+				req: {
+					pageNum: 1,
+					pageSize: 10,
+					search: null,
+					materialCode: null,
+				},
+				selectModalType: 'gongyingshang',
+				selectOneList:[],
+				correctUser:null,
+				printingWorkersName:null,
+			}
+		},
+		onLoad(option) {
+			const v = this
+			v.selectList()
+			v.getBackUser()
+		},
+		methods: {
+			printingWorkersSelect(e){
+				console.log(e)
+				
+				this.correctUser = this.selectOneList[e.detail.value].userId
+				this.printingWorkersName = 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)
+					console.log(this.selectOneList,123123212)
+				})
+			},
+			bindDateChange: function(e) {
+				console.log(e)
+				this.correctDate = e.detail.value
+			},
+			selectMaterialList(i) {
+				const v = this
+				if (v.selectModalType == 'gongyingshang') {
+					v.formData.supplierId = i.id
+					v.formData.supplierName = i.name
+				} else {
+					v.formData.materialId = i.id
+					v.formData.materialName = i.name
+					v.req.materialCode = i.id
+
+				}
+				console.log(i)
+				this.$refs.popup2.close()
+				this.$refs.popup.close()
+			},
+			openSelectQd(modalType) {
+				const v = this
+				if (modalType == 'gongyingshang' && v.formData.materialId == null) {
+					wx.showToast({
+						title: "请先选择面料！",
+						icon: "none",
+						duration: 2000
+					})
+					return
+				}
+
+				v.selectModalType = modalType
+				v.req.search = null
+				v.selectList()
+				if (modalType == 'gongyingshang') {
+					this.$refs.popup2.open('top')
+				} else {
+					this.$refs.popup.open('top')
+				}
+
+			},
+			bindPickerChange(e) {
+				console.log(e)
+				const v = this
+				v.formData.supplierName = v.range[e.detail.value].bankAccoutName
+				v.formData.supplierId = v.range[e.detail.value].id
+			},
+			selectList() {
+				const v = this
+				if (v.selectModalType == 'gongyingshang') {
+					v.$post('/supplier/selectList', v.req).then(res => {
+						console.log(res)
+						this.range2 = res.data
+
+					})
+				} else {
+					v.$post('/material/selectList', v.req).then(res => {
+						console.log(res)
+						this.range = res.data
+
+					})
+				}
+
+
+
+			},
+			wentiSelect(item, index) {
+				this.wentiList[index].active = !this.wentiList[index].active
+			},
+			checkSubmit(_type) {
+				const v = this
+				if (_type == 2) {
+					wx.reLaunch({
+						url: '/pages/home'
+					})
+				}
+				if (!this.correctDate) {
+					uni.showToast({
+						title: '请选择喷印日期！',
+						icon:"none"
+					})
+					return
+				}
+				if (!this.correctUser) {
+					uni.showToast({
+						title: '请选择喷印人员！',
+						icon:"none"
+					})
+					return
+				}
+				if (!v.formData.materialId) {
+					uni.showToast({
+						title: '请选择面料！',
+						icon:"none"
+					})
+					return
+				}
+				
+				if (!this.correctArea) {
+					uni.showToast({
+						title: '请输入修正面积！',
+						icon:"none"
+					})
+					return
+				}
+				
+				v.formData.problemType = v.formData.problemType.slice(0, v.formData.problemType.length - 1)
+				
+				v.$post('/stockCorrect/add', {
+					correctDate: this.correctDate + ' 00:00:00',
+					correctUser: this.correctUser,
+					materialId: v.formData.materialId,
+					supplierId: v.formData.supplierId,
+					correctArea: this.correctArea,
+					correctReason: v.formData.problemType,
+					remark: this.formData.remark,
+				}).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功，跳转中！'
+						})
+						setTimeout(() => {
+
+							wx.reLaunch({
+								url: '/pages/home'
+							})
+						}, 2000)
+					}
+				})
+
+
+			},
+			select(e) {
+				console.log(e)
+				const v = this
+				v.$post('/wx/common/uploadFile', {
+					file: e.tempFilePaths[0]
+				}).then(res => {
+
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.search-box {
+		background-color: #fff;
+
+		ul {
+			li {
+				padding: 25rpx 30rpx;
+				border-bottom: 1rpx solid #dcdcdc;
+			}
+		}
+	}
+
+	.submit-btn-warp {
+		display: flex;
+		justify-content: space-between;
+
+		button {
+			width: 47%;
+		}
+	}
+
+	.wenti-list {
+		overflow: hidden;
+
+		.list-box {
+
+			width: 28%;
+			margin: 0 2% 20rpx;
+			float: left;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			border: 1px solid #DDDCDC;
+			border-radius: 10rpx;
+		}
+
+		.list-box.active {
+			border: 1px solid #1A3AF0;
+			background-color: #1A3AF0;
+			color: #fff;
+		}
+	}
+
+	.submit-warp {
+		display: flex;
+
+		.form-text {
+			width: 20%;
+			text-align: center;
+		}
+
+		.form-box {
+			width: 80%;
+			padding: 0 20rpx;
+		}
+	}
+
+	.imglist {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.imglist .item {
+		width: 150rpx;
+		height: 150rpx;
+		margin-right: 22rpx;
+		margin-bottom: 10rpx;
+		position: relative;
+	}
+
+	.imglist .last-item {
+		width: 150rpx;
+		height: 150rpx;
+		text-align: center;
+		line-height: 146rpx;
+		border: 2rpx dashed #8B97A9;
+		box-sizing: border-box;
+	}
+
+	.imglist .item image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.imglist .item .delete {
+		width: 30rpx;
+		height: 30rpx;
+		position: absolute;
+		top: -25rpx;
+		right: -12rpx;
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+</style>

pages/usedTotal/return-warehouse-2.vue

@@ -0,0 +1,458 @@
+<template>
+	<div>
+		<view class="add-header">
+			补退仓面料： <button @click="openModal">添加物料</button>
+		</view>
+		<view class="" style="margin:24rpx">
+			<uni-datetime-picker type="datetime" v-model="form.operationTime" />
+		</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.materialMetersList" :key="jindex">
+						<view>卷{{jindex + 1}}</view>
+						<view>
+							<span>{{j}}</span>
+						</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.materialMetersList" :key="index">
+						<view class="delete-icon" @click="materialMetersListDelete(index)">
+							-
+						</view>
+						<view class="li-label">
+							卷{{index + 1}}
+						</view>
+						<view class="input">
+							
+							<input type="number" :value="i" @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  style="height: 60vh;overflow-y: scroll;">
+					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
+						{{i.materialName}}
+					</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 style="height: 60vh;overflow-y: scroll;">
+					<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{
+				time:null,
+				isEdit:false,
+				swiperCurrent:0,
+				current:0,
+				list: [{
+					name: '今日领取的面料'
+				}, {
+					name: '选择其他'
+				}],
+				userInfo:{},
+				form:{
+					operatorId:null,
+					backDetailList:[],
+					type:2,
+					operationTime:null,
+				},
+				req:{
+					userId:null,
+					pageNum:1,
+					pageSize:30,
+					search:null,
+					materialCode:null,
+				},
+				pickingToday:[],
+				materialData:[],
+				selectMaterialDtl:{},
+				updateIndex:null,
+			}
+		},
+		created(){
+			const v = this
+			uni.getStorage({
+				key:'Authorization',
+				success:(res=>{
+					console.log(res)
+					v.form.operatorId = res.data.account
+					v.req.userId = res.data.account
+					v.userInfo = res.data
+					console.log(v.req,'req')
+					v.selectList()
+					v.getSelectMaterialList()
+				})
+				
+			})
+			
+		},
+		methods:{
+			backFn(){
+				uni.navigateBack()
+			},
+			cancelFn(){
+				this.$refs.addModal.close()
+			},
+			tabChange(_type){
+				this.current = _type
+			},
+			submitBack(){
+				const v = this
+				console.log(v.form)
+				
+				if(!v.form.operationTime) {
+					uni.showToast({
+						title: '请选择补退仓时间！',
+						icon:'none',
+						duration: 2000
+					})
+				}
+				uni.showLoading({title: '加载中',mask:true});
+				v.$post('/stockBack/submitBack',v.form).then(res=>{
+					console.log(res)
+					uni.hideLoading()
+					if(res.code == 200){
+						uni.hideLoading()
+						uni.showToast({
+							title: '提交成功，跳转中！'
+						})
+						setTimeout(() => {
+							wx.reLaunch({
+								url: '/pages/home'
+							})
+						}, 2000)
+					}
+				})
+			},
+			materialMetersListDelete(index){
+				this.selectMaterialDtl.materialMetersList.splice(index,1)
+			},
+			listUpdate(i,index){
+				this.selectMaterialDtl = i
+				this.updateIndex = index
+				this.$refs.addModal.open()
+			},
+			listDelete(index){
+				this.form.backDetailList.splice(index,1)
+			},
+			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.materialMetersList[index] = 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',
+						duration: 2000
+					})
+					return
+				}
+				this.selectMaterialDtl.materialMetersList.push(0)
+			},
+			selectMaterialList(i){
+				const v = this
+				v.selectMaterialDtl = {
+					materialId:i.id,
+					materialMetersList:[],
+					name:i.name,
+					isEdit:false,
+				}
+				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">
+	.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: 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/usedTotal/return-warehouse.vue

@@ -130,6 +130,7 @@
 				form:{
 					operatorId:null,
 					backDetailList:[],
+					type:1,
 				},
 				req:{
 					userId:null,
@@ -222,7 +223,11 @@
 			},
 			addList(){
 				if(!this.selectMaterialDtl.name){
-					this.$msg.showToast('请选择物料！')
+					uni.showToast({
+						title: '请选择物料！',
+						icon:'none',
+						duration: 2000
+					})
 					return
 				}
 				this.selectMaterialDtl.materialMetersList.push(0)

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

@@ -13,6 +13,7 @@
     "pages/inOut/inOut",
     "pages/check/check",
     "pages/check/checkDtl",
+    "pages/submit/xiuzheng",
     "pages/check/checkSubmit",
     "pages/weigh/weigh",
     "pages/weigh/checkDtl",
@@ -38,6 +39,7 @@
     "pages/submit/submit",
     "pages/usedTotal/return-warehouse",
     "pages/usedTotal/fabric-correction",
+    "pages/usedTotal/fabric-correction2",
     "pages/materialTransfer/materialTransfer",
     "pages/materialTransfer/transferCompositeList",
     "pages/materialTransfer/transferComposite"

unpackage/dist/build/mp-weixin/pages/submit/xiuzheng.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "面料修正",
+  "usingComponents": {
+    "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons",
+    "uni-popup": "/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup",
+    "uni-search-bar": "/node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar",
+    "htz-image-upload": "/components/htz-image-upload/htz-image-upload"
+  }
+}

unpackage/dist/build/mp-weixin/pages/submit/xiuzheng.wxss

@@ -0,0 +1 @@
+.search-box.data-v-04e2111e{background-color:#fff}.search-box ._ul ._li.data-v-04e2111e{padding:25rpx 30rpx;border-bottom:1rpx solid #dcdcdc}.submit-btn-warp.data-v-04e2111e{display:flex;justify-content:space-between}.submit-btn-warp button.data-v-04e2111e{width:47%}.wenti-list.data-v-04e2111e{overflow:hidden}.wenti-list .list-box.data-v-04e2111e{width:28%;margin:0 2% 20rpx;float:left;height:60rpx;line-height:60rpx;text-align:center;border:1px solid #dddcdc;border-radius:10rpx}.wenti-list .list-box.active.data-v-04e2111e{border:1px solid #1a3af0;background-color:#1a3af0;color:#fff}.submit-warp.data-v-04e2111e{display:flex}.submit-warp .form-text.data-v-04e2111e{width:20%;text-align:center}.submit-warp .form-box.data-v-04e2111e{width:80%;padding:0 20rpx}.imglist.data-v-04e2111e{display:flex;flex-wrap:wrap}.imglist .item.data-v-04e2111e{width:150rpx;height:150rpx;margin-right:22rpx;margin-bottom:10rpx;position:relative}.imglist .last-item.data-v-04e2111e{width:150rpx;height:150rpx;text-align:center;line-height:146rpx;border:2rpx dashed #8b97a9;box-sizing:border-box}.imglist .item image.data-v-04e2111e{width:100%;height:100%}.imglist .item .delete.data-v-04e2111e{width:30rpx;height:30rpx;position:absolute;top:-25rpx;right:-12rpx;font-size:40rpx;font-weight:700}

unpackage/dist/build/mp-weixin/pages/usedTotal/fabric-correction2.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "面料修正(布头布尾)",
+  "usingComponents": {
+    "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons",
+    "uni-popup": "/node-modules/@dcloudio/uni-ui/lib/uni-popup/uni-popup",
+    "uni-search-bar": "/node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar",
+    "htz-image-upload": "/components/htz-image-upload/htz-image-upload"
+  }
+}

unpackage/dist/build/mp-weixin/pages/usedTotal/fabric-correction2.wxss

@@ -0,0 +1 @@
+.search-box.data-v-68af2b89{background-color:#fff}.search-box ._ul ._li.data-v-68af2b89{padding:25rpx 30rpx;border-bottom:1rpx solid #dcdcdc}.submit-btn-warp.data-v-68af2b89{display:flex;justify-content:space-between}.submit-btn-warp button.data-v-68af2b89{width:47%}.wenti-list.data-v-68af2b89{overflow:hidden}.wenti-list .list-box.data-v-68af2b89{width:28%;margin:0 2% 20rpx;float:left;height:60rpx;line-height:60rpx;text-align:center;border:1px solid #dddcdc;border-radius:10rpx}.wenti-list .list-box.active.data-v-68af2b89{border:1px solid #1a3af0;background-color:#1a3af0;color:#fff}.submit-warp.data-v-68af2b89{display:flex}.submit-warp .form-text.data-v-68af2b89{width:20%;text-align:center}.submit-warp .form-box.data-v-68af2b89{width:80%;padding:0 20rpx}.imglist.data-v-68af2b89{display:flex;flex-wrap:wrap}.imglist .item.data-v-68af2b89{width:150rpx;height:150rpx;margin-right:22rpx;margin-bottom:10rpx;position:relative}.imglist .last-item.data-v-68af2b89{width:150rpx;height:150rpx;text-align:center;line-height:146rpx;border:2rpx dashed #8b97a9;box-sizing:border-box}.imglist .item image.data-v-68af2b89{width:100%;height:100%}.imglist .item .delete.data-v-68af2b89{width:30rpx;height:30rpx;position:absolute;top:-25rpx;right:-12rpx;font-size:40rpx;font-weight:700}

unpackage/dist/build/mp-weixin/project.config.json

@@ -31,7 +31,8 @@
       "outputPath": ""
     },
     "disableUseStrict": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.25.2",