From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index 462e94e..a80b2ce 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -10,6 +10,7 @@
>
<el-form
ref="form"
+ v-if="refreshFlag"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
@@ -22,29 +23,25 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
-<!-- <el-col v-if="isUnflod" :span="12">-->
-<!-- <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
-<!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
+ <!-- <el-col v-if="isUnflod" :span="12">-->
+ <!-- <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
<el-col v-if="isUnflod" :span="12">
<el-form-item label="鍗曟嵁缂栧彿" prop="number">
<WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
- :inputValue="inputValue"
- @codeList="codeList"
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
/>
<span v-else-if="method == 0" style="color: #f56c6c"
- >璇蜂紭鍏堥厤缃紪鐮佽鑼�
- <el-button type="text" @click="numberClick">
- 閰嶇疆瑙勮寖
- </el-button
- ></span
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>鑷姩鐢熸垚</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -177,11 +174,11 @@
import { getAllData } from "@/api/client/client"
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
-import WordInput from "@/components/wordInput.vue";
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "QuotationDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -194,7 +191,7 @@
}
}
},
- components: {WordInput, SelectClientDialog },
+ components: { WordInput, SelectClientDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -202,10 +199,12 @@
},
data() {
return {
+ refreshFlag: true,
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
memberOptions: [],
@@ -217,7 +216,7 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜", codeStandID: "" }
}
},
created() {
@@ -225,23 +224,23 @@
this.getCommonData()
this.formInfo()
},
- watch:{
- 'editCommonConfig.visible'(val){
- if(val){
+ watch: {
+ "editCommonConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editCommonConfig.infomation.codeStandID'(val){
+ "editCommonConfig.infomation.codeStandID"() {
this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
getAllData()
@@ -255,6 +254,7 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
@@ -284,6 +284,16 @@
}
})
},
+ /**
+ * 寮哄埗鍒锋柊form缁勪欢
+ * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
+ */
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
+ })
+ },
saveParams() {
let data = this.editConfig.infomation
let params = {
@@ -294,8 +304,8 @@
money: data.money || 0,
number: data.number || "",
start_time: data.start_time || "",
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -331,6 +341,7 @@
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
}
+ this.refresh()
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
@@ -341,6 +352,7 @@
this.editConfig.infomation.contact_name = ""
this.contactId = 0
}
+ this.refresh()
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -384,7 +396,7 @@
font-size: 18px;
cursor: pointer;
}
- .el-autocomplete{
+ .el-autocomplete {
flex: 1;
}
}
--
Gitblit v1.8.0