From 58e803fffe35d5ac39599d5ad6b3359e374b1808 Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期一, 23 十月 2023 12:03:53 +0800 Subject: [PATCH] 库存调整-历史路由跳转添加字段 --- src/views/overview/AddOverviewDialog.vue | 151 +++++++++++++++++++++++++++---------------------- 1 files changed, 83 insertions(+), 68 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 6f9807e..1b83e7d 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -29,7 +29,6 @@ label-position="right" label-width="120px" size="mini" - style="height: 60vh; overflow-x: hidden" > <div> <!-- <div>aaa</div> --> @@ -47,7 +46,7 @@ <el-row> <el-col :span="12"> <el-form-item prop="companyName"> - <span slot="label">{{ workType === 1 ? "瀹㈡埛" : workType === 2 ? "閫佽揣鍦板潃" : "鑱旂郴浜�" }}</span> + <span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span> <el-select v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨" @@ -164,62 +163,58 @@ </el-select> </el-form-item> </el-col> - </el-row> - </div> - <div class="bottom"> - <el-tabs v-model="activeName" type="card"> - <!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> --> - <el-tab-pane label="鎿嶄綔" name="first"> </el-tab-pane> - <el-tab-pane label="鍏朵粬淇℃伅" name="second"> - <div class="purchase-view"> - <div class="left"> - <div class="second-label">鍏朵粬淇℃伅</div> - <!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> - <el-select - v-model="editConfig.infomation.memberId" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - > - <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> - </el-option> - </el-select> - </el-form-item> --> - <el-form-item label="璐熻矗浜�" prop="contacterName"> - <el-select - v-model="editConfig.infomation.contacterName" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - @change="contacterChange" - > - <el-option - v-for="item in memberOptions" - :key="item.id" - :label="item.name" - :value="{ value: item.id, label: item.name }" - > - </el-option> - </el-select> - </el-form-item> - </div> - <div class="right"></div> - </div> - </el-tab-pane> - <el-tab-pane label="澶囨敞" name="third"> + <el-col :span="12"> + <el-form-item label="璐熻矗浜�" prop="contacterName"> + <el-select + v-model="editConfig.infomation.contacterName" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + @change="contacterChange" + > + <el-option + v-for="item in memberOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <!-- <el-col :span="12"> + <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> + <el-select + v-model="editConfig.infomation.memberId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + > + <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> --> + <el-col :span="24"> <el-form-item label="澶囨敞" prop="comment"> <el-input v-model.trim="editConfig.infomation.comment" size="mini" type="textarea" - style="width: 85%" - :autosize="{ minRows: 8 }" + style="width: 96%" + :autosize="{ minRows: 3 }" :disabled="!showFooter" ></el-input> </el-form-item> - </el-tab-pane> + </el-col> + </el-row> + </div> + <div class="bottom"> + <el-tabs v-model="activeName" type="card"> + <!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> --> + <el-tab-pane label="浜у搧" name="first"> </el-tab-pane> </el-tabs> <!-- 鎿嶄綔 --> <div v-if="activeName === 'first'"> @@ -263,9 +258,9 @@ </div> </el-form> <!-- 灏� --> - <div v-if="showFooter" slot="footer" class="dialog-footer"> + <div slot="footer" class="dialog-footer"> <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> --> - <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button> + <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button> <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button> </div> </el-dialog> @@ -409,20 +404,27 @@ }, // 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず setBottonView() { + console.log(this.editConfig.infomation.status) if (this.editConfig.title === "鏂板缓") { this.showButton = false this.showEdit = false this.showFooter = true this.isValidateClick = false - } else if ( - this.editConfig.title === "鏌ョ湅" && - (this.editConfig.infomation.status !== 4 || this.editConfig.infomation.status !== "瀹屾垚") - ) { + } else if (this.editConfig.title === "缂栬緫") { this.showButton = true this.showEdit = false this.isDelClick = true + this.showFooter = true + } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) { + this.showButton = true + this.showEdit = true + this.isDelClick = true this.showFooter = false - this.isValidateClick = true + if (this.editConfig.infomation.status === "瀹屾垚") { + this.isValidateClick = false + } else { + this.isValidateClick = true + } } else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") { this.showButton = true this.showEdit = false @@ -514,6 +516,7 @@ contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label } let params = { + baseOperationType:data.baseOperationType, comment: data.comment || "", companyID: companyID, companyName: companyName, @@ -545,7 +548,11 @@ }, // 鎿嶄綔鍒楄〃 setTableForm() { - if (this.editConfig.title !== "鏂板缓") { + if ( + this.editConfig.title !== "鏂板缓" && + this.editConfig.infomation.details && + this.editConfig.infomation.details.length > 0 + ) { const list = this.editConfig.infomation.details.map((item) => { return { ...item, @@ -565,7 +572,7 @@ // { label: "璇存槑", prop: "number", input: true }, // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true }, // { label: "鎴鏃ユ湡", prop: "price", date: true }, - { label: "瀹屾垚", prop: "amount", inputFloat: true }, + { label: "鏁伴噺", prop: "amount", inputFloat: true }, { label: "璁¢噺鍗曚綅", prop: "unit" } ] } @@ -716,13 +723,13 @@ height: calc(100% - 80px); overflow: auto; margin: 20px; - border: 1px solid #dcdfe6; - box-shadow: inset 0 0 2px #dee2e6; - -moz-box-shadow: inset 0 0 2px #dee2e6; - -webkit-box-shadow: inset 0 0 2px #dee2e6; - .basic-info-view { - margin-top: 20px; - } + // border: 1px solid #dcdfe6; + // box-shadow: inset 0 0 2px #dee2e6; + // -moz-box-shadow: inset 0 0 2px #dee2e6; + // -webkit-box-shadow: inset 0 0 2px #dee2e6; + // .basic-info-view { + // margin-top: 20px; + // } } .purchase-view { display: flex; @@ -749,13 +756,21 @@ color: #333; } } - .el-tabs--card > .el-tabs__header .el-tabs__nav { - margin-left: 20px; + .el-tabs--card > .el-tabs__header { + border-bottom: none; + } + .el-tabs__item.is-active { + color: #333; + background: #f1f3f8; } .el-tabs__item { height: 30px; line-height: 30px; font-size: 13px; + background: #f3f3f3; + } + .el-tabs__header { + margin: 0 0 1px; } } </style> -- Gitblit v1.8.0