From 4478ef19b1679874af7db4e08272befe1147c84a Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Mon, 22 May 2023 15:25:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=89=E5=85=A5=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=9A=E2=80=9C=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E2=80=9D=E6=9F=A5=E8=AF=A2=E6=A1=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=20230522?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index ada5cd42..3b3fec3f 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -167,6 +167,7 @@ export default {
     return {
       listQuery: {
         billNo: "",
+        corpName: null,
         billAction: null,
         originType: null,
         page: 1,

From b65353d272db3bb2b265a8d919b14029a3810c6b Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Mon, 22 May 2023 15:52:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=20=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E4=B8=8D=E5=BA=94=E4=B8=BA?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0=20230522?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/param/busTypePre.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 227b1b90..30388134 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -234,6 +234,14 @@ export default {
         this.$message.error("补单方式不能为空！")
         return;
       }
+      if (this.inputQuery.beforeTime < 0){
+        this.$message.error("时间间隔不能为负数！")
+        return;
+      }
+      if (this.inputQuery.busBeforeTime < 0){
+        this.$message.error("时间间隔不能为负数！")
+        return;
+      }
       // if (isBlank(this.inputQuery.invCode)) {
       //   this.$message.error("目标所在仓库不能为空！")
       //   return;

From aee0cc33754f91e51bde6c05ce386e07d6060c92 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Mon, 22 May 2023 16:35:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E4=B8=8E=E7=94=B3=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApplyEditDiaolog.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index c07f81b0..4d20ff2f 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -51,6 +51,7 @@
                 style="width: 90%"
                 :clearable="false"
                 value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled-date="disabledArrivalDate"
               >
               </el-date-picker>
             </el-form-item>
@@ -220,6 +221,7 @@ export default {
         id: null,
         billNo: null,
         createTime: "",
+        arrivalTime: '',
         remark: "",
         deptCode: null,
         invCode: null,
@@ -294,7 +296,9 @@ export default {
             if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
-
+            if (this.formData.arrivalTime<this.formData.createTime) {
+              return this.$message.error("到货时间不能比单据日期早！！！");
+            }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                 return this.$message.error('单据数量不能为0');
@@ -318,6 +322,9 @@ export default {
         }
       });
     },
+    disabledArrivalDate(time) {
+      return time.getTime() < new Date(this.formData.createTime).getTime()
+    },
     submitFunction(status) {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;