From 7074bf9db3cb6788698259e96e9ec6068a7c33cd Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 27 Feb 2023 14:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99=E4=BA=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=91=BC=E5=8F=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                 |   3 +
 pages/ProductManage/SlittingFeeding.vue | 109 +++++++++++++++++++++++-
 utils/getData2.js                       |  16 ++++
 3 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 45da19a..af80069 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -283,6 +283,9 @@ uni-button:after {
 	justify-content: center;
 	align-items: center;
 }
+.msg_wrapper_1 {
+	text-align: left;
+}
 
 .msg_box {
 	width: 90%;
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index c804e0e..8f9d69f 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -77,16 +77,51 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
+			<button class="submit-button" @tap="handleSure">人工呼叫</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
 			<button class="submit-button" @tap="searchList">查询</button>
 		</view>
+		<view v-if="active" class="msg_wrapper msg_wrapper_1">
+			<view class="msg_box">
+				<view class="filter_item">
+					<view class="filter_label">起点</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						@handleChange="handleChange1"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">母卷号</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val4"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">终点</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val5"
+						/>
+					</view>
+				</view>
+				<view class="msg_btns">
+					<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
+					<button class="submit-button msg_btn" @tap="modalToSure">确认</button>
+				</view>
+			</view>
+		</view>
+		<view v-if="active" class="msg_mask"></view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm} from '@/utils/getData2.js'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -111,7 +146,12 @@
 				},
 				totalCount: 0,
 				pageNum: 1,
-				pageSize: 10
+				pageSize: 10,
+				active: false,
+				val3: '',
+				val4: '',
+				val5: '',
+				disabled1: false
 			};
 		},
 		created () {
@@ -159,7 +199,7 @@
 					this.status = 'noMore'
 				}
 			},
-			/** 确认 */
+			/** 呼叫 */
 			async toSure () {
 				this.disabled = true
 				if (!this.pkId) {
@@ -182,7 +222,68 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.container_name ? '' : e.container_name
 				this.pkObj = this.pkId === e.container_name ? e : {}
-			}
+			},
+			handleSure () {
+				this.active = true
+			},
+			cancleModal () {
+				this.active = false
+				this.val3 = ''
+				this.val4 = ''
+				this.val5 = ''
+			},
+			handleChange1 (e) {
+				this._feedingQueryPoint(e)
+			},
+			/** 扫码起点带出母卷 */
+			async _feedingQueryPoint (e) {
+				let res = await feedingQueryPoint(e)
+				this.val4 = res.content.container_name
+			},
+			/** 人工呼叫 */
+			async modalToSure () {
+				this.disabled1 = true
+				if (!this.val3) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '起点不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.val4) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '母卷号不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.val5) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '终点不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				try {
+					let res = await feedingHandleConfirm(this.val3, this.val4, this.val5)
+					this.disabled1 = false
+					this.active = false
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
 		}
 	}
 </script>
diff --git a/utils/getData2.js b/utils/getData2.js
index 90c6a3f..5e8064b 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -429,6 +429,22 @@ export const feedingConfirm = (row) => request({
 		cut_rows: row
 	}
 })
+// 1.3扫码起点带出母卷	
+export const feedingQueryPoint = (code) => request({
+	url:'api/pda/feeding/queryPoint',
+	data: {
+		point_code: code
+	}
+})
+// 1.4人工呼叫
+export const feedingHandleConfirm = (code, cn, ncode) => request({
+	url:'api/pda/feeding/handleConfirm',
+	data: {
+		point_code: code,
+		container_name: cn,
+		next_point_code: ncode
+	}
+})
 
 /**
  * 任务管理