From 6cdcea5ca1819e2cb31ba14f8fc1dc4a17b08097 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Mon, 22 Apr 2024 14:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E5=AF=BC=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E6=98=8E=E7=BB=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                              |   6 +
 src/pages/mes/orderDayPlan/detail.vue       | 348 ++++++++++----------
 src/pages/mes/orderDayPlan/orderDayPlan.vue | 174 ++++------
 3 files changed, 252 insertions(+), 276 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 6e948bd..691a5fa 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1901,6 +1901,12 @@
 			"navigationBarTitleText": "日计划查询",
 			"enablePullDownRefresh": true
 		}
+	},{
+		"path": "pages/mes/orderDayPlan/detail",
+		"style": {
+			"navigationBarTitleText": "日计划查询明细",
+			"enablePullDownRefresh": true
+		}
 	}
 
 
diff --git a/src/pages/mes/orderDayPlan/detail.vue b/src/pages/mes/orderDayPlan/detail.vue
index 1c14740..22c2c42 100644
--- a/src/pages/mes/orderDayPlan/detail.vue
+++ b/src/pages/mes/orderDayPlan/detail.vue
@@ -185,178 +185,178 @@ onShow(() => {
 </script>
 
 <style lang="scss" scoped>
-.detail-container {
-  min-height: 100vh;
-  background: white;
-}
-
-.line {
-  background: #f5f5f5;
-  height: 20 rpx;
-}
-
-.info {
-  background: white;
-}
-
-
-.tab {
-  border-bottom: 1px solid #e4e4e4;
-
-}
-
-.title {
-  display: flex;
-  align-items: center;
-  padding: 20 rpx 30 rpx;
-  border-bottom: 1px solid #e4e4e4;
-
-  view {
-    &:nth-child(1) {
-      flex: 1;
-      border-left: 10 rpx solid #409eff;
-      padding-left: 20 rpx;
-      font-weight: bold;
-    }
-  }
-}
-
-.dec {
-  padding: 30 rpx;
-
-  .dec-item {
-    padding-bottom: 30 rpx;
-    display: flex;
-
-    view {
-      &:nth-child(1) {
-        width: 200 rpx;
-      }
-
-      &:nth-child(2) {
-        color: #888888;
-        flex: 1;
-        width: 0px;
-        word-wrap: break-word;
-      }
-    }
-  }
-}
-
-.dec2 {
-  padding: 10 rpx 30 rpx;
-  display: flex;
-
-  view {
-    &:nth-child(1) {
-      width: 180 rpx;
-    }
-
-    &:nth-child(2) {
-      color: #888888;
-      flex: 1;
-      width: 0px;
-      word-wrap: break-word;
-    }
-  }
-
-
-}
-
-.items {
-  border-radius: 12 rpx;
-  background: #F5F5F5;
-  padding-bottom: 20 rpx;
-
-  .items-name {
-    padding: 20 rpx;
-    border-bottom: 1px solid #dedede;
-  }
-
-  .items-dec {
-    padding: 0px 20 rpx;
-    margin-top: 20 rpx;
-  }
-}
-
-
-.list {
-  padding: 20 rpx;
-
-  .item {
-    display: flex;
-    margin-bottom: 20 rpx;
-
-    .item-box {
-      border-radius: 12 rpx;
-      border: 1px solid #dedede;
-      border-radius: 12 rpx;
-
-      flex: 1;
-      width: 0 rpx;
-    }
-
-    .spare-title {
-      padding: 20 rpx 30 rpx;
-      border-bottom: 1px solid #e4e4e4;
-      display: flex;
-
-      .title-txt {
-        color: #409eff;
-        font-size: 30 rpx;
-        font-weight: bold;
-        flex: 1;
-      }
-    }
-
-    .dec {
-      color: #9c9c9c;
-      padding: 0 rpx 30 rpx 20 rpx;
-    }
-
-  }
-}
-
-.add-btn {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-}
-
-.footer {
-  position: fixed;
-  bottom: 0px;
-  left: 0px;
-  width: 100%;
-  z-index: 22;
-}
-
-.btns {
-  display: flex;
-
-
-  button {
-    flex: 1;
-  }
-
-  .sure {
-    background: #409eff;
-    color: white;
-    border-radius: 0px;
-
-    &::after {
-      border: 1px solid #409eff;
-      border-radius: 0px;
-    }
-  }
-
-  .reset {
-    background: #F5F5F5;
-    border-radius: 0px;
-
-    &::after {
-      border-radius: 0px;
-    }
-  }
-}
+	.detail-container {
+		min-height: 100vh;
+		background: white;
+	}
+
+	.line {
+		background: #f5f5f5;
+		height: 20rpx;
+	}
+
+	.info {
+		background: white;
+	}
+
+
+	.tab {
+		border-bottom: 1px solid #e4e4e4;
+
+	}
+
+	.title {
+		display: flex;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		border-bottom: 1px solid #e4e4e4;
+
+		view {
+			&:nth-child(1) {
+				flex: 1;
+				border-left: 10rpx solid #409eff;
+				padding-left: 20rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.dec {
+		padding: 30rpx;
+
+		.dec-item {
+			padding-bottom: 30rpx;
+			display: flex;
+
+			view {
+				&:nth-child(1) {
+					width: 200rpx;
+				}
+
+				&:nth-child(2) {
+					color: #888888;
+					flex: 1;
+					width: 0px;
+					word-wrap: break-word;
+				}
+			}
+		}
+	}
+
+	.dec2 {
+		padding: 10rpx 30rpx;
+		display: flex;
+
+		view {
+			&:nth-child(1) {
+				width: 180rpx;
+			}
+
+			&:nth-child(2) {
+				color: #888888;
+				flex: 1;
+				width: 0px;
+				word-wrap: break-word;
+			}
+		}
+
+
+	}
+
+	.items {
+		border-radius: 12rpx;
+		background: #F5F5F5;
+		padding-bottom: 20rpx;
+
+		.items-name {
+			padding: 20rpx;
+			border-bottom: 1px solid #dedede;
+		}
+
+		.items-dec {
+			padding: 0px 20rpx;
+			margin-top: 20rpx;
+		}
+	}
+
+
+	.list {
+		padding: 20rpx;
+
+		.item {
+			display: flex;
+			margin-bottom: 20rpx;
+
+			.item-box {
+				border-radius: 12rpx;
+				border: 1px solid #dedede;
+				border-radius: 12rpx;
+
+				flex: 1;
+				width: 0rpx;
+			}
+
+			.spare-title {
+				padding: 20rpx 30rpx;
+				border-bottom: 1px solid #e4e4e4;
+				display: flex;
+
+				.title-txt {
+					color: #409eff;
+					font-size: 30rpx;
+					font-weight: bold;
+					flex: 1;
+				}
+			}
+
+			.dec {
+				color: #9c9c9c;
+				padding: 0rpx 30rpx 20rpx;
+			}
+
+		}
+	}
+
+	.add-btn {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0px;
+		left: 0px;
+		width: 100%;
+		z-index: 22;
+	}
+
+	.btns {
+		display: flex;
+
+
+		button {
+			flex: 1;
+		}
+
+		.sure {
+			background: #409eff;
+			color: white;
+			border-radius: 0px;
+
+			&::after {
+				border: 1px solid #409eff;
+				border-radius: 0px;
+			}
+		}
+
+		.reset {
+			background: #F5F5F5;
+			border-radius: 0px;
+
+			&::after {
+				border-radius: 0px;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/mes/orderDayPlan/orderDayPlan.vue b/src/pages/mes/orderDayPlan/orderDayPlan.vue
index 63e9d14..2a40fc5 100644
--- a/src/pages/mes/orderDayPlan/orderDayPlan.vue
+++ b/src/pages/mes/orderDayPlan/orderDayPlan.vue
@@ -1,23 +1,28 @@
 <template>
   <view class="container">
     <view class="list">
-      <view>
+     <view>
         <u-search :show-action="true" v-model="searchValue" action-text="搜索" input-align="left" height="65"
-                  border-color=#ff9900 @search="searchTable()"></u-search>
+                  border-color=#ff9900 @search="searchTable()">
+		</u-search>
         <u-subsection :animation="true" active-color="#ff9900" ref="tabs1" :list="list1" :current="current"
                       @change="tabsChange" :is-scroll="false">
         </u-subsection>
-        <!-- <u-tabs-swiper ref="tabs1" :list="list1" :current="current" @change="tabsChange" :is-scroll="false"
-         swiperWidth="750"></u-tabs-swiper> -->
       </view>
       <view class="item" v-for="(item, index) in list" :key="index" @click="openDetail(item)">
-        <view class="dec">
-          <view>日计划单号：</view>
-          <view>{{ item.planNoDay }}</view>
+        <view class="title">
+        	<view class="title-txt">
+        		{{item.planNoDay}}
+        	</view>
+        	<view class="time">
+        		{{`${$time.formatDate(item.createTime)}`}}
+        	</view>
+        </view>
+		<view class="dec">
+          <view>日计划单号：</view><view>{{ item.planNoDay }}</view>
         </view>
         <view class="dec">
-          <view>产品批次码：</view>
-          <view>{{ item.batchCode }}</view>
+          <view>产品批次码：</view><view>{{ item.batchCode }}</view>
         </view>
         <view class="dec">
           <view>状态：</view>
@@ -33,31 +38,8 @@
           </view>
         </view>
       </view>
-      <!-- <view class="item" v-for="(item,index) in list" :key="index" @click="openDetail(item)">
-        <view class="dec">
-          <view>日计划单号：</view>
-          <view>{{item.planNoDay}}</view>
-        </view>
-        <view class="dec">
-          <view>产品批次码：</view>
-          <view>{{item.batchCode}}</view>
-        </view>
-        <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==2" bg-color='rgba(255,255,255,0)' color='#fe8463'
-              border-color='#fe8463' type="primary" shape='circle' />
-            <u-tag text="生产中" v-if="item.status==3" bg-color='rgba(255,255,255,0)' color='#fe8463'
-              border-color='#fe8463' type="primary" shape='circle' />
-            <u-tag text="已终止" v-if="item.status==4" bg-color='rgba(255,255,255,0)' color='#fe8463'
-              border-color='#fe8463' type="primary" shape='circle' />
-          </view>
-        </view>
-      </view> -->
       <view style="height: 94rpx;padding-top: 30rpx;">
-        <u-loadmore :status="status" v-if="status != 'loadmore'"/>
+      		<u-loadmore :status="status" v-if="status != 'loadmore'" />
       </view>
     </view>
     <view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
@@ -220,73 +202,61 @@ async function searchTable() {
 </script>
 
 <style lang="scss" scoped>
-.container {
-  background: #f5f5f5;
-  min-height: 100vh;
-}
-
-.list {
-  background: #f5f5f5;
-  margin-top: 20 rpx;
-
-  .item {
-    padding: 30 rpx 30 rpx 0px 30 rpx;
-    margin-top: 20 rpx;
-    background: white;
-    position: relative;
-
-    .title {
-      display: flex;
-      align-items: center;
-      padding-bottom: 20 rpx;
-
-      .title-txt {
-        color: #409eff;
-        font-weight: bold;
-        font-size: 36 rpx;
-        width: 0px;
-        flex: 1;
-        word-wrap: break-word;
-      }
-
-      .time {
-        color: #919191;
-
-      }
-    }
-
-    .dec {
-      padding-bottom: 20 rpx;
-      display: flex;
-      align-items: center;
-
-      view {
-        &:nth-child(1) {
-          width: 200 rpx;;
-        }
-
-        &:nth-child(2) {
-          color: #999999;
-          flex: 1;
-          width: 0px;
-          word-wrap: break-word;
-        }
-      }
-    }
-
-    .last {
-      padding-bottom: 30 rpx;
-    }
-
-    .bottom {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      border-top: 1px solid #E4E4E4;
-      padding: 20 rpx 0px;
-      height: 90 rpx;
-
-    }
-  }
-}
+	.container{
+		background: #f5f5f5;
+		min-height: 100vh;
+	}
+	.list {
+		background: #f5f5f5;
+		margin-top: 20rpx;
+		.item {
+			padding: 30rpx 30rpx 0px 30rpx;
+			margin-top: 20rpx;
+			background: white;
+			position: relative;
+			.title {
+				display: flex;
+				align-items: center;
+				padding-bottom: 20rpx;
+				.title-txt {
+					color: #409eff;
+					font-weight: bold;
+					font-size: 36rpx;
+					width: 0px;
+					flex: 1;
+					word-wrap: break-word;
+				}
+				.time {
+					color: #919191;
+				}
+			}
+			.dec {
+				padding-bottom: 20rpx;
+				display: flex;
+				align-items: center;
+				view {
+					&:nth-child(1){
+						width: 200rpx;;
+					}
+					&:nth-child(2){
+					color: #999999;
+						flex: 1;
+						width: 0px;
+						word-wrap: break-word;
+					}
+				}
+			}
+			.last {
+				padding-bottom: 30rpx;
+			}
+			.bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				border-top: 1px solid #E4E4E4;
+				padding: 20rpx 0px;
+				height: 90rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file