From 2c8273b888dff01d43cdf0eb3b7a09c6692363c6 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 12 Oct 2022 15:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              | 40 +++++-------
 pages/ProductManage/SboProdProgress.vue | 68 ++++++++++++++++++--
 utils/getData1.js                       | 83 +++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 28 deletions(-)

diff --git a/pages.json b/pages.json
index 6b8a10b..3b83893 100644
--- a/pages.json
+++ b/pages.json
@@ -19,36 +19,28 @@
 		    }  
 		}
 		,{
-		    "path" : "pages/ProductManage/SboProdProgress",
-		    "style" : {
-		        "navigationBarTitleText": "生箔生产进度",
-		    	"navigationStyle": "default",
-		        "enablePullDownRefresh": false
-		    }   
+				"path" : "pages/ProductManage/SboProdProgress",
+				"style": {
+					"navigationStyle": "custom"
+				}  
 		}
 		,{
-		    "path" : "pages/ProductManage/SboProcess",
-		    "style" : {
-		        "navigationBarTitleText": "生箔工序",
-		    	"navigationStyle": "default",
-		        "enablePullDownRefresh": false
-		    }   
+				"path" : "pages/ProductManage/SboProcess",
+				"style": {
+					"navigationStyle": "custom"
+				}  
 		}
 		,{
-		    "path" : "pages/ProductManage/BakeProcess",
-		    "style" : {
-		        "navigationBarTitleText": "烘烤工序",
-		    	"navigationStyle": "default",
-		        "enablePullDownRefresh": false
-		    }   
+				"path" : "pages/ProductManage/BakeProcess",
+				"style": {
+					"navigationStyle": "custom"
+				}  
 		}
 		,{
-		    "path" : "pages/ProductManage/PointManage",
-		    "style" : {
-		        "navigationBarTitleText": "点位管理",
-		    	"navigationStyle": "default",
-		        "enablePullDownRefresh": false
-		    }   
+				"path" : "pages/ProductManage/PointManage",
+				"style": {
+					"navigationStyle": "custom"
+				}  
 		}
 		,{
 		    "path" : "pages/ProductManage/EmptyPipeInStore",
diff --git a/pages/ProductManage/SboProdProgress.vue b/pages/ProductManage/SboProdProgress.vue
index 239d03a..adf4b87 100644
--- a/pages/ProductManage/SboProdProgress.vue
+++ b/pages/ProductManage/SboProdProgress.vue
@@ -1,19 +1,79 @@
 <template>
-	<view>
-		
+	<view class="container">
+		<nav-bar title="生箔生产进度"></nav-bar>
+		<view class="content">
+			<view class="wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input">
+					</view>
+				</view>
+			</view>
+			<view class="wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<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">
+								<td>{{e.container_name}}</td>
+								<td>{{e.up_coiler_date}}</td>
+								<td>{{e.end_date}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.mfg_order_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button">查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import {queryProductArea, queryRawFoil} from '@/utils/getData1.js'
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
-				
+				dataList: [{container_name: '1111111'}]
 			};
+		},
+		methods: {
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+.grid-wraper
+	height calc(100% - 238rpx)
 </style>
+
diff --git a/utils/getData1.js b/utils/getData1.js
index e69de29..3891bb1 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -0,0 +1,83 @@
+// 生箔生产进度
+// 1.1生产区域下拉框查询
+export const queryProductArea = (type) => request({
+	url: 'api/pda/raw/queryProductArea',
+	data: {}
+})
+// 1.2生箔生产进度初始化查询
+export const queryRawFoil = (pcode, cname, parea) => request({
+	url: 'api/pda/raw/queryRawFoil',
+	data: {
+		point_code: pcode,
+		container_name: cname,
+		product_area: parea
+	}
+})
+
+// 生箔工序
+// 1.1生箔工序初始化查询
+export const queryRawFoilList = (pcode, cname) => request({
+	url: 'api/pda/raw/queryRawFoilList',
+	data: {
+		point_code: pcode,
+		container_name: cname
+	}
+})
+// 1.2呼叫空轴
+export const needEmptyAxis = (rjo) => request({
+	url: 'api/pda/raw/needEmptyAxis',
+	data: {
+		raw_jo: rjo
+	}
+})
+// 1.3确认下卷
+export const confirmBlanking = (rjo) => request({
+	url: 'api/pda/raw/confirmBlanking',
+	data: {
+		raw_jo: rjo
+	}
+})
+// 1.4下卷完成
+export const finishBlanking = (rjo) => request({
+	url: 'api/pda/raw/finishBlanking',
+	data: {
+		raw_jo: rjo
+	}
+})
+// 1.5完成
+export const finish = (rjo) => request({
+	url: 'api/pda/raw/finish',
+	data: {
+		raw_jo: rjo
+	}
+})
+
+// 烘烤工序
+// 1.1出入烘箱
+export const ovenInAndOut = (pcode, cname, temp, hours, option) => request({
+	url: 'api/pda/baking/ovenInAndOut',
+	data: {
+		point_code: pcode,
+		container_name: cname,
+		temperature: temp,
+		hours: hours,
+		option: option,
+	}
+})
+
+// 点位管理
+// 1.1点位解绑绑定
+export const pointOperate = (pcode, cname) => request({
+	url: 'api/pda/point/pointOperate',
+	data: {
+		point_code: pcode,
+		container_name: cname
+	}
+})
+// 1.2点位状态查询
+export const pointStatusQuery = (pcode, cname) => request({
+	url: 'api/pda/point/pointStatusQuery',
+	data: {
+		point_code: pcode
+	}
+})
\ No newline at end of file