From 10fe36a8c405f6066374b1f1c06d57dc3896960e Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 16 May 2024 14:19:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E8=AE=A1=E5=88=92=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=B7=A5=E5=8D=95=E4=BB=BB=E5=8A=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=88=E6=AD=A2=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E6=94=B9=E4=B8=BA=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/orderDay/index.ts                 |  4 +
 src/pages/mes/orderDayPlan/detail.vue         | 99 ++++++++++++++++---
 src/pages/mes/orderDayPlan/orderDayPlan.vue   | 36 ++++++-
 .../mes/workScheduling/workScheduling.vue     |  2 +-
 4 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index 0770e63..22c2590 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -48,3 +48,7 @@ export function getBomInfoList(params) {
 export function updateBomInfo(params) {
     return http.post('/mes/complete-inspect/update', params)
 }
+
+export function planStop(params) {
+    return http.post('/mes/orderday/stopPlan/'+ params)
+}
diff --git a/src/pages/mes/orderDayPlan/detail.vue b/src/pages/mes/orderDayPlan/detail.vue
index df9163e..c9e94e5 100644
--- a/src/pages/mes/orderDayPlan/detail.vue
+++ b/src/pages/mes/orderDayPlan/detail.vue
@@ -1,6 +1,68 @@
 <template>
+	<view class="detail-container">
+		<view class="info">
+			<view class="title">
+			  <view>日计划明细</view>
+			</view>
+			<view>
+			<u-table class="custom-table">
+				<u-tr >
+					<u-td >日计划号</u-td>
+					<u-td >{{ data.planNoDay }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td >计划数量</u-td>
+					<u-td>{{ data.planCount }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>批次码</u-td>
+					<u-td>{{ data.batchCode }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>产品编码</u-td>
+					<u-td>{{ data.productCode }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>车间编码</u-td>
+					<u-td>{{ data.workroomCode }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>产线编码</u-td>
+					<u-td>{{ data.lineCode }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>工艺路线编码</u-td>
+					<u-td>{{ data.processrouteCode }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>BOM版本</u-td>
+					<u-td>{{ data.standardBom }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>工单模式：</u-td>
+					<u-td v-if="data.workMode=='BATCH'">批量</u-td>
+					<u-td v-if="data.workMode=='SINGLE'">单个模式</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>计划日期：</u-td>
+					<u-td>{{ `${$time.formatDate(data.planDate)}` }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>开始时间：</u-td>
+					<u-td>{{ `${$time.formatDate(data.startTime)}` }}</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>结束时间：</u-td>
+					<u-td>{{ `${$time.formatDate(data.endTime)}` }}</u-td>
+				</u-tr>
+			</u-table>
+			</view>
+		</view>
+
+	</view>
+
   <!-- 详情 -->
-  <view class="detail-container">
+<!--  <view class="detail-container">
     <view class="info">
       <view class="title">
         <view>日计划明细</view>
@@ -66,21 +128,13 @@
           <view>结束时间：</view>
           <view>{{ `${$time.formatDate(data.endTime)}` }}</view>
         </view>
-		<view class="dec-item">
-		  <view>齐套检查-Bom：</view>
-		  <view>{{ data.bomInspect }}</view>
-		</view>
       </view>
     </view>
     <view class="footer" v-if="from == 3">
-      <view class="btns">
-        <button class="reset" @click="reject">驳回</button>
-        <button class="sure" @click="agree" :loading='loading' :disabled='loading'>通过</button>
-      </view>
       <view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
     </view>
     <view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
-  </view>
+  </view> -->
 </template>
 
 <script setup lang="ts">
@@ -94,10 +148,10 @@ import {
 } from 'vue'
 import * as orderDayPlanListApi from '@/api/mes/orderDay/index.ts'
 
-const {proxy} = getCurrentInstance()
+
 const number = ref('')
 const data = ref({})
-const loading = ref(false)
+
 const from = ref()//1从我的进入3从审核进入
 const type = ref()
 
@@ -124,6 +178,27 @@ onShow(() => {
 </script>
 
 <style lang="scss" scoped>
+	.custom-table {
+	  margin-left: auto;
+	  margin-right: auto;
+	  //margin-top: 20px;
+	  border-collapse: collapse;
+	  border: 0px solid black;
+	  width: 100%;
+	  
+	}
+	.custom-table th,
+	// .custom-table td {
+	//   border: 1px solid black;
+	//   padding: 8px;
+	//   text-align: center;
+	// }
+	.custom-table-td {
+	  padding: 1px;
+	  text-align: center;
+	  
+	}
+	
 	.detail-container {
 		min-height: 100vh;
 		background: white;
diff --git a/src/pages/mes/orderDayPlan/orderDayPlan.vue b/src/pages/mes/orderDayPlan/orderDayPlan.vue
index 677a06b..b5ab7b4 100644
--- a/src/pages/mes/orderDayPlan/orderDayPlan.vue
+++ b/src/pages/mes/orderDayPlan/orderDayPlan.vue
@@ -31,8 +31,6 @@
         <view class="dec">
           <view>状态：</view>
           <view>
-<!-- 			<u-tag text="待齐套" v-if="item.status==-1" bg-color='rgba(255,255,255,0)' color='#fe8463'
-			         border-color='#fe8463' type="primary" shape='circle'/> -->
             <u-tag text="待排产" v-if="item.status==1" bg-color='rgba(255,255,255,0)' color='#fe8463'
                    border-color='#fe8463' type="primary" shape='circle'/>
             <u-tag text="已排产" v-if="item.status==2" bg-color='rgba(255,255,255,0)' color='#fe8463'
@@ -45,9 +43,9 @@
                    border-color='#fe8463' type="primary" shape='circle'/>
           </view>
         </view>
-		<!-- <view v-if="item.status==-1" >
-			<u-button type="primary" @click="openInspectItem(item)">齐套检查</u-button>
-		</view> -->
+		<view>
+			<u-button type="error" v-if="item.status==2 || item.status==1"   @click="stopPlan(item)">终止</u-button>
+		</view>
       </view>
       <view style="height: 94rpx;padding-top: 30rpx;">
       		<u-loadmore :status="status" v-if="status != 'loadmore'" />
@@ -134,6 +132,27 @@ const tabParams = ref({
   flag: null
 })
 
+function stopPlan(item){
+	item.id = 100;
+	console.log(item)
+	proxy.$modal.confirm('确定提交终止吗').then(() => {
+		proxy.$modal.loading('处理中')
+		orderDayPlanListApi.planStop(item.id).then((res) => {
+			proxy.$modal.closeLoading()
+			if (res.data) {
+				list.value = []
+				status.value = 'loadmore'
+				getTabsList()
+			} else {
+	
+			}
+		}).catch(() => {
+			proxy.$modal.closeLoading()
+		})
+		proxy.$modal.closeLoading()
+	})
+}
+
 function getTabsList() {
   if (status.value == 'nomore') return
   status.value = 'loading'
@@ -299,4 +318,11 @@ async function searchTable() {
 			}
 		}
 	}
+	
+	.btn {
+		margin-left: 8px;
+		width: 55px;
+		height: 35px;
+		font-size: 17px
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index 71fa2a0..98e8c61 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -104,7 +104,7 @@
 									class="text">
 									<u-td>{{ detailIndex + 1 }}</u-td>
 									<u-td>{{ detail.nodeCode }}</u-td>
-									<u-td v-if="detail.nodeCode==item.workingNode && item.status==1">
+									<u-td v-if="detail.nodeCode==item.workingNode && item.status==1 && detail.status==0">
 										<u-button  type="success" @click="nodeCodeFinish(detail)" class="tableBtn" >待完成</u-button>
 									</u-td>
 									<u-td v-if="detail.status==2 && item.status==1">