From eb91fd817dce989b3e81eac971068badaa6bcf53 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 16:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index 0d94b5f..86d34d6 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -101,7 +101,9 @@
<el-date-picker
v-model="editConfig.infomation.start_time"
value-format="yyyy-MM-dd HH:mm:ss"
+ :picker-options="pickerOptions"
style="width: 100%"
+ @change="checkDate(editConfig.infomation.start_time,editConfig.infomation.end_time)"
type="datetime"
placeholder="閫夋嫨鏃ユ湡"
>
@@ -113,7 +115,9 @@
<el-date-picker
v-model="editConfig.infomation.end_time"
value-format="yyyy-MM-dd HH:mm:ss"
+ :picker-options="pickerOptions"
type="datetime"
+ @change="checkDate(editConfig.infomation.start_time,editConfig.infomation.end_time)"
style="width: 100%"
placeholder="閫夋嫨鏃ユ湡"
>
@@ -188,6 +192,8 @@
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import codeMixin from "@/components/makepager/mixin/codeMixin"
+import NewDate from "@/api/date";
+const { compareTime } = NewDate;
export default {
name: "QuotationDialog",
mixins: [codeMixin],
@@ -228,7 +234,12 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜", codeStandID: "" }
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜", codeStandID: "" },
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < new Date().getTime() - 86400000;
+ },
+ },
}
},
created() {
@@ -244,6 +255,13 @@
}
},
methods: {
+ checkDate(start,end){
+ if(start&&end){
+ if (compareTime(start, end) > 0) {
+ this.$message.error('鏈嶅姟鎴鏃堕棿瑕佹櫄浜庢湇鍔″紑濮嬫椂闂达紒')
+ }
+ }
+ },
formInfo() {
this.objCode.codeStandID = ""
if (this.editConfig.infomation.codeStandID) {
--
Gitblit v1.8.0