From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 17 十月 2023 15:10:13 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style --- src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue index 6afd7f5..ba82d6f 100644 --- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue +++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue @@ -25,19 +25,20 @@ <el-row> <el-col :span="12"> <el-form-item label="鏈嶅姟鍗曠紪鍙�" prop="serviceNumber"> - <!-- <el-input v-model="editConfig.infomation.serviceNumber" style="width: 100%"></el-input> --> <WordInput v-if="codenumer && (explain != '' || isIdDisabled) && method == 0" :codenumer="codenumer" :sum="sum" - :disabled="editConfig.infomation.id || isIdDisabled" + :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 > - <span v-else>鑷姩鐢熸垚</span> + <span v-else>{{ + editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.serviceNumber + }}</span> </el-form-item> </el-col> <el-col :span="12"> @@ -688,7 +689,7 @@ editConfig: this.editCommonConfig, rules: { serviceNumber: [{ required: true, message: "璇疯緭鍏ユ湇鍔″崟缂栧彿", trigger: "blur" }], - // faultTypeId: [{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲埆", trigger: "change" }], + client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }], subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }], // productCategory: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }], serviceManId: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }], @@ -820,6 +821,7 @@ // 淇濆瓨 saveClick(formName) { this.$refs[formName].validate((valid) => { + this.validateFormNumber() if (valid) { console.log(this.editConfig.infomation) const params = this.saveParams() -- Gitblit v1.8.0