From 8d58e01ac327fc9e984b6f67cae62c56f63b490c Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 18 Jul 2025 17:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=93=81=E8=B0=83=E6=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockManage/goodsTransfer/detail.vue        |  4 ++++
 .../stockManage/goodsTransfer/edit.vue          | 17 +++++++++++++++--
 .../stockManage/goodsTransfer/index.vue         |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/foodManage/stockManage/goodsTransfer/detail.vue b/src/views/foodManage/stockManage/goodsTransfer/detail.vue
index 1a0126c8..6e1ce49c 100644
--- a/src/views/foodManage/stockManage/goodsTransfer/detail.vue
+++ b/src/views/foodManage/stockManage/goodsTransfer/detail.vue
@@ -29,6 +29,10 @@
                     <template slot="label">调入仓库</template>
                     {{ baseInfo.intoWarehouseName }}
                 </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">调拨日期</template>
+                    {{ baseInfo.requestArrivalTime }}
+                </el-descriptions-item> 
                 <el-descriptions-item>
                   <template slot="label">备注</template>
                   {{ baseInfo.remark }}
diff --git a/src/views/foodManage/stockManage/goodsTransfer/edit.vue b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
index 5433b035..1cdda530 100644
--- a/src/views/foodManage/stockManage/goodsTransfer/edit.vue
+++ b/src/views/foodManage/stockManage/goodsTransfer/edit.vue
@@ -33,6 +33,14 @@
                         ></el-option>
                     </el-select>
                 </el-form-item> 
+                <el-form-item label="调拨日期" prop="requestArrivalTime">
+                    <el-date-picker
+                        v-model="baseInfo.requestArrivalTime"
+                        type="datetime" align="right"  
+                        format="yyyy-MM-dd HH:mm:ss" style="width: 240px;"
+                        :picker-options="pickerOptions" @change="baseInfo.requestArrivalTime=formatDateTime(baseInfo.requestArrivalTime)">
+                    </el-date-picker>
+                </el-form-item> 
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="baseInfo.remark" placeholder="请输入备注" maxlength="30" clearable style="width: 240px"/>
                 </el-form-item>
@@ -220,7 +228,10 @@ export default {
             ],
             outType: [
                 { required: true, message: "出库类型不能为空", trigger: "change" }
-            ]
+            ],
+            requestArrivalTime: [
+                { required: true, message: "调拨日期不能为空", trigger: "change" }
+            ],
         },
         treeAreaOptions:[],
         canteenOptions:[],
@@ -411,6 +422,7 @@ export default {
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo);   
+                    param.requestArrivalTime = this.formatDateTime(this.baseInfo.requestArrivalTime)   
                     param.totalNum=0 
                     param.goodsAllocationDetailDTOList = []   
                     this.noMaterial = false;
@@ -464,7 +476,8 @@ export default {
         confirmSubmit(){
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
-                     let param = Object.assign({},this.baseInfo);   
+                    let param = Object.assign({},this.baseInfo);   
+                    param.requestArrivalTime = this.formatDateTime(this.baseInfo.requestArrivalTime)   
                     param.totalNum=0 
                     param.goodsAllocationDetailDTOList = []   
                     this.noMaterial = false;
diff --git a/src/views/foodManage/stockManage/goodsTransfer/index.vue b/src/views/foodManage/stockManage/goodsTransfer/index.vue
index f64e5102..3ac87c6c 100644
--- a/src/views/foodManage/stockManage/goodsTransfer/index.vue
+++ b/src/views/foodManage/stockManage/goodsTransfer/index.vue
@@ -55,7 +55,7 @@
         </el-table-column>
         <el-table-column label="调拨单号" align="center" prop="goodsTransferCode" :show-overflow-tooltip="true" /> 
         <el-table-column label="调拨人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="调拨日期" align="center" prop="" :show-overflow-tooltip="true" width="150"/> 
+        <el-table-column label="调拨日期" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="150"/> 
         <el-table-column label="调拨区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="调出仓库" align="center" prop="outWarehouseName" :show-overflow-tooltip="true" width="120"/> 
         <el-table-column label="调入仓库" align="center" prop="intoWarehouseName" :show-overflow-tooltip="true" width="120"/>