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 | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 5a7acd5..48b91c8 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -22,8 +22,22 @@
<el-row>
<el-col :span="12">
<el-form-item label="鍗曟嵁缂栧彿" prop="number">
- <!-- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> -->
- <WordInput
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' &&
+ codenumer &&
+ (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
@@ -34,7 +48,7 @@
<span v-else-if="method == 0" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -248,7 +262,7 @@
import { getAddContract, getUpdateContract } from "@/api/sales/contractManage"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getQuotationList } from "@/api/sales/quotation"
export default {
name: "AddContractManageDialog",
@@ -279,7 +293,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, validator: this.checkCode, 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" }],
@@ -347,11 +361,8 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
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
},
@@ -496,14 +506,6 @@
this.isUnflod = true
}
},
- // 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
- checkCode(rule, value, callback) {
- if (this.editConfig.infomation.number && this.editConfig.infomation.number.length > 0) {
- callback()
- } else {
- callback(new Error("璇疯緭鍏ュ崟鎹紪鍙�"))
- }
- }
}
}
</script>
--
Gitblit v1.8.0