From bd42b949807795c581e9193d92834a6187fc10d2 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 15 八月 2023 18:42:59 +0800 Subject: [PATCH] 销售管理模块联调 --- src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 138 +++++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 67 deletions(-) diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue index c5e2e49..df5a517 100644 --- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue +++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue @@ -87,7 +87,12 @@ </el-col> --> <el-col :span="12"> <el-form-item label="绛剧害鏃ユ湡" prop="signTime"> - <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡"> + <el-date-picker + v-model="editConfig.infomation.signTime" + value-format="yyyy-MM-dd" + type="date" + placeholder="閫夋嫨鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> @@ -106,7 +111,12 @@ </el-col> <el-col :span="12"> <el-form-item label="浜や粯鏃ユ湡" prop="deliveryDate"> - <el-date-picker v-model="editConfig.infomation.deliveryDate" type="date" placeholder="閫夋嫨鏃ユ湡"> + <el-date-picker + v-model="editConfig.infomation.deliveryDate" + value-format="yyyy-MM-dd" + type="date" + placeholder="閫夋嫨鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> @@ -180,11 +190,11 @@ <div class="basic-info-view"> <el-row> <el-col :span="24"> - <el-form-item label="鏉℃涓庢潯浠�" prop="termsTreaty"> + <el-form-item label="鏉℃涓庢潯浠�" prop="conditions"> <el-input type="textarea" :autosize="{ minRows: 4 }" - v-model="editConfig.infomation.termsTreaty" + v-model="editConfig.infomation.conditions" ></el-input> </el-form-item> </el-col> @@ -202,7 +212,7 @@ </el-row> </div> <!-- 闄勪欢淇℃伅 --> - <div class="basic-info-title">闄勪欢淇℃伅</div> + <!-- <div class="basic-info-title">闄勪欢淇℃伅</div> <div class="basic-info-view"> <el-row> <el-col :span="12"> @@ -227,7 +237,7 @@ </el-form-item> </el-col> </el-row> - </div> + </div> --> <!-- 浜у搧绠$悊 --> <div class="basic-info-title" style="display: flex"> 浜у搧绠$悊 @@ -382,7 +392,7 @@ title: "", infomation: {} }, - clientId: this.editCommonConfig.infomation.clientId, + clientId: this.editCommonConfig.infomation.client_id, saleChanceId: this.editCommonConfig.infomation.saleChanceId } }, @@ -418,37 +428,23 @@ const params = this.saveParams() console.log(params) if (this.editConfig.title === "鏂板缓") { - getAddSalesDetails(params) - .then((res) => { - console.log(res) - this.editConfig.visible = false - if (res.code === 200) { - this.$message({ - message: "娣诲姞鎴愬姛", - type: "success" - }) - this.$parent.getData() - } - }) - .catch((err) => { - console.log(err) - }) + getAddSalesDetails(params).then((res) => { + console.log(res) + this.editConfig.visible = false + if (res.code === 200) { + this.$message.success("娣诲姞鎴愬姛") + this.$parent.getData() + } + }) } else { - getUpdateSalesDetails(params) - .then((res) => { - console.log(res) - this.editConfig.visible = false - if (res.code === 200) { - this.$message({ - message: "缂栬緫鎴愬姛", - type: "success" - }) - this.$parent.getData() - } - }) - .catch((err) => { - console.log(err) - }) + getUpdateSalesDetails(params).then((res) => { + console.log(res) + this.editConfig.visible = false + if (res.code === 200) { + this.$message.success("缂栬緫鎴愬姛") + this.$parent.getData() + } + }) } } else { console.log("error submit") @@ -458,36 +454,44 @@ }, saveParams() { let data = this.editConfig.infomation - let params = { - id: this.editConfig.title === "鏂板缓" ? 0 : data.id, - salesDetails: { - address: data.address || "", - addressee: data.addressee || "", - clientId: parseInt(this.clientId), - conditions: data.conditions || "", - deliveryDate: data.deliveryDate || "", - memberId: data.memberId || 0, - number: data.number || "", - phone: data.phone || "", - products: [ - { - amount: 0, - desc: "", - id: 0, - name: "", - number: "", - price: 0, - total: 0 - } - ], - remark: data.remark || "", - saleChanceId: parseInt(this.saleChanceId), - saleType: data.saleType || 0, - signTime: data.signTime || "", - wechatOrderStatus: data.wechatOrderStatus || 0, - logisticCompany: data.logisticCompany || "", - logisticCost: parseInt(data.logisticCost) || 0, - logisticNumber: data.logisticNumber || "" + let commonParam = { + address: data.address || "", + addressee: data.addressee || "", + clientId: this.clientId || 0, + conditions: data.conditions || "", + deliveryDate: data.deliveryDate || "", + memberId: data.memberId || 0, + number: data.number || "", + phone: data.phone || "", + products: [ + { + amount: 0, + desc: "", + id: 0, + name: "", + number: "", + price: 0, + total: 0 + } + ], + remark: data.remark || "", + saleChanceId: this.saleChanceId || 0, + saleType: data.saleType || 0, + signTime: data.signTime || "", + wechatOrderStatus: data.wechatOrderStatus || 0, + logisticCompany: data.logisticCompany || "", + logisticCost: parseInt(data.logisticCost) || 0, + logisticNumber: data.logisticNumber || "" + } + let params = {} + if (this.editConfig.title === "鏂板缓") { + params = { ...commonParam } + } else { + params = { + id: this.editConfig.title === "鏂板缓" ? 0 : data.id, + salesDetails: { + ...commonParam + } } } return params -- Gitblit v1.8.0