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/other/payment/saleInvoice/addSaleInvoice.vue | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue index e844dd5..2ab8b63 100644 --- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue +++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue @@ -24,15 +24,31 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> + <el-form-item label="鍙戠エ缂栧彿" prop="number"> + <WordInput + v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0" + :codenumer="codenumer" + :sum="sum" + :disabled="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> + </el-form-item> + </el-col> + <el-col :span="12"> <el-form-item label="涓婚" prop="subject"> <el-input v-model="editConfig.infomation.subject" style="width: 100%"></el-input> </el-form-item> </el-col> - <el-col :span="12"> - <el-form-item label="鍙戠エ缂栧彿" prop="number"> - <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> - </el-form-item> - </el-col> + <el-col :span="12"> <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name"> <div class="custom-name"> @@ -362,8 +378,10 @@ import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog" import { addInvoice, getInvoiceTypeList, getInvoiceStatusList, getCourierCompanyList } from "@/api/common/payment" +import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"; export default { name: "AddSaleInvoiceDialog", + mixins: [codeMixin], props: { editCommonConfig: { type: Object, @@ -444,8 +462,27 @@ this.$store.dispatch("geSalesDetails") this.setTableForm() this.getCommonData() + this.formInfo(); + }, + watch:{ + 'editCommonConfig.visible'(val){ + if(val){ + this.formInfo() + } + }, + 'editCommonConfig.infomation.codeStandID'(){ + this.formInfo() + } }, methods: { + formInfo(){ + this.objCode.type='閿�鍞彂绁ㄧ紪鐮�' + this.objCode.codeStandID = '' + if(this.editConfig.infomation.codeStandID){ + this.objCode.codeStandID = this.editConfig.infomation.codeStandID; + } + this.getRCodeStandardList(); + }, getCommonData() { getAllData().then((res) => { if (res.code === 200) { @@ -486,6 +523,7 @@ // 淇濆瓨 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++) { -- Gitblit v1.8.0