From 38d09f0f37c54d80cd7ac926ad6162c0d2d10cd4 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 21 Mar 2025 14:42:38 +0800
Subject: [PATCH] 105

---
 common/style/layout.styl          |  5 ++--
 manifest.json                     |  4 +--
 pages/manage/mater-in-storage.vue | 44 +++++++++++++++++++------------
 utils/getData2.js                 |  4 +--
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index bd4e6bb..ec87531 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -160,10 +160,9 @@ uni-button:after {
 .slide_new table thead tr th {
 	position: sticky;
 	top: 0;
-	background: #d7d7d7;
 	font-size: 26rpx;
-	line-height: 28rpx;
-	padding: 35rpx 10rpx;
+	line-height: 58rpx;
+	padding: 4rpx 20rpx;
 	color: #7d7d7d;
 	background-color: #dcdfea;
 	font-weight: bold;
diff --git a/manifest.json b/manifest.json
index e14395b..1f07c81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "西门子",
     "appid" : "__UNI__EF964CB",
     "description" : "西门子LMS手持系统",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.5",
+    "versionCode" : 105,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/manage/mater-in-storage.vue b/pages/manage/mater-in-storage.vue
index 3937ae1..a53178b 100644
--- a/pages/manage/mater-in-storage.vue
+++ b/pages/manage/mater-in-storage.vue
@@ -39,33 +39,34 @@
 						<uni-data-select v-model="index2" :localdata="options1"></uni-data-select>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">交期时间</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<uni-datetime-picker type="datetime" v-model="datetimesingle" :border="false" />
-					</view>
-				</view>
-
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
 							<tr>
-								<th>操作</th>
+								<th @tap="addRow">
+									<view style="display: flex;align-items: center;font-weight: normal;">
+										<uni-icons type="plus-filled" size="28" color="#4e6ef2"></uni-icons>
+									</view>
+								</th>
 								<th>订单号</th>
 								<th>物料号</th>
 								<th>物料数量</th>
+								<th>交期时间</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td @tap="addRow"><uni-icons type="plus-filled" size="30" color="#4e6ef2"></uni-icons></td>
+								<td @tap="addRow">
+									<view style="display: flex;align-items: center;">
+										<uni-icons type="plus-filled" size="28" color="#4e6ef2"></uni-icons>
+									</view>
+								</td>
 								<td><input type="text" class="td_input" v-model="e.order_code"></td>
 								<td><input type="text" class="td_input" v-model="e.material_code"></td>
 								<td><input type="number" class="td_input" v-model="e.material_qty"></td>
+								<td>{{e.due_date}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -109,8 +110,7 @@
 				index1: '',
 				index2: '',
 				disabled: false,
-				dataList: [{order_code: '', material_code: '', material_qty: 0}],
-				datetimesingle: ''
+				dataList: []
 			};
 		},
 		onLoad (options) {
@@ -119,7 +119,7 @@
 		},
 		methods: {
 			selectChange (e) {
-				this.dataList = [{order_code: '', material_code: '', material_qty: 0}]
+				this.dataList = []
 				this.index1 = ''
 				this.index2 = ''
 			},
@@ -131,13 +131,13 @@
 				})
 			},
 			addRow () {
-				this.dataList.push({order_code: '', material_code: '', material_qty: 0})
+				this.dataList.push({order_code: '', material_code: '', material_qty: 0, due_date: this.getCurrentDateTime()})
 			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
 				this.index = ''
-				this.dataList = [{order_code: '', material_code: '', material_qty: 0}]
+				this.dataList = []
 				this.index1 = ''
 				this.index2 = ''
 				this.disabled = false
@@ -155,7 +155,7 @@
 					}
 				})
 				try {
-					let res = await handheldBlanking(this.index, this.val1, this.index1, this.val2, arr, this.index2, this.datetimesingle)
+					let res = await handheldBlanking(this.index, this.val1, this.index1, this.val2, arr, this.index2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -164,6 +164,16 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			getCurrentDateTime() {
+				const now = new Date()
+				const year = now.getFullYear()
+				const month = String(now.getMonth() + 1).padStart(2, '0') // 月份从0开始，需要加1
+				const day = String(now.getDate()).padStart(2, '0')
+				const hours = String(now.getHours()).padStart(2, '0')
+				const minutes = String(now.getMinutes()).padStart(2, '0')
+				const seconds = String(now.getSeconds()).padStart(2, '0')
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 			}
 		}
 	}
diff --git a/utils/getData2.js b/utils/getData2.js
index f0f58d5..84e1706 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -60,9 +60,9 @@ export const handheldStorehouse = (code, type) => request({
 // 	url:'api/handheld/getRegionCode',
 // 	data: {orderCode: code}
 // })
-export const handheldBlanking = (type, code, rcode, vcode, material, reg, date) => request({
+export const handheldBlanking = (type, code, rcode, vcode, material, reg) => request({
 	url:'api/handheld/blanking',
-	data: {type: type, device_code: code, region_code: rcode, vehicle_code: vcode, material: material, regionCode: reg, due_date: date}
+	data: {type: type, device_code: code, region_code: rcode, vehicle_code: vcode, material: material, regionCode: reg}
 })
 // 修改订单工序
 export const fabOrders = (code) => request({