From eeed1f4dfe91ef67d09ec064b9a55346a80d60b9 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期一, 18 十二月 2023 10:04:01 +0800 Subject: [PATCH] 销售明细单中产品编码参数修改 --- src/views/sales/salesDetails/index.vue | 142 ++++++++++++++++++---------------------------- 1 files changed, 56 insertions(+), 86 deletions(-) diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue index ca149e8..1604200 100644 --- a/src/views/sales/salesDetails/index.vue +++ b/src/views/sales/salesDetails/index.vue @@ -103,31 +103,21 @@ </div> </div> <!-- 纭鎻愪氦-閫夋嫨椤圭洰 --> - <el-dialog - title="璇烽�夋嫨椤圭洰" - :visible.sync="projectListShow" - width="40%" - :before-close="handleClose"> - <el-form - label-width="100px" - class="demo-ruleForm" - ref="form" - :rules="rules" - :model="projects" - > - <el-form-item label="閫夋嫨椤圭洰" prop="projectId"> - <el-select - v-model="projects.projectId" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 100%" - > - <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectName" :value="item.projectId"> + <el-dialog title="璇烽�夋嫨椤圭洰" :visible.sync="projectListShow" width="400px" :before-close="handleClose"> + <el-form label-width="100px" class="demo-ruleForm" ref="form" :rules="rules" :model="projects"> + <el-form-item label="閫夋嫨椤圭洰" prop="projectId"> + <el-select v-model="projects.projectId" placeholder="璇烽�夋嫨" size="mini" style="width: 100%"> + <el-option + v-for="item in projectList" + :key="item.projectId" + :label="item.projectName" + :value="item.projectId" + > </el-option> </el-select> </el-form-item> </el-form> - <span slot="footer" class="dialog-footer"> + <span slot="footer" class="dialog-footer dialog_btn"> <el-button @click="projectListShow = false">鍙� 娑�</el-button> <el-button type="primary" @click="affirmCommitBtn">纭� 瀹�</el-button> </span> @@ -155,10 +145,8 @@ getProductInventoryInfo, getProductOrderInfo, updateStatus, - createOperation, getProjectList, - getUpdateSalesDetails, - sendSalesDetailsToApsProject + sendSalesDetailsToOtherSystem } from "@/api/sales/salesDetails" import pageMixin from "@/components/makepager/pager/mixin/pageMixin" import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification" @@ -193,7 +181,7 @@ data() { // 浜у搧淇℃伅 const productColumn = [ - { label: "浜у搧缂栧彿", prop: "id", default: true }, + { label: "浜у搧缂栧彿", prop: "number", default: true }, { label: "浜у搧鍚嶇О", prop: "name" }, { label: "鏁伴噺", prop: "amount" }, { label: "鍗曚綅", prop: "unit" }, @@ -205,7 +193,7 @@ ] // 搴撳瓨淇℃伅 const inventoryColumn = [ - { label: "浜у搧缂栧彿", prop: "id", default: true }, + { label: "浜у搧缂栧彿", prop: "number", default: true }, { label: "浜у搧鍚嶇О", prop: "name" }, { label: "璁㈠崟鏁伴噺", prop: "orderAmount" }, { label: "浠撳簱", prop: "warehouse" }, @@ -291,15 +279,15 @@ makeColumn: makeColumn, showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"], selectRow: {}, - projectList:[], - projectListShow:false, - projects:{ - projectId:'', + projectList: [], + projectListShow: false, + projects: { + projectId: "" }, - thatRow:{}, + thatRow: {}, rules: { - projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }], - }, + projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }] + } } }, created() { @@ -410,7 +398,7 @@ ...item, client_name: item.client.name, member_name: item.Member.username, - source: "CRM鍚屾" + source: "" } }) this.tableList.tableInfomation = list || [] @@ -489,25 +477,19 @@ }, // 纭鎻愪氦 async submitClick(row) { - this.thatRow=row - if(row.projectId==""){ - this.$message.error("璇峰厛濉啓椤圭洰淇℃伅") - this.projectListShow=true - }else{ + this.thatRow = row + if (row.projectId == "") { + this.projectListShow = true + } else { let params = { ...row, status: 2 } - await createOperation(params).then((res) => { + await sendSalesDetailsToOtherSystem(params).then((res) => { if (res.code == 200) { - this.$message.success("纭鎻愪氦鎴愬姛") + this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺") this.getData() - this.thatRow.status=2 - sendSalesDetailsToApsProject(this.thatRow).then((res)=>{ - if(res.code===200){ - this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺") - } - }) + this.thatRow.status = 2 } }) } @@ -634,21 +616,21 @@ } }, // 鑾峰彇椤圭洰鍒楄〃 - async getProjectList(){ + async getProjectList() { await getProjectList({ page: 1, - pageSize: 100, + pageSize: 100 }).then((res) => { - console.log(res.data,"椤圭洰鍒楄〃淇℃伅") - this.projectList=res.data + console.log(res.data, "椤圭洰鍒楄〃淇℃伅") + this.projectList = res.data }) }, handleClose(done) { done() }, - + saveParams() { - let params={ + let params = { address: this.thatRow.address || "", addressee: this.thatRow.addressee || "", clientId: this.thatRow.clientId || 0, @@ -668,44 +650,26 @@ logisticNumber: this.thatRow.logisticNumber || "", quotationId: this.thatRow.quotationId, deliverType: this.thatRow.deliverType || 0, - status: this.thatRow.deliverType, - projectId:this.projects.projectId||0 + status: this.thatRow.deliverType, + projectId: this.projects.projectId || 0 } return params }, // 纭鎻愪氦 - affirmCommitBtn(){ - let params=this.saveParams() - this.$refs['form'].validate((valid) => { - if(valid){ + affirmCommitBtn() { + let params = this.saveParams() + this.$refs["form"].validate((valid) => { + if (valid) { console.log() - this.projectListShow=false - getUpdateSalesDetails({ - id:this.thatRow.id, - salesDetails:params - }).then((res) => { - console.log(res) - this.editConfig.visible = false - if (res.code === 200) { - let params2 = { - ...this.thatRow, - status: 2 - } - createOperation(params2).then((res) => { - if (res.code == 200) { - this.$message.success("鎻愪氦鎴愬姛") - this.getData() - this.thatRow.status=2 - sendSalesDetailsToApsProject(this.thatRow).then((res)=>{ - if(res.code===200){ - this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺") - } - }) - } - }) + this.projectListShow = false + console.log(params, "閫夋嫨椤圭洰鍚庣殑params") + params.status = 2 + sendSalesDetailsToOtherSystem(params).then((res) => { + if (res.code == 200) { + this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺") + this.getData() + this.thatRow.status = 2 } - }).catch((err)=>{ - this.$message.error(`缂栬緫澶辫触:${err}`) }) } }) @@ -810,8 +774,14 @@ .bgcWhite { background: #fff !important; } -.el-form-item{ +.el-form-item { width: 80%; margin: 20px auto; } +::v-deep .el-dialog__footer { + text-align: right !important; + .el-button { + margin-right: 10px; + } +} </style> -- Gitblit v1.8.0