From 83b7880e01b97ad03c94ce44b14d4f9e2d457f4e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 18 Apr 2024 15:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=84=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/DeliveryUnbind.vue          |  17 --
 pages/SecondPhase/DeliveryUnbindConfirm.vue   |   2 +-
 pages/SecondPhase/production/BakeProcess.vue  | 158 ++++++++++
 pages/SecondPhase/production/ManmadeBake.vue  | 155 ++++++++++
 pages/SecondPhase/production/SboProcess.vue   | 271 ++++++++++++++++++
 .../production/SboProdProgress.vue            | 159 ++++++++++
 .../SecondPhase/production/SurfaceProcess.vue |  89 ++++++
 utils/getData3.js                             |  26 +-
 utils/mork2.js                                |   7 +
 9 files changed, 865 insertions(+), 19 deletions(-)
 create mode 100644 pages/SecondPhase/production/BakeProcess.vue
 create mode 100644 pages/SecondPhase/production/ManmadeBake.vue
 create mode 100644 pages/SecondPhase/production/SboProcess.vue
 create mode 100644 pages/SecondPhase/production/SboProdProgress.vue
 create mode 100644 pages/SecondPhase/production/SurfaceProcess.vue

diff --git a/pages/SecondPhase/DeliveryUnbind.vue b/pages/SecondPhase/DeliveryUnbind.vue
index 3b2a40b..dcec560 100644
--- a/pages/SecondPhase/DeliveryUnbind.vue
+++ b/pages/SecondPhase/DeliveryUnbind.vue
@@ -111,23 +111,6 @@
 					})
 				}
 			},
