全局开发

pages/entry/group-to-store.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="zd_container">
+		<!-- 组盘入库 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -7,7 +8,7 @@
 					<view class="zd-col-7">
 						<span class="filter_label">载具编码</span>
 					</view>
-					<view class="zd-col-24 filter_select">
+					<view class="zd-col-24">
 						<search-box
 						v-model="val1"
 						/>
@@ -17,10 +18,8 @@
 					<view class="zd-col-7">
 						<span class="filter_label">关联单据</span>
 					</view>
-					<view class="zd-col-24 filter_select">
-						<search-box
-						v-model="val2"
-						/>
+					<view class="zd-col-24">
+						<input type="text" class="filter_input" @tap="toJump" v-model="val2">
 					</view>
 				</view>
 			</view>
@@ -29,7 +28,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th class="fontcol1">物料编码</th>
+								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>物料规格</th>
 								<th>批次</th>
@@ -37,8 +36,8 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)">
-								<td class="fontcol1">{{e.material_id}}</td>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.material_spec}}</td>
 								<td>{{e.pcsn}}</td>
@@ -48,10 +47,14 @@
 					</table>
 				</view>
 			</view>
+		</view>
+		<view class="compute_wraper">
+			
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-default">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !pkId}" :disabled="disabled">组盘确认</button>
+			<view class="zd-col-10"></view>
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !checkArr.length}" :disabled="disabled">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -59,7 +62,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {unpackShelfInfo, cbjqlTask} from '@/utils/getData2.js'
+	import {mdGruopDick} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -71,34 +74,42 @@
 				val1: '',
 				val2: '',
 				dataList: [],
-				pkId: '',
+				checkArr: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
 		},
+		onShow () {
+			if (this.$store.getters.publicArr.length) {
+				this.dataList = [...this.$store.getters.publicArr]
+				this.$store.dispatch('setPublicArr', '')
+			}
+		},
 		methods: {
-			async _unpackShelfInfo () {
-				let res = await unpackShelfInfo()
-				this.dataList = [...res]
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/entry/document?title=关联单据'
+				})
 			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
 			},
-			async _cbjqlTask () {
+			async _mdGruopDick () {
 				this.disabled = true
-				if (!this.pkId) {
+				if (!this.checkArr.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await cbjqlTask(this.pkId)
-					this.pkId = ''
+					let res = await mdGruopDick(this.dataList, this.val1, this.val2)
+					if (res.code === '200') {
+					}
 					this.disabled = false
-					this._unpackShelfInfo()
 					uni.showToast({
-						title: res.message,
+						title: res.msg,
 						icon: 'none'
 					})
 				} catch (e) {