联调修改

pages/manage/split-feed.vue

@@ -4,15 +4,16 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
+					<view class="zd-col-3">
 						<span class="filter_label">点位</span>
 					</view>
-					<view class="zd-col-14">
+					<view class="zd-col-12">
 						<search-box
 						v-model="val1"
 						/>
 					</view>
 					<button class="zd-col-4 button-primary button-primary_s" @tap="_queryOrderInfo">查询</button>
+					<button class="zd-col-4 button-default button-primary_s" @tap="clearUp">清空</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
@@ -20,38 +21,26 @@
 					<table>
 						<thead>
 							<tr>
-								<th>母卷号</th>
-								<th>子卷号</th>
+								<th>序号</th>
+								<th class="th_2">母卷号</th>
 								<th>机台编号</th>
-								<th>分切组</th>
-								<th>生产顺序</th>
-								<th>生产日期</th>
-								<th>订单号</th>
-								<th>纸筒/FRP管</th>
-								<th>纸筒物料编码</th>
-								<th>纸筒物料描述</th>
-								<th>纸筒规格</th>
-								<th>FRP管物料编码</th>
-								<th>FRP管物料描述</th>
-								<th>FRP管规格</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.source_container_name}}</td>
-								<td>{{e.container_name}}</td>
-								<td>{{e.point_code}}</td>
-								<td>{{e.split_group}}</td>
-								<td>{{e.manufacture_sort}}</td>
-								<td>{{e.manufacture_date}}</td>
-								<td>{{e.mfg_order_name}}</td>
-								<td>{{e.paper_tube_or_FRP}}</td>
-								<td>{{e.paper_tube_material}}</td>
-								<td>{{e.paper_tube_description}}</td>
-								<td>{{e.paper_tube_model}}</td>
-								<td>{{e.FRP_material}}</td>
-								<td>{{e.FRP_description}}</td>
-								<td>{{e.FRP_model}}</td>
+							<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>{{e.resource_name}}</td>
+								<td>{{['否', '是'][Number(e.is_baking)]}}</td>
+								<td>{{e.baking_time}}</td>
+								<td>{{['大卷', '小卷'][Number(e.is_baking) - 1]}}</td>
+								<td>{{e.baking_temperature}}</td>
+								<td>{{e.zc_point}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -59,11 +48,11 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-3 button-default" @tap="clearUp">清空</button>
 			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitvehicleReturn">空轴送回</button>
 			<button class="zd-col-5 button-primary" :class="{'button-info': !val1 || !pkId}" :disabled="disabled" @tap="_slitcallSlitterRoll">呼叫母卷</button>
 			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitsendSlitterRoll">母卷送回</button>
-			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitallowCoiling">确认上料</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitallowCoiling('1')">确认上料</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitallowCoiling('2')">允许离开</button>
 		</view>
 	</view>
 </template>
@@ -97,13 +86,14 @@
 				this.dataList = [...res.data]
 			},
 			toCheck (e) {
-				this.pkId = e.container_name === this.pkId ? '' : e.container_name
-				this.pkObj = e.container_name === this.pkId ? e : {}
+				this.pkId = e.workorder_id === this.pkId ? '' : e.workorder_id
+				this.pkObj = e.workorder_id === this.pkId ? e : {}
 			},
 			clearUp () {
-				this.index = ''
 				this.val1 = ''
-				this.val2 = ''
+				this.dataList = []
+				this.pkId = ''
+				this.pkObj = {}
 				this.disabled = false
 			},
 			async _slitvehicleReturn () {
@@ -157,14 +147,14 @@
 					this.disabled = false
 				}
 			},
-			async _slitallowCoiling () {
+			async _slitallowCoiling (type) {
 				this.disabled = true
 				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await slitallowCoiling(this.val1)
+					let res = await slitallowCoiling(this.val1, type)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -180,5 +170,5 @@
 
 <style lang="stylus" scoped>
 .button-primary
-	font-size: 28rpx;
+	font-size: 24rpx;
 </style>