-			async _twoPdaVehicleIn () {
-				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await twoPdaVehicleIn(this.val1, this.index, this.val2)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue
index 56bff86..58a3bb4 100644
--- a/pages/SecondPhase/DeliveryUnbindConfirm.vue
+++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue
@@ -49,7 +49,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': dataList.length === 0}" @tap="_twoPdaOutConfirm">确认</button>
+			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': dataList.length === 0}" :disabled="disabled" @tap="_twoPdaOutConfirm">确认</button>
 			<button class="zd-col-8 btn-submit btn-success letter-30" @tap="_twoPdaIvtDtlQuery(val1)">查询</button>
 		</view>
 		<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue
new file mode 100644
index 0000000..df6282f
--- /dev/null
+++ b/pages/SecondPhase/production/BakeProcess.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="烘烤工序"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" @handleChange="handleChange1"/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">温度</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">时间</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val4">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">入箱</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">出箱</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">质检合格</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {ovenInAndOut, inCoolIvt, bakingrelease, bakingquery} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				disabled: false,
+				disabled3: false,
+				disabled4: false
+			};
+		},
+		methods: {
+			handleChange1 (e) {
+				this._bakingquery(e)
+			},
+			/** 查询 */
+			async _bakingquery (val1) {
+				if (!val1) {
+					return
+				}
+				let res = await bakingquery(val1)
+				this.val2 = res.data.container_name
+			},
+			async _ovenInAndOut1 (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2 ||!this.val3 || !this.val4) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await ovenInAndOut(this.val1, this.val2,this.val3, this.val4, type)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _ovenInAndOut2 (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await ovenInAndOut(this.val1, this.val2,'', '', type)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _inCoolIvt () {
+				this.disabled3 = true
+				if (!this.val1 || !this.val2) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await inCoolIvt(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled3 = false
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			async _bakingrelease () {
+				this.disabled4 = true
+				if (!this.val1) {
+					this.disabled4 = false
+					return
+				}
+				try {
+					let res = await bakingrelease(this.val1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled4 = false
+				} catch (e) {
+					this.disabled4 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue
new file mode 100644
index 0000000..fa0bb4d
--- /dev/null
+++ b/pages/SecondPhase/production/ManmadeBake.vue
@@ -0,0 +1,155 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="人工烘烤"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" @handleChange="handleChange1"/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">温度</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">时间</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val4">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">终点</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val5" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">入箱</button>
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">出箱</button>
+			<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">质检合格</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handleBakingovenInAndOut, handleBakingcheckConfirm, bakingquery} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				disabled: false,
+				disabled3: false
+			};
+		},
+		methods: {
+			handleChange1 (e) {
+				this._bakingquery(e)
+			},
+			/** 查询 */
+			async _bakingquery (val1) {
+				if (!val1) {
+					return
+				}
+				let res = await bakingquery(val1)
+				this.val2 = res.data.container_name
+			},
+			async _handleBakingovenInAndOut1 (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val5) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handleBakingovenInAndOut(this.val1, this.val2,this.val3, this.val4, this.val5, type)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _handleBakingovenInAndOut2 (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val5) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handleBakingovenInAndOut(this.val1, this.val2, '', '', this.val5, type)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _handleBakingcheckConfirm () {
+				this.disabled3 = true
+				if (!this.val1 || !this.val2) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await handleBakingcheckConfirm(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.disabled3 = false
+				} catch (e) {
+					this.disabled3 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
new file mode 100644
index 0000000..e0191f2
--- /dev/null
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="生箔工序"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" 
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						:focused="true"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>状态</th>
+								<th>母卷号</th>
+								<th>工单号</th>
+								<th>机台编码</th>
+								<th>产品编码</th>
+								<th>理论长度</th>
+								<th>开始时间</th>
+								<th>结束时间</th>
+								<th>总重量</th>
+								<th>车号</th>
+								<th>生产区域</th>
+								<th>更新时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{e.status_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.theory_height}}</td>
+								<td>{{e.realstart_time}}</td>
+								<td>{{e.realend_time}}</td>
+								<td>{{e.productin_qty}}</td>
+								<td>{{e.agvno}}</td>
+								<td>{{e.product_area}}</td>
+								<td>{{e.update_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !(val1 && !pkId)}" :disabled="disabled5" @tap="_needEmptyVehicle">呼叫空轴</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
+			<!-- <button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button> -->
+			<button class="zd-col-4 btn-submit btn-success" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryRawFoilList, needEmptyAxis, needEmptyVehicle, confirmBlanking, finishBlanking, finish} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				disabled4: false,
+				disabled5: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		created () {
+			this._queryRawFoilList()
+		},
+		methods: {
+			searchList () {
+				this.pkId = ''
+				this.pkObj = {}
+				this.totalCount = 0
+				this.dataList = []
+				this.pageNum = 1
+				this._queryRawFoilList()
+			},
+			handleChange (e) {
+				this.searchList()
+			},
+			/** 初始化查询 */
+			async _queryRawFoilList () {
+				let res = await queryRawFoilList(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+				
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._queryRawFoilList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			async _needEmptyAxis () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await needEmptyAxis(this.pkObj)
+					this.disabled1 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _needEmptyVehicle () {
+				this.disabled5 = true
+				if (!(this.val1 && !this.pkId)) {
+					this.disabled5 = false
+					return
+				}
+				try {
+					let res = await needEmptyVehicle(this.val1)
+					this.disabled5 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+				} catch (e) {
+					this.disabled5 = false
+				}
+			},
+			async _confirmBlanking () {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await confirmBlanking(this.pkObj)
+					this.disabled2 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			async _finishBlanking () {
+				this.disabled3 = true
+				if (!this.pkId) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await finishBlanking(this.pkObj)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled3 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			async _finish () {
+				this.disabled4 = true
+				if (!this.pkId) {
+					this.disabled4 = false
+					return
+				}
+				try {
+					let res = await finish(this.pkObj)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled4 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+				} catch (e) {
+					this.disabled4 = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.zd_content
+		padding-bottom 154rpx
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/SecondPhase/production/SboProdProgress.vue b/pages/SecondPhase/production/SboProdProgress.vue
new file mode 100644
index 0000000..4a7f3c7
--- /dev/null
+++ b/pages/SecondPhase/production/SboProdProgress.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="生箔生产进度"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>母卷号</th>
+								<th>开始时间</th>
+								<th>预计结束时间</th>
+								<th>机台编码</th>
+								<th>点位编码</th>
+								<th>产品编码</th>
+								<th>理论长度</th>
+								<th>工单号</th>
+								<th>剩余时间(分)</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="['bgred', 'bgyellow'][Number(e.color_type) - 1]">
+								<td>{{e.container_name}}</td>
+								<td>{{e.up_coiler_date}}</td>
+								<td>{{e.end_date}}</td>
+								<td>{{e.resource_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.remaining_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-22 btn-submit btn-success" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryRawFoil} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		created () {
+			this._queryRawFoil()
+			this._queryProductArea()
+		},
+		methods: {
+			handleChange (e) {
+				console.log(e)
+			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._queryRawFoil()
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryRawFoil () {
+				let res = await queryRawFoil(this.val1, this.val2, this.index, this.pageNum + '', this.pageSize + '')
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+				
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._queryRawFoil()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgred td
+		background-color #D7592F 
+		color #ffffff
+	.bgyellow td
+		background-color #E9B451
+</style>
diff --git a/pages/SecondPhase/production/SurfaceProcess.vue b/pages/SecondPhase/production/SurfaceProcess.vue
new file mode 100644
index 0000000..3ffa5a3
--- /dev/null
+++ b/pages/SecondPhase/production/SurfaceProcess.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="表处工序"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="cleanUp">清空</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('1')">上料</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('2')">退料</button>
+			<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @tap="_surfaceConfirm">允许进入</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {surfaceOperate, surfaceConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		methods: {
+			cleanUp () {
+				this.val1 = ''
+				this.val2 = ''
+			},
+			async _surfaceOperate (type) {
+				this.disabled = true
+				try {
+					let res = await surfaceOperate(this.val1, this.val2, type)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _surfaceConfirm () {
+				this.disabled = true
+				try {
+					let res = await surfaceConfirm(this.val1)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/utils/getData3.js b/utils/getData3.js
index 13c64e5..c4d134b 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -1,4 +1,9 @@
-// 二期接口——cll
+/**
+ * author:cll
+ * day:2024-04-18
+ * content: 二期接口
+ */
+import request from './request.js'
 /**
  * 二期空载具入库
  */
@@ -55,4 +60,23 @@ export const twoPdaOutConfirm = (no) => request({
 	data: {
 		box_no: no
 	}
+})
+/**
+ * 二期表处工序
+ */
+// 出入烘箱
+export const surfaceOperate = (code, name, option) => request({
+	url:'api/pda/surface/operate',
+	data: {
+		point_code: code,
+		container_name: name,
+		option: option
+	}
+})
+// 允许进入
+export const surfaceConfirm = (code) => request({
+	url:'api/pda/surface/confirm',
+	data: {
+		point_code: code
+	}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 9fb5bfa..5aa46a9 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -64,6 +64,13 @@ export const authority = () => {
 			]},
 			{menu_id: '3', path: 'RF12', title: '发货区', sonTree: [
 				{menu_id: '1', title: '发货区解绑', path: '/pages/SecondPhase/DeliveryUnbind'}
+			]},
+			{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
+				{menu_id: '1', title: '生箔生产进度', path: '/pages/SecondPhase/production/SboProdProgress'},
+				{menu_id: '2', title: '生箔工序', path: '/pages/SecondPhase/production/SboProcess'},
+				{menu_id: '3', title: '烘烤工序', path: '/pages/SecondPhase/production/BakeProcess'},
+				{menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'},
+				{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'}
 			]}
 		]
 		}