From 0fe07c82aaf1d81511e524647cf2bc473b5ec298 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 25 十月 2023 17:37:27 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/sales/contractManage/AddContractManageDialog.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index f69532c..48b91c8 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -148,6 +148,18 @@
</div>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鍙戣揣鏃ユ湡" prop="deliveryDate">
+ <el-date-picker
+ v-model="editConfig.infomation.deliveryDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
@@ -281,10 +293,11 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, validator: this.validateCheckCode, trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- contractName: [{ required: true, message: "璇疯緭鍏ュ悎鍚屽悕绉�", trigger: "blur" }]
+ contractName: [{ required: true, message: "璇疯緭鍏ュ悎鍚屽悕绉�", trigger: "blur" }],
+ quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }]
},
memberOptions: [],
statusOptions: [], // 鍚堝悓鐘舵��
@@ -349,9 +362,7 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- console.log(this.editConfig.infomation)
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddContract(params).then((res) => {
console.log(res)
@@ -390,7 +401,6 @@
quotation_id: this.quotationId || 0,
status_id: data.statusId || 0,
codeStandID: data.ID,
- codeRule: this.codeRule
}
return params
},
--
Gitblit v1.8.0