From b5acca92bd0794c24310d15c6fba8433d08119c9 Mon Sep 17 00:00:00 2001 From: songshankun <songshankun@foxmail.com> Date: 星期三, 11 十月 2023 15:27:09 +0800 Subject: [PATCH] feat: 销售机会报价单销售总单销售子单 编辑弹窗调整表单编号位置, 更换适配新的编码组件 --- src/views/sales/masterOrder/AddMasterOrderDialog.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue index 666e60f..462e94e 100644 --- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue +++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue @@ -22,6 +22,31 @@ <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"> + <WordInput + v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0" + :codenumer="codenumer" + :sum="sum" + :disabled="editConfig.infomation.id || 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="client_name"> <div class="custom-name"> @@ -46,11 +71,6 @@ <i class="el-icon-remove-outline" title="娓呴櫎"></i> </div> </div> - </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"> @@ -157,8 +177,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"; export default { name: "QuotationDialog", + mixins:[codeMixin], props: { editCommonConfig: { type: Object, @@ -171,7 +194,7 @@ } } }, - components: { SelectClientDialog }, + components: {WordInput, SelectClientDialog }, computed: { clientList() { return this.$store.state.getClientName.clientList @@ -193,14 +216,33 @@ title: "", infomation: {} }, - clientId: this.editCommonConfig.infomation.client_id + clientId: this.editCommonConfig.infomation.client_id, + objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜",codeStandID:'' }, } }, created() { this.$store.dispatch("geClient") this.getCommonData() + this.formInfo() + }, + watch:{ + 'editCommonConfig.visible'(val){ + if(val){ + this.formInfo() + } + }, + 'editCommonConfig.infomation.codeStandID'(val){ + this.formInfo() + } }, methods: { + formInfo(){ + this.objCode.codeStandID = '' + if(this.editConfig.infomation.codeStandID){ + this.objCode.codeStandID = this.editConfig.infomation.codeStandID; + } + this.getRCodeStandardList(); + }, getCommonData() { getAllData() .then((res) => { @@ -251,7 +293,9 @@ member_id: data.member_id || 0, money: data.money || 0, number: data.number || "", - start_time: data.start_time || "" + start_time: data.start_time || "", + codeStandID:data.ID, + codeRule:this.codeRule, } return params }, -- Gitblit v1.8.0