接口

pages/hdyy/ccgl/kn-hepan.vue

@@ -11,6 +11,7 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
@@ -21,12 +22,13 @@
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val2"
+						@handleChange="handleChange"
 						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">总数量</span>
+						<span class="filter_label filter_input_disabled">总数量</span>
 					</view>
 					<view class="zd-col-24">
 						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
@@ -53,21 +55,23 @@
 								<th>类别</th>
 								<th>规格</th>
 								<th>型号</th>
+								<th>点位</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.code}}</td>
+								<td>{{e.bag_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.unit}}</td>
-								<td>{{e.gys}}</td>
-								<td>{{e.leibie}}</td>
-								<td>{{e.guige}}</td>
-								<td>{{e.xinghao}}</td>
+								<td>{{e.canuse_qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -76,7 +80,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="_packInConfirm">确认合盘</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val1 || !val2 || !dataList.length}" :disabled="disabled" @tap="_confirmInside">确认合盘</button>
 		</view>
 	</view>
 </template>
@@ -84,7 +88,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInDownload, queryPointInDtl, packInConfirm} from '@/utils/getData3.js'
+	import {insideCodeInsert, queryPointVehicle, confirmInside} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,9 +97,7 @@
 		data() {
 			return {
 				title: '',
-				options: [],
 				num: null,
-				index: '',
 				val1: '',
 				val2: '',
 				dataList: [],
@@ -105,60 +107,13 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryPointInDownload()
 		},
 		methods: {
 			toScanAdd () {
 				uni.scanCode({
 					success: (res) => {
 						// console.log('扫码成功:', res.result);
-						if (res.result.includes(';')) {
-							const parts = res.result.split(';')
-							if (parts.length !== 5) {
-								uni.showToast({
-									title: '二维码格式不正确，请扫描符合格式的二维码',
-									icon: 'none'
-								})
-								return
-							}
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: parts[0],
-								material_code: parts[1],
-								material_name: parts[2],
-								qty: parts[3],
-								measure_unit_id: parts[4],
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						} else {
-							let currObj = {
-								mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
-								container_code: res.result,
-								material_code: '',
-								material_name: '',
-								qty: '',
-								measure_unit_id: ''
-							}
-							// 检查是否已存在相同卷号
-							const exists = this.dataList.some(item => item.container_code === currObj.container_code)
-							if (exists) {
-								uni.showToast({
-									title: '已存在',
-									icon: 'none'
-								})
-								return
-							}
-							this.dataList.push(currObj)
-						}
+						this._insideCodeInsert(res.result)
 					},
 					fail: (err) => {
 						console.log('扫码失败:', err)
@@ -178,29 +133,15 @@
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
+				this.num = null
 				this.dataList = []
 				this.disabled = false
 			},
-			async _queryPointInDownload () {
+			async _insideCodeInsert (e) {
 				try {
-					let res = await queryPointInDownload()
+					let res = await insideCodeInsert(e)
 					if (res) {
-						this.options = res.data
-					} else {
-						this.options = []
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _queryPointInDtl () {
-				try {
-					let res = await queryPointInDtl(this.val1)
-					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+						this.dataList.push(res.data)
 					} else {
 						this.dataList = []
 					}
@@ -208,14 +149,34 @@
 					this.dataList = []
 				}
 			},
-			async _packInConfirm () {
+			handleChange (e) {
+				if (e) {
+					this._queryPointVehicle(e)
+				}
+			},
+			async _queryPointVehicle (e) {
+				try {
+					let res = await queryPointVehicle(e)
+					if (res) {
+						if (this.val1) {
+							this.val2 = res.data.struct_code
+						}
+						if (this.val2) {
+							this.val1 = res.data.storagevehicle_code
+						}
+					} else {
+					}
+				} catch (e) {
+				}
+			},
+			async _confirmInside () {
 				this.disabled = true
-				if (!this.val1 || !this.index || !this.dataList.length) {
+				if (!this.val1 || !this.val2 || !this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await packInConfirm(this.val1, this.index, this.dataList)
+					let res = await confirmInside(this.num, this.val1,  this.val2, this.dataList)
 					if (res) {
 						uni.showToast({
 							title: res.message,