From 9a4956ef5d1de42e66c9af67a57734cd1367d424 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 28 May 2025 17:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E7=AE=A1=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/slitting/PaperBind.vue    | 24 +++++++++++----------
 pages/SecondPhase/slitting/StockingArea.vue | 20 ++++++++++++++++-
 utils/getData3.js                           | 12 +++++++----
 utils/getData4.js                           |  1 +
 4 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 utils/getData4.js

diff --git a/pages/SecondPhase/slitting/PaperBind.vue b/pages/SecondPhase/slitting/PaperBind.vue
index 21dfa64..635b1b1 100644
--- a/pages/SecondPhase/slitting/PaperBind.vue
+++ b/pages/SecondPhase/slitting/PaperBind.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">管芯编码</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val3" />
@@ -27,11 +27,9 @@
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">数量</span>
-					</view>
+					<view class="filter_label">列数</view>
 					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -44,8 +42,8 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !index || !index1 || !val3}" :disabled="disabled" @tap="_operateIvt('1')">绑定</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !index || !index1 || !val3}" :disabled="disabled" @tap="_operateIvt('2')">清除</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('1')">绑定</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('2')">清除</button>
 		</view>
 	</view>
 </template>
@@ -67,7 +65,8 @@
 				val3: '',
 				options1: [{value: '1', text: '1'}, {value: '2', text: '2'}, {value: '3', text: '3'}, {value: '4', text: '4'}, {value: '5', text: '5'}],
 				index1: '',
-				val2: '',
+				options2: [{value: '1', text: '1'}, {value: '2', text: '2'}, {value: '3', text: '3'}, {value: '4', text: '4'}, {value: '5', text: '5'}],
+				index2: '',
 				options: [],
 				index: '',
 				newoptions: [],
@@ -91,6 +90,9 @@
 			selectChange1 (e) {
 				this.index1 = e
 			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
 			selectChange (e) {
 				this.index = e
 			},
@@ -117,12 +119,12 @@
 			},
 			async _operateIvt (type) {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index || !this.index1 || !this.val3) {
+				if (!this.val1 || !this.index || !this.index1 || !this.index2 || !this.val3) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await operateIvt(type, this.val1, this.index1, this.val2, this.index, this.val3)
+					let res = await operateIvt(type, this.val1, this.index1, this.index2, this.index, this.val3)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -135,9 +137,9 @@
 			clearUp () {
 				this.val1 = ''
 				this.val3 = ''
-				this.val2 = ''
 				this.index = ''
 				this.index1 = ''
+				this.index2 = ''
 			}
 		}
 	}
diff --git a/pages/SecondPhase/slitting/StockingArea.vue b/pages/SecondPhase/slitting/StockingArea.vue
index 833e881..eaf08d5 100644
--- a/pages/SecondPhase/slitting/StockingArea.vue
+++ b/pages/SecondPhase/slitting/StockingArea.vue
@@ -26,6 +26,7 @@
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
 			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_doStockAreaBinding">绑定</button>
 			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_doStockAreaUnbinding">解绑</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock">管芯入库</button>
 		</view>
 	</view>
 </template>
@@ -33,7 +34,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {doStockAreaBinding, doStockAreaUnbinding} from '@/utils/getData3.js'
+	import {doStockAreaBinding, doStockAreaUnbinding, instorStock} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -85,6 +86,23 @@
 					this.disabled = false
 				}
 			},
+			async _instorStock () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await instorStock(this.val1, this.val2, '1')
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
diff --git a/utils/getData3.js b/utils/getData3.js
index bb797e4..6f91849 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -163,9 +163,9 @@ export const updatePackageInfo = (ivt, cn, code) => request({
 /**
  * 纸管绑定
  */
-export const operateIvt = (type, vcode, num, qty, code, point) => request({
+export const operateIvt = (type, vcode, rnum, cnum, qty, code, pcode) => request({
 	url:'api/bstIvtStockingivt/operateIvt',
-	data: {type: type, vehicle_code: vcode, row_num: num, qty: qty, material_code: code, point_code: point}
+	data: {type: type, vehicle_code: vcode, row_num: rnum, col_num: cnum, qty: qty, material_code: code, paper_code: pcode}
 })
 /**
  * 分切暂存下料
@@ -235,13 +235,17 @@ export const bindSlitterSubVolumeInfo = (code, name) => request({
  * 备货区管理
  */
 export const doStockAreaBinding = (code, vcode) => request({
-	url:'api/pda/slitter/doStockAreaBinding',
+	url:'api/pda/stockingivt/doStockAreaBinding',
 	data: {point_code: code, vehicle_code: vcode}
 })
 export const doStockAreaUnbinding = (code) => request({
-	url:'api/pda/slitter/doStockAreaUnbinding',
+	url:'api/pda/stockingivt/doStockAreaUnbinding',
 	data: {point_code: code}
 })
+export const instorStock = (code, vcode, type) => request({
+	url:'api/pda/stockingivt/instorStock',
+	data: {point_code: code, vehicle_code: vcode, operate_type: type}
+})
 /**
  * AGV放行
  */
diff --git a/utils/getData4.js b/utils/getData4.js
new file mode 100644
index 0000000..0265f7b
--- /dev/null
+++ b/utils/getData4.js
@@ -0,0 +1 @@
+// 新增接口
\ No newline at end of file