From 665d298422805831dfc10c1297e8a6f9f42db282 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Sat, 15 Jul 2023 09:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=92=8C=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PaymentdocController.java      |  1 +
 .../entity/PaymentdocItem0Entity.java         |  3 +++
 .../paymentdoc/PaymentdocItem0Model.java      |  4 ++++
 .../entity/PurchaseorderEntity.java           |  2 ++
 .../admin/components/SaleTodayList.vue        |  2 +-
 SC-web/src/views/extend/paymentdoc/form.vue   | 19 +++++++++++++++----
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
index 53a7fa08..69979524 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
@@ -296,6 +296,7 @@ public class PaymentdocController {
             paymentdocitem0Entity.setRate(purchaseorderEntity.getRate());
             paymentdocitem0Entity.setNotAmount(purchaseorderEntity.getNotAmount());
             paymentdocitem0Entity.setCreatorTime(purchaseorderEntity.getCreatorTime());
+            paymentdocitem0Entity.setBusinessDate(purchaseorderEntity.getBusinessDate());
         }
         vo.setPaymentdocItem0List(JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class ));
         List<PaymentdocItem1Entity> PaymentdocItem1List = paymentdocService.GetPaymentdocItem1List(id);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java
index 2e83affc..99fdc38b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java
@@ -155,4 +155,7 @@ public class PaymentdocItem0Entity  {
 
     @TableField(exist = false)
     private List<PaymentdocEntity> paymentdocEntities;
+
+    @TableField(exist = false)
+    private Date businessDate;
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java
index 3ee40ac9..b40295ba 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java
@@ -1,5 +1,6 @@
 package jnpf.paymentdoc.model.paymentdoc;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -114,4 +115,7 @@ public class PaymentdocItem0Model  {
     private BigDecimal paymentAmount;
     @JsonProperty("requestAmount")
     private BigDecimal requestAmount;
+
+    @JsonProperty("businessDate")
+    private Date businessDate;
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java
index 08c6ef85..2cc7f49e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java
@@ -151,4 +151,6 @@ public class PurchaseorderEntity  {
     @TableField("PAYMENT_TIME")
     private Integer paymentTime;
 
+    @TableField("BUSINESS_DATE")
+    private Date businessDate;
 }
diff --git a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue
index 9ef5dbaa..7f1b8b39 100644
--- a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue
+++ b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue
@@ -10,7 +10,7 @@
       <el-table :data="list" style="width: 100%">
         <el-table-column prop="Number" width="50px" label="序号">
         </el-table-column>
-        <el-table-column prop="FFullName" label="部门"> </el-table-column>
+        <el-table-column prop="FFullName" label="部门" width="110px"> </el-table-column>
         <el-table-column prop="bangdan" label="磅单张数"></el-table-column>
         <el-table-column prop="settlement" label="吨位"></el-table-column>
         <el-table-column prop="amout" label="总额（元）"> </el-table-column>
diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue
index 6024ac1d..faaea4f8 100644
--- a/SC-web/src/views/extend/paymentdoc/form.vue
+++ b/SC-web/src/views/extend/paymentdoc/form.vue
@@ -39,7 +39,7 @@
 						<el-form-item label="业务日期" prop="businessDate">
 							<el-date-picker  v-model="dataForm.businessDate"
 								placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
-								value-format="timestamp" readonly>
+								value-format="timestamp" >
 
 							</el-date-picker>
 						</el-form-item>
@@ -300,18 +300,28 @@
 													</el-input>
 												</template>
 											</el-table-column>
-											<el-table-column prop="creatorTime" width="200" label="业务日期" align="center">
+											<el-table-column prop="businessDate" width="200" label="业务日期" align="center">
 												<template slot="header">
 													业务日期
 												</template>
 												<template slot-scope="scope">
-													<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择"
+													<el-date-picker v-model="scope.row.businessDate" placeholder="请选择"
 														clearable :style='{"width":"100%"}' type="date"
 														format="yyyy-MM-dd" value-format="timestamp" readonly>
-
 													</el-date-picker>
 												</template>
 											</el-table-column>
+<!--                      <el-table-column prop="creatorTime" width="200" label="业务日期" align="center">-->
+<!--                        <template slot="header">-->
+<!--                          业务日期-->
+<!--                        </template>-->
+<!--                        <template slot-scope="scope">-->
+<!--                          <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择"-->
+<!--                                          clearable :style='{"width":"100%"}' type="date"-->
+<!--                                          format="yyyy-MM-dd" value-format="timestamp" readonly>-->
+<!--                          </el-date-picker>-->
+<!--                        </template>-->
+<!--                      </el-table-column>-->
 											<el-table-column label="操作" width="50"
 												v-if="!setting.readonly && !judgeWrite('paymentdocitem0List')">
 												<template slot-scope="scope">
@@ -655,6 +665,7 @@
 					supplierId: "",
 					paymentType: "0",
 					businessDate: '',
+          creatorTime: '',
 					currency: "0",
 					settlementType: "0",
 					ramount: 0,