From ee63845014b83854ffed9fa04ad7545b7cccae74 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期六, 26 八月 2023 18:21:03 +0800 Subject: [PATCH] 销售负责人接口联调 --- src/views/supplierManage/supplier/DetailSupplier.vue | 14 +++--- src/views/supplierManage/supplier/AddSupplier.vue | 23 ++++++++++- src/views/productManage/product/DetailProduct.vue | 21 +++++----- src/api/common/other.js | 9 ++++ 4 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/api/common/other.js b/src/api/common/other.js index 3e8d30a..f5d771d 100644 --- a/src/api/common/other.js +++ b/src/api/common/other.js @@ -1,2 +1,9 @@ // import request from "@/common/untils/request.js" -// import axios from "axios" +import axios from "axios" + +// 璐熻矗浜� +export const getMemberList = async (data) => { + return await axios.get(`/api/m/getMemberList`, { + params: data + }) +} diff --git a/src/views/productManage/product/DetailProduct.vue b/src/views/productManage/product/DetailProduct.vue index 6a628ad..6b80b40 100644 --- a/src/views/productManage/product/DetailProduct.vue +++ b/src/views/productManage/product/DetailProduct.vue @@ -44,7 +44,7 @@ </div> <div class="business_scope"> <div class="content-title">{{ "澶囨敞淇℃伅锛�" }}</div> - <div class="content-data">{{ record ? record : "--" }}</div> + <div class="content-data">{{ remark ? remark : "--" }}</div> </div> </div> </div> @@ -81,7 +81,8 @@ record: "", // 鏈�鏂拌繘灞� noContactDays: 0, newContactDays: "", - valueUrl: "" + valueUrl: "", + remark: this.commonDetail.infomation.remark } }, created() { @@ -113,27 +114,27 @@ }, { leftStr: "浜у搧绫诲埆", - leftValue: item.contact_name, + leftValue: item.productType, rightStr: "渚涘簲鍟�", - rightValue: item.contact_position + rightValue: item.supplier.name }, { leftStr: "瑙勬牸", - leftValue: item.contact_phone, + leftValue: item.specifications, rightStr: "鍨嬪彿", - rightValue: "18513375588" + rightValue: item.modelNumber }, { leftStr: "鍗曚綅", - leftValue: item.sales_resources, + leftValue: item.unit, rightStr: "浠锋牸", - rightValue: item.member_name + rightValue: item.purchasePrice }, { leftStr: "鏈�浣庡簱瀛�", - leftValue: item.sales_resources, + leftValue: item.minimumStock, rightStr: "鏈�楂樺簱瀛�", - rightValue: "" + rightValue: item.maximumStock } ] }, diff --git a/src/views/supplierManage/supplier/AddSupplier.vue b/src/views/supplierManage/supplier/AddSupplier.vue index 415c271..f1e3d87 100644 --- a/src/views/supplierManage/supplier/AddSupplier.vue +++ b/src/views/supplierManage/supplier/AddSupplier.vue @@ -91,15 +91,20 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="閿�鍞礋璐d汉" prop="responsiblePersonId"> + <el-form-item label="閿�鍞礋璐d汉" prop="responsiblePersonName"> <!-- <el-input v-model="editConfig.infomation.responsiblePersonId"></el-input> --> <el-select - v-model="editConfig.infomation.responsiblePersonId" + v-model="editConfig.infomation.responsiblePersonName" placeholder="璇烽�夋嫨" size="mini" style="width: 63%" > - <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> + <el-option + v-for="item in memberOptions" + :key="item.id" + :label="item.username" + :value="item.userName" + > </el-option> </el-select> </el-form-item> @@ -201,6 +206,7 @@ import { createSupplier, createContract, updateSupplier, getIndustryList } from "@/api/supplierManage/supplier" import EditDropdownDialog from "@/views/other/commonDialog/EditDropdownDialog" import { getSupplierTypeList } from "@/api/supplierManage/supplier" +import { getMemberList } from "@/api/common/other" export default { name: "AddSupplierDialog", props: { @@ -258,8 +264,19 @@ created() { this.getSupplierTypeList() this.getIndustryList() + this.getMemberList() }, methods: { + // 閿�鍞礋璐d汉 + async getMemberList() { + await getMemberList({ + page: 1, + pageSize: 100 + }).then((res) => { + console.log(res) + this.memberOptions = res.data.data.list + }) + }, // 渚涘簲鍟嗙被鍨� async getSupplierTypeList() { await getSupplierTypeList({ diff --git a/src/views/supplierManage/supplier/DetailSupplier.vue b/src/views/supplierManage/supplier/DetailSupplier.vue index 18e93e3..6444bb3 100644 --- a/src/views/supplierManage/supplier/DetailSupplier.vue +++ b/src/views/supplierManage/supplier/DetailSupplier.vue @@ -139,25 +139,25 @@ }, { leftStr: "渚涘簲鍟嗙被鍨�", - leftValue: item.contact_name, + leftValue: item.supplierType, rightStr: "鎵�灞炶涓�", - rightValue: item.contact_position + rightValue: item.industry }, { leftStr: "鑱旂郴浜�", - leftValue: item.contact_phone, + leftValue: item.contact, rightStr: "鑱旂郴鐢佃瘽", - rightValue: "18513375588" + rightValue: item.phone }, { leftStr: "閲囪喘璐熻矗浜�", - leftValue: item.sales_resources, + leftValue: item.responsiblePersonName, rightStr: "缃戝潃", - rightValue: item.member_name + rightValue: item.url }, { leftStr: "閭", - leftValue: item.sales_resources, + leftValue: item.email, rightStr: "", rightValue: "" } -- Gitblit v1.8.0