From 0b721acb48e0b2c0a6ddc48030ccce1f8885c4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 29 Oct 2024 15:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/axis-bind.vue       | 57 ++++++++++++++++++--------------
 pages/manage/sub-vol-offline.vue | 34 +++----------------
 utils/getData2.js                |  4 +--
 3 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue
index d5e7d9c..49efa24 100644
--- a/pages/manage/axis-bind.vue
+++ b/pages/manage/axis-bind.vue
@@ -27,38 +27,37 @@
 					<table>
 						<thead>
 							<tr>
-								<th>母卷号</th>
 								<th>子卷号</th>
+								<th>上下轴</th>
+								<th>左右卷</th>
 								<th>机台编号</th>
 								<th>分切组</th>
 								<th>生产顺序</th>
 								<th>生产日期</th>
 								<th>订单号</th>
 								<th>纸筒/FRP管</th>
-								<th>纸筒物料编码</th>
-								<th>纸筒物料描述</th>
-								<th>纸筒规格</th>
-								<th>FRP管物料编码</th>
-								<th>FRP管物料描述</th>
-								<th>FRP管规格</th>
+								<th>纸筒/FRP管物料编码</th>
+								<th>纸筒/FRP管物料描述</th>
+								<th>纸筒/FRP管规格</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
-								<td>{{e.source_container_name}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.checked}">
 								<td>{{e.container_name}}</td>
+								<td>{{e.up_or_down}}</td>
+								<td>{{e.left_or_right}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
 								<td>{{e.manufacture_sort}}</td>
 								<td>{{e.manufacture_date}}</td>
 								<td>{{e.mfg_order_name}}</td>
-								<td>{{e.paper_tube_or_FRP}}</td>
-								<td>{{e.paper_tube_material}}</td>
-								<td>{{e.paper_tube_description}}</td>
-								<td>{{e.paper_tube_model}}</td>
-								<td>{{e.FRP_material}}</td>
-								<td>{{e.FRP_description}}</td>
-								<td>{{e.FRP_model}}</td>
+								<td>{{['纸管', 'FRP管'][Number(e.paper_tube_or_FRP) - 1]}}</td>
+								<td v-show="e.paper_tube_or_FRP === '1'">{{e.paper_tube_material}}</td>
+								<td v-show="e.paper_tube_or_FRP === '1'">{{e.paper_tube_description}}</td>
+								<td v-show="e.paper_tube_or_FRP === '1'">{{e.paper_tube_model}}</td>
+								<td v-show="e.paper_tube_or_FRP === '2'">{{e.frp_material}}</td>
+								<td v-show="e.paper_tube_or_FRP === '2'">{{e.frp_description}}</td>
+								<td v-show="e.paper_tube_or_FRP === '2'">{{e.frp_model}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -69,7 +68,7 @@
 			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_doSendShaft">呼叫送轴</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_toCleanCutCacheInventory">点位清除</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !pkId}" :disabled="disabled" @tap="_doBindingGx">纸管绑定</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !checkArr.length}" :disabled="disabled" @tap="_doBindingGx">纸管绑定</button>
 		</view>
 	</view>
 </template>
@@ -90,8 +89,7 @@
 				index: '',
 				options: [],
 				dataList: [],
-				pkId: '',
-				pkObj: {},
+				checkArr: [],
 				disabled: false
 			};
 		},
@@ -111,6 +109,9 @@
 			},
 			async _getSlitterNeedShaftPlans (e) {
 				let res = await getSlitterNeedShaftPlans(e)
+				res.map(el => {
+					this.$set(el, 'checked', false)
+				})
 				this.dataList = [...res]
 			},
 			async _doSendShaft () {
@@ -149,12 +150,19 @@
 			},
 			async _doBindingGx () {
 				this.disabled = true
-				if (!this.val1 || !this.pkId) {
+				if (!this.val1 || !this.checkArr.length) {
 					this.disabled = false
 					return
 				}
+				if (this.checkArr.length > 2) {
+					uni.showToast({
+						title: '最多选择两条信息',
+						icon: 'none'
+					})
+					return
+				}
 				try {
-					let res = await doBindingGx(this.val1, [this.pkObj])
+					let res = await doBindingGx(this.val1, this.checkArr)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -168,13 +176,12 @@
 				this.val1 = ''
 				this.index = ''
 				this.dataList = []
-				this.pkId = ''
-				this.pkObj = {}
+				this.checkArr = []
 				this.disabled = false
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.container_name ? '' : e.container_name
-				this.pkObj = this.pkId === e.container_name ? e : {}
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(el => el.checked === true)
 			}
 		}
 	}
diff --git a/pages/manage/sub-vol-offline.vue b/pages/manage/sub-vol-offline.vue
index a5ef506..de14467 100644
--- a/pages/manage/sub-vol-offline.vue
+++ b/pages/manage/sub-vol-offline.vue
@@ -3,39 +3,19 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">子卷号</span>
-					</view>
-					<view class="zd-col-17">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
 				<view class="zd-row">
-					<view class="zd-col-7">
+					<view class="zd-col-9">
 						<span class="filter_label">成品称重暂存区</span>
 					</view>
-					<view class="zd-col-17 filter_select">
+					<view class="zd-col-15 filter_select">
 						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>	
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">载具号</span>
-					</view>
-					<view class="zd-col-17">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_doSubVolumeDown">子卷下线</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_doSubVolumeDown">子卷下线</button>
 		</view>
 	</view>
 </template>
@@ -52,10 +32,8 @@
 		data() {
 			return {
 				title: '',
-				val1: '',
 				index: '',
 				options: [],
-				val2: '',
 				disabled: false
 			};
 		},
@@ -70,12 +48,12 @@
 			},
 			async _doSubVolumeDown () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await doSubVolumeDown(this.index, this.val1, this.val2)
+					let res = await doSubVolumeDown(this.index)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -86,9 +64,7 @@
 				}
 			},
 			clearUp () {
-				this.val1 = ''
 				this.index = ''
-				this.val2 = ''
 				this.disabled = false
 			}
 		}
diff --git a/utils/getData2.js b/utils/getData2.js
index 7e8ba1a..78b9a71 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -189,7 +189,7 @@ export const getWeightCacheInfos = () => request({
 	url:'api/pda/nbj/getWeightCacheInfos',
 	data: {}
 })
-export const doSubVolumeDown = (code, cn, vcode) => request({
+export const doSubVolumeDown = (code) => request({
 	url:'api/pda/nbj/doSubVolumeDown',
-	data: {point_code: code, container_name: cn, vehicle_code: vcode}
+	data: {point_code: code}
 })
\ No newline at end of file