From 2c687f86a2fdd8bdffc3ac8ce04eca1126646288 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 13 十一月 2023 16:14:54 +0800
Subject: [PATCH] 所有涉及到产品的增加单位回显、收款计划增加金额不能为零、销售明细单未确认状态显示修改
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 383651e..a2123db 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -25,7 +25,20 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="number">
- <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"
@@ -36,7 +49,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">
@@ -447,7 +460,7 @@
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
export default {
name: "AddServiceContractDialog",
mixins: [codeMixin],
@@ -489,7 +502,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏ユ湇鍔″悎鍚岀紪鍙�", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
@@ -551,9 +564,6 @@
if (val) {
this.formInfo()
}
- },
- "editCommonConfig.infomation.codeStandID"() {
- this.formInfo()
}
},
methods: {
@@ -570,8 +580,19 @@
.then((res) => {
if (res.code === 200) {
this.memberOptions = res.data.member
+ this.$set(this.editConfig.infomation, "memberId", this.editConfig.infomation.memberId)
this.contractTypeOptions = res.data.serviceContractType
+ this.$set(
+ this.editConfig.infomation,
+ "serviceContractTypeId",
+ this.editConfig.infomation.serviceContractTypeId
+ )
this.contractStatusOptions = res.data.serviceContractStatus
+ this.$set(
+ this.editConfig.infomation,
+ "serviceContractStatusId",
+ this.editConfig.infomation.serviceContractStatusId
+ )
// this.currencyOptions = res.data.currency
}
})
@@ -582,7 +603,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
@@ -597,7 +617,6 @@
this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddServiceContract(params).then((res) => {
console.log(res)
@@ -646,8 +665,7 @@
typeId: 0,
serviceContractTypeId: data.serviceContractTypeId || 0,
serviceContractStatusId: data.serviceContractStatusId || 0,
- codeStandID: data.ID,
- codeRule: this.codeRule
+ codeStandID: data.ID
}
return params
},
@@ -762,7 +780,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
} else {
@@ -778,6 +797,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -803,7 +823,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
})
this.showSummary.show = true
},
@@ -819,7 +840,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
this.productTableList.tableData = this.tableData
--
Gitblit v1.8.0