From 5bba56bfc533b5e80b8d6c52b6a07dfe4236c25d 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: Mon, 16 Dec 2024 09:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8Cgrid=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl          |  5 ++++
 pages/manage/bake-process.vue     | 42 +++++++++++++++----------------
 pages/manage/raw-foil-progess.vue |  4 ++-
 pages/manage/split-feed.vue       |  4 +--
 utils/mork2.js                    |  6 +++++
 5 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index b56584a..a94b911 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -189,6 +189,11 @@ uni-button:after {
 	z-index: 101;
 	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
 }
+.slide_new table th .td_3, .slide_new table td.td_3 {
+	width: 110px;
+	line-height: 28rpx;
+	white-space: unset;
+}
 .slide_new table th.fontcol1,.slide_new table td.fontcol1 {
 	color: #4e6ef2;
 	font-weight: bold;
diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
index 5e2121c..3f3d7e2 100644
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -4,38 +4,38 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">点位</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-19">
 						<search-box
 						v-model="val1"
 						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">母卷号</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-19">
 						<search-box
 						v-model="val2"
 						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">收卷辊码</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-19">
 						<input v-model="val5" type="text" class="filter_input">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">大/小卷</span>
 					</view>
-					<view class="zd-col-17 filter_picker">
+					<view class="zd-col-19 filter_picker">
 						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
@@ -43,51 +43,51 @@
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">是否烘烤</span>
 					</view>
-					<view class="relative zd-col-17">
+					<view class="relative zd-col-19">
 						<switch :checked="isChecked" color="#6798ef" style="transform:scale(0.8)"/>
 						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">温度</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-19">
 						<input v-model="val3" type="number" class="filter_input">
 					</view>
 					<view class="zd-col-2 filter_label">度</view>
 				</view>
 				<view class="zd-row">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">时间</span>
 					</view>
-					<view class="zd-col-17">
+					<view class="zd-col-16">
 						<input v-model="val4" type="number" class="filter_input">
 					</view>
-					<view class="zd-col-2 filter_label">分</view>
+					<view class="zd-col-3 filter_label">小时</view>
 				</view>
 			</view>
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">母卷号</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.container_name}}</view>
+					<view class="zd-col-19 filter_msg">{{obj.container_name}}</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">烘烤状态</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.status}}</view>
+					<view class="zd-col-19 filter_msg">{{obj.status}}</view>
 				</view>
 				<view class="zd-row">
-					<view class="zd-col-7">
+					<view class="zd-col-5">
 						<span class="filter_label">提示</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.tip}}</view>
+					<view class="zd-col-19 filter_msg">{{obj.tip}}</view>
 				</view>
 			</view>
 		</view>
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index 29fc408..fc3c389 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -28,7 +28,9 @@
 						<span class="filter_label">母卷号</span>
 					</view>
 					<view class="zd-col-17">
-						<input v-model="val2" type="text" class="filter_input">
+						<search-box
+						v-model="val2"
+						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
diff --git a/pages/manage/split-feed.vue b/pages/manage/split-feed.vue
index 2e61806..ed3c801 100644
--- a/pages/manage/split-feed.vue
+++ b/pages/manage/split-feed.vue
@@ -22,7 +22,7 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th class="th_2">母卷号</th>
+								<th class="td_3">母卷号</th>
 								<th>机台编号</th>
 								<th>是否烘烤</th>
 								<th>烘烤时间/分</th>
@@ -34,7 +34,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.workorder_id === pkId}">
 								<td>{{ i + 1 }}</td>
-								<td class="td_2">{{e.container_name}}</td>
+								<td class="td_3">{{e.container_name}}</td>
 								<td>{{e.resource_name}}</td>
 								<td>{{['否', '是'][Number(e.is_baking)]}}</td>
 								<td>{{e.baking_time}}</td>
diff --git a/utils/mork2.js b/utils/mork2.js
index de5e12f..ab9cf11 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -29,4 +29,10 @@ export const gxgetGxSpecification = () => {
 export const devicePointQuery = () => {
 	let res = [{"text":"A1_FQ_01","value":"A10FQ00001"},{"text":"A1_FQ_02","value":"A10FQ00002"},{"text":"A1_FQ_03","value":"A10FQ00003"},{"text":"A1_FQ_04","value":null},{"text":"A1_FQ_05","value":null},{"text":"A1_FQ_06","value":null},{"text":"A1_FQ_07","value":null},{"text":"A1_FQ_08","value":null},{"text":"A1_FQ_09","value":null},{"text":"A1_FQ_10","value":null},{"text":"A1_FQ_11","value":null},{"text":"A1_FQ_12","value":null}]
 	return res
+}
+export const queryOrderInfo = () => {
+	let res = {
+		data: [{container_name: 'R-A11ED00002-241206144453-A1_014_521 2', zc_point: 'zc_point'}]
+	}
+	return res
 }
\ No newline at end of file