From c35ccb51c02c8852e345b831ef5d2dd96c2cf500 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 30 八月 2023 16:39:33 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/views/other/commonDialog/SelectCommonDialog.vue | 233 +++------------------------------------------------------
1 files changed, 14 insertions(+), 219 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 3090ad6..cfe8f7b 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -39,12 +39,7 @@
</template>
<script>
-import { getMasterOrderList } from "@/api/sales/masterOrder"
-import { getQuotationList } from "@/api/sales/quotation"
-import { getSalesDetailsList } from "@/api/sales/salesDetails"
-import { getServiceContractList } from "@/api/serviceManage/serviceContract"
-import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder"
-import { getProductList } from "@/api/common/other"
+import { getProductListFromGrpc,getProductList } from "@/api/productManage/product"
export default {
name: "EditSelCommonDialog",
props: {
@@ -57,6 +52,10 @@
tableInfomation: []
}
}
+ },
+ sign:{
+ type:String,
+ default:''
}
},
components: {},
@@ -84,64 +83,7 @@
},
methods: {
setTable() {
- if (this.editConfig.title === "閿�鍞�诲崟") {
- this.tableList = {
- tableInfomation: [],
- tableColumn: [
- { label: "鍗曟嵁缂栧彿", prop: "number", isClick: true }, // 鍗曟嵁缂栧彿
- { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
- ]
- }
- this.searchSel = { value: "number", label: "鍗曟嵁缂栧彿" }
- } else if (this.editConfig.title === "鏈嶅姟鍚堝悓") {
- this.tableList = {
- tableInfomation: [],
- tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "client_name" }, // 瀹㈡埛鍚嶇О
- { label: "鏈嶅姟鍚堝悓缂栧彿", prop: "number", isClick: true }, // 鏈嶅姟鍚堝悓缂栧彿
- { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
- { label: "鍚堣", prop: "total" }, // 鍚堣
- { label: "绛剧害鏃ユ湡", prop: "signTime", isTime: true }, // 绛剧害鏃ユ湡
- { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus" } // 鍚堝悓鐘舵��
- ]
- }
- this.searchSel = { value: "number", label: "鏈嶅姟鍚堝悓缂栧彿" }
- } else if (this.editConfig.title === "閿�鍞槑缁嗗崟") {
- this.tableList = {
- tableInfomation: [],
- tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "client_name" }, // 瀹㈡埛鍚嶇О
- { label: "璁㈠崟缂栧彿", prop: "number", isClick: true }, // 璁㈠崟缂栧彿
- { label: "绛剧害鏃ユ湡", prop: "signTime" }, // 绛剧害鏃ユ湡
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
- { label: "鍚堣", prop: "tptal" } // 鍚堣
- ]
- }
- this.searchSel = { value: "number", label: "璁㈠崟缂栧彿" }
- } else if (this.editConfig.title === "鎶ヤ环鍗�") {
- this.tableList = {
- tableInfomation: [],
- tableColumn: [
- { label: "鎶ヤ环鍗曞彿", prop: "number", isClick: true }, // 鎶ヤ环鍗曞彿
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
- ]
- }
- this.searchSel = { value: "number", label: "鎶ヤ环鍗曞彿" }
- } else if (this.editConfig.title === "瀹㈡埛鏈嶅姟鍗�") {
- this.tableList = {
- tableInfomation: [],
- tableColumn: [
- { label: "鏈嶅姟鍗曠紪鍙�", prop: "serviceNumber", isClick: true }, // 鏈嶅姟鍗曠紪鍙�
- { label: "涓婚", prop: "subject" }, // 涓婚
- { label: "鏈嶅姟鏂瑰紡", prop: "serviceType_name" }, // 鏈嶅姟鏂瑰紡
- { label: "鏈嶅姟浜哄憳", prop: "serviceMan_name" }, // 鏈嶅姟浜哄憳
- { label: "浼樺厛绾у埆", prop: "priorityLevel_name" }, // 浼樺厛绾у埆
- { label: "澶勭悊鐘舵��", prop: "serviceOrderStatus_name" }, // 澶勭悊鐘舵��
- { label: "瀹㈡埛绛惧悕", prop: "qianming" } // 瀹㈡埛绛惧悕
- ]
- }
- this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
- } else if (this.editConfig.title === "浜у搧鍚嶇О") {
+ if (this.editConfig.title === "浜у搧鍚嶇О") {
this.tableList = {
tableInfomation: [],
tableColumn: [
@@ -161,159 +103,22 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- if (this.editConfig.title === "閿�鍞�诲崟") {
- this.getMasterOrderList()
- } else if (this.editConfig.title === "鏈嶅姟鍚堝悓") {
- this.getServiceContractList()
- } else if (this.editConfig.title === "閿�鍞槑缁嗗崟") {
- this.getSalesDetailsList()
- } else if (this.editConfig.title === "鎶ヤ环鍗�") {
- this.getQuotationList()
- } else if (this.editConfig.title === "瀹㈡埛鏈嶅姟鍗�") {
- this.getServiceOrderList()
- } else if (this.editConfig.title === "浜у搧鍚嶇О") {
+ if (this.editConfig.title === "浜у搧鍚嶇О") {
this.getProductList()
}
},
- // 閿�鍞�诲崟
- async getMasterOrderList() {
- await getMasterOrderList({
- search_map: this.search_map,
- page: 0,
- pageSize: 0
- }).then((res) => {
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- member_name: item.member.username
- }
- })
- this.tableList.tableInfomation = list.slice(0, 5) || []
- } else {
- this.tableList.tableInfomation = []
- }
- }
- this.loading = false
- })
- },
- // 鏈嶅姟鍚堝悓
- async getServiceContractList() {
- await getServiceContractList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: 0,
- pageSize: 0
- }).then((res) => {
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- client_name: item.client.name,
- member_name: item.member.username,
- serviceContractStatus: item.serviceContractStatus.name
- }
- })
- this.tableList.tableInfomation = list.slice(0, 5) || []
- } else {
- this.tableList.tableInfomation = []
- }
- }
- this.loading = false
- })
- },
- // 鎶ヤ环鍗�
- async getQuotationList() {
- await getQuotationList({
- search_map: this.search_map,
- page: 0,
- pageSize: 0
- }).then((res) => {
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- member_name: item.member.username
- }
- })
- this.tableList.tableInfomation = list.slice(0, 5) || []
- } else {
- this.tableList.tableInfomation = []
- }
- }
- this.loading = false
- })
- },
- // 閿�鍞槑缁嗗崟
- async getSalesDetailsList() {
- await getSalesDetailsList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: 0,
- pageSize: 0
- }).then((res) => {
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- client_name: item.client.name,
- member_name: item.Member.username
- }
- })
- this.tableList.tableInfomation = list.slice(0, 5) || []
- } else {
- this.tableList.tableInfomation = []
- }
- }
- this.loading = false
- })
- },
- // 瀹㈡埛鏈嶅姟鍗�
- async getServiceOrderList() {
- await getServiceOrderList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: 0,
- pageSize: 0
- }).then((res) => {
- if (res.code === 200) {
- if (res.data.data && res.data.data.length > 0) {
- const list = res.data.data.map((item) => {
- return {
- ...item,
- client_name: item.Client.name,
- serviceType_name: item.ServiceType.name,
- faultType_name: item.FaultType.name,
- serviceContract_Number: item.ServiceContract.number,
- serviceMan_name: item.serviceMan.username,
- priorityLevel_name: item.PriorityLevel.name,
- serviceOrderStatus_name: item.ServiceOrderStatus_name
- }
- })
- this.tableList.tableInfomation = list.slice(0, 5) || []
- } else {
- this.tableList.tableInfomation = []
- }
- }
- this.loading = false
- })
- },
// 浜у搧鍚嶇О
async getProductList() {
- await getProductList({
- productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
- productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
+
+ let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc;
+ await fn({
page: 1,
- pageSize: 5
+ pageSize: 100
}).then((res) => {
console.log(res.data)
if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- const list = res.data.data.data.map((item) => {
+ if (res.data.data.list && res.data.data.list.length > 0) {
+ const list = res.data.data.list.map((item) => {
return {
...item
}
@@ -331,17 +136,7 @@
},
selNameClick(row) {
this.editConfig.editVisible = false
- if (this.editConfig.title === "閿�鍞�诲崟") {
- this.$emit("selClient", row, "master")
- } else if (this.editConfig.title === "鏈嶅姟鍚堝悓") {
- this.$emit("selClient", row, "serviceContract")
- } else if (this.editConfig.title === "閿�鍞槑缁嗗崟") {
- this.$emit("selClient", row, "contract")
- } else if (this.editConfig.title === "鎶ヤ环鍗�") {
- this.$emit("selClient", row, "quotation")
- } else if (this.editConfig.title === "瀹㈡埛鏈嶅姟鍗�") {
- this.$emit("selClient", row, "customService")
- } else if (this.editConfig.title === "浜у搧鍚嶇О") {
+ if (this.editConfig.title === "浜у搧鍚嶇О") {
this.$emit("selClient", row, "productName")
}
},
--
Gitblit v1.8.0