From 383c989e65ba8c55229804fa4823ac1e973e0c01 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: Thu, 5 Sep 2024 13:09:39 +0800
Subject: [PATCH] =?UTF-8?q?add=E9=87=8D=E9=87=8F=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/manage/axis-bind.vue                    |  2 +-
 .../manage/{fill-tray.vue => weight-bind.vue} | 49 +++++++++----------
 utils/getData2.js                             |  5 ++
 utils/mork2.js                                |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)
 rename pages/manage/{fill-tray.vue => weight-bind.vue} (54%)

diff --git a/pages.json b/pages.json
index 56cab47..4044db6 100644
--- a/pages.json
+++ b/pages.json
@@ -67,7 +67,7 @@
             
         }
         ,{
-            "path" : "pages/manage/fill-tray",
+            "path" : "pages/manage/weight-bind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue
index 7141a8f..d667e03 100644
--- a/pages/manage/axis-bind.vue
+++ b/pages/manage/axis-bind.vue
@@ -28,7 +28,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th class="th_2">母卷号</th>
+								<th>母卷号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
diff --git a/pages/manage/fill-tray.vue b/pages/manage/weight-bind.vue
similarity index 54%
rename from pages/manage/fill-tray.vue
rename to pages/manage/weight-bind.vue
index c00dc01..ee46839 100644
--- a/pages/manage/fill-tray.vue
+++ b/pages/manage/weight-bind.vue
@@ -5,7 +5,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
+						<span class="filter_label">子卷号</span>
 					</view>
 					<view class="zd-col-19">
 						<search-box
@@ -13,22 +13,27 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">管芯重量</span>
+					</view>
+					<view class="zd-col-19">
+						<input v-model="val2" type="number" class="filter_input">
+					</view>
+				</view>
 				<view class="zd-row">
 					<view class="zd-col-5">
-						<span class="filter_label">载具类型</span>
+						<span class="filter_label">子卷重量</span>
 					</view>
-					<view class="zd-col-17 filter_picker">
-						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
-							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
-						</picker>
+					<view class="zd-col-19">
+						<input v-model="val3" type="number" class="filter_input">
 					</view>
-					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || index1 === ''}" :disabled="disabled" @tap="_handheldStorehouse">确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_doSubVolumeBindingWeight">绑定重量</button>
 		</view>
 	</view>
 </template>
@@ -36,7 +41,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {vehicleType, handheldStorehouse} from '@/utils/getData2.js'
+	import {doSubVolumeBindingWeight} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -46,8 +51,8 @@
 			return {
 				title: '',
 				val1: '',
-				options1: [],
-				index1: '',
+				val2: '',
+				val3: '',
 				disabled: false
 			};
 		},
@@ -56,25 +61,14 @@
 			this._vehicleType()
 		},
 		methods: {
-			/** 载具类型下拉框 */
-			async _vehicleType () {
-				let res = await vehicleType()
-				this.options1 = [...res.content]
-				this.options1.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			pickerChange (e) {
-				this.index1 = e.detail.value
-			},
-			async _handheldStorehouse () {
+			async _doSubVolumeBindingWeight () {
 				this.disabled = true
-				if (!this.val1 || this.index1 === '') {
-					this.disabled1 = false
+				if (!this.val1 || !this.val2 || !this.val3) {
+					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldStorehouse(this.val1, this.options1[this.index1].value)
+					let res = await doSubVolumeBindingWeight(this.val1, this.val2, this.val3)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -85,8 +79,9 @@
 				}
 			},
 			clearUp () {
-				this.index1 = ''
 				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
 				this.disabled = false
 			}
 		}
diff --git a/utils/getData2.js b/utils/getData2.js
index 2dc1db9..8284b9c 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -91,4 +91,9 @@ export const doBindingGx = (code, row) => request({
 export const toCleanCutCacheInventory = (code) => request({
 	url:'api/pda/nbj/toCleanCutCacheInventory',
 	data: {point_code: code}
+})
+// 重量维护
+export const doSubVolumeBindingWeight = (cn, roll, paper) => request({
+	url:'api/pda/nbj/doSubVolumeBindingWeight',
+	data: {container_name: cn, roll_weight: roll, paper_weight: paper}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 14a5025..d712f1f 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -8,7 +8,7 @@ export const authority = () => {
 				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
 				{path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
 				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]},
-				{path: 'RF01', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}]}
+				{path: 'RF01', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}]}
 			]
 		}
 	}}