From 3286b2af0a85f46644bc09cfb16171f4d399890d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 17:13:25 +0800
Subject: [PATCH] 跟换所有页面的接口前缀
---
src/api/purchaseManage/purchase.js | 48 ++++----
src/views/supplierManage/supplier/DetailSupplier.vue | 2
src/views/supplierManage/supplier/AddSupplier.vue | 6
src/api/client/client.js | 16 +-
src/api/client/salesLead.js | 12 +-
src/components/makepager/CommonSearch.vue | 8 +
src/api/supplierManage/supplier.js | 30 +++---
src/assets/style/index.scss | 21 ++++
src/api/common/standard.js | 6
src/views/supplierManage/outsourceSupplier/index.vue | 79 +++++++++------
src/api/supplierManage/outsourceSupplier.js | 12 +-
src/api/common/other.js | 22 +++
src/api/productManage/product.js | 16 +-
src/views/supplierManage/outsourceSupplier/components/addEnterprise.vue | 5 +
14 files changed, 175 insertions(+), 108 deletions(-)
diff --git a/src/api/client/client.js b/src/api/client/client.js
index 6255964..2d32f92 100644
--- a/src/api/client/client.js
+++ b/src/api/client/client.js
@@ -3,7 +3,7 @@
// 瀹㈡埛绠＄悊鍒楄〃
export function getClientList(data) {
return request({
- url: "/api/client/list",
+ url: "/api-srm/client/list",
method: "post",
data
})
@@ -11,7 +11,7 @@
// 娣诲姞瀹㈡埛绠＄悊
export function getAddClient(data) {
return request({
- url: "/api/client/add",
+ url: "/api-srm/client/add",
method: "post",
data
})
@@ -19,7 +19,7 @@
// 鍒犻櫎瀹㈡埛绠＄悊
export function getDeleteClient(data) {
return request({
- url: "/api/client/delete",
+ url: "/api-srm/client/delete",
method: "delete",
data
})
@@ -27,7 +27,7 @@
// 鏇存柊瀹㈡埛绠＄悊
export function getUpdateClient(data) {
return request({
- url: "/api/client/update",
+ url: "/api-srm/client/update",
method: "put",
data
})
@@ -36,7 +36,7 @@
// 鑾峰彇瀹㈡埛鏉ユ簮鍒楄〃
export function getClientOrigin() {
return request({
- url: "/api/clientOrigin/list",
+ url: "/api-srm/clientOrigin/list",
method: "get"
})
}
@@ -44,7 +44,7 @@
// 鑾峰彇瀹㈡埛鐘舵�佸垪琛�
export function getClientStatus() {
return request({
- url: "/api/clientStatus/list",
+ url: "/api-srm/clientStatus/list",
method: "get"
})
}
@@ -52,7 +52,7 @@
// 鑾峰彇瀹㈡埛鏉ユ簮绛夋墍鏈夋暟鎹�
export function getAllData() {
return request({
- url: "/api/data/getAllData",
+ url: "/api-srm/data/getAllData",
method: "get"
})
}
@@ -60,7 +60,7 @@
// 妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶�
export function checkNameClient(data) {
return request({
- url: "/api/client/checkName",
+ url: "/api-srm/client/checkName",
method: "post",
data
})
diff --git a/src/api/client/salesLead.js b/src/api/client/salesLead.js
index 4e6ee0a..fe21d82 100644
--- a/src/api/client/salesLead.js
+++ b/src/api/client/salesLead.js
@@ -3,7 +3,7 @@
// 閿�鍞嚎绱㈠垪琛�
export function getSalesLeadsList(data) {
return request({
- url: "/api/salesLeads/list",
+ url: "/api-srm/salesLeads/list",
method: "post",
data
})
@@ -11,7 +11,7 @@
// 娣诲姞閿�鍞嚎绱�
export function getAddSalesLeads(data) {
return request({
- url: "/api/salesLeads/add",
+ url: "/api-srm/salesLeads/add",
method: "post",
data
})
@@ -19,7 +19,7 @@
// 鍒犻櫎閿�鍞嚎绱�
export function getDeleteSalesLeads(data) {
return request({
- url: "/api/salesLeads/delete",
+ url: "/api-srm/salesLeads/delete",
method: "delete",
data
})
@@ -27,7 +27,7 @@
// 鏇存柊閿�鍞嚎绱�
export function getUpdateSalesLeads(data) {
return request({
- url: "/api/salesLeads/update",
+ url: "/api-srm/salesLeads/update",
method: "put",
data
})
@@ -36,7 +36,7 @@
// 鎺ㄨ繘閿�鍞嚎绱�
export function pushSalesSources(data) {
return request({
- url: "/api/salesLeads/push",
+ url: "/api-srm/salesLeads/push",
method: "post",
data
})
@@ -45,7 +45,7 @@
// 鍟嗘満鏉ユ簮鍒楄〃
export function getSalesSourcesList() {
return request({
- url: "/api/salesSources/list",
+ url: "/api-srm/salesSources/list",
method: "get"
})
}
diff --git a/src/api/common/other.js b/src/api/common/other.js
index adf2e9d..29b34b7 100644
--- a/src/api/common/other.js
+++ b/src/api/common/other.js
@@ -3,14 +3,30 @@
// 璐熻矗浜�
// export const getMemberListFromGrpc = async (data) => {
-// return await axios.get(`/api/m/getMemberListFromGrpc`, {
+// return await axios.get(`/api-srm/m/getMemberListFromGrpc`, {
// params: data
// })
// }
export function getMemberListFromGrpc(data) {
return request({
- url: "/api/m/getMemberListFromGrpc",
+ url: "/api-srm/m/getMemberListFromGrpc",
method: "get",
params: data
})
-}
\ No newline at end of file
+}
+// plc閰嶇疆鐨勫垪琛�
+export const getMiniDictList = (data) => {
+ return request({
+ url: "/api-srm/dict/getMiniDictList",
+ method: "post",
+ data,
+ });
+};
+// plc閰嶇疆鐨勬洿鏂�
+export const saveMiniDict = (data) => {
+ return request({
+ url: "/api-srm/dict/saveMiniDict",
+ method: "post",
+ data,
+ });
+};
\ No newline at end of file
diff --git a/src/api/common/standard.js b/src/api/common/standard.js
index 6d2565a..7e35e4e 100644
--- a/src/api/common/standard.js
+++ b/src/api/common/standard.js
@@ -1,11 +1,11 @@
import request from "@/common/untils/request"
export function getCodeStandardList(data) {
- // return axios.get(`/api/code/getCodeList`, {
+ // return axios.get(`/api-srm/code/getCodeList`, {
// params: data
// })
return request({
- url: "/api/code/getCodeList",
+ url: "/api-srm/code/getCodeList",
method: "get",
params: data
})
@@ -13,7 +13,7 @@
// 鑾峰彇鑷姩缂栫爜
export function getAutoCode(data) {
return request({
- url: "/api/code/getAutoCode",
+ url: "/api-srm/code/getAutoCode",
method: "post",
data
})
diff --git a/src/api/productManage/product.js b/src/api/productManage/product.js
index 4c60183..fb8638d 100644
--- a/src/api/productManage/product.js
+++ b/src/api/productManage/product.js
@@ -3,13 +3,13 @@
// 浜у搧鍒楄〃
// export const getProductList = async (data) => {
-// return await axios.get(`/api/p/getProductList`, {
+// return await axios.get(`/api-srm/p/getProductList`, {
// params: data
// })
// }
export function getProductList(data) {
return request({
- url: "/api/p/getProductList",
+ url: "/api-srm/p/getProductList",
method: "get",
params:data
})
@@ -17,7 +17,7 @@
// 鏌ヨ鍗曟潯渚涘簲鍟嗘暟鎹�
export function getSupplierByNumber(data) {
return request({
- url: `/api/s/getSupplierByNumber/${data}`,
+ url: `/api-srm/s/getSupplierByNumber/${data}`,
method: "get",
data
})
@@ -25,7 +25,7 @@
// 鍒涘缓浜у搧
export function createProduct(data) {
return request({
- url: "/api/p/createProduct",
+ url: "/api-srm/p/createProduct",
method: "post",
data
})
@@ -33,7 +33,7 @@
// 鍒犻櫎浜у搧
export function deleteProduct(data) {
return request({
- url: "/api/p/deleteProduct",
+ url: "/api-srm/p/deleteProduct",
method: "delete",
data
})
@@ -41,7 +41,7 @@
// 鏇存柊浜у搧
export function updateProduct(data) {
return request({
- url: "/api/p/updateProduct",
+ url: "/api-srm/p/updateProduct",
method: "put",
data
})
@@ -49,13 +49,13 @@
// 娣诲姞浜у搧鑾峰彇浜у搧鍒楄〃
// export const getProductListFromGrpc = async (data) => {
-// return await axios.get(`/api/p/getProductListFromGrpc`, {
+// return await axios.get(`/api-srm/p/getProductListFromGrpc`, {
// params: data
// })
// }
export function getProductListFromGrpc(data) {
return request({
- url: "/api/p/getProductListFromGrpc",
+ url: "/api-srm/p/getProductListFromGrpc",
method: "get",
params:data
})
diff --git a/src/api/purchaseManage/purchase.js b/src/api/purchaseManage/purchase.js
index 19c132b..8656e83 100644
--- a/src/api/purchaseManage/purchase.js
+++ b/src/api/purchaseManage/purchase.js
@@ -3,7 +3,7 @@
// 閿�鍞嚎绱㈠垪琛�
export function getSalesLeadsList(data) {
return request({
- url: "/api/salesLeads/list",
+ url: "/api-srm/salesLeads/list",
method: "post",
data
})
@@ -11,7 +11,7 @@
// 娣诲姞閿�鍞嚎绱�
export function getAddSalesLeads(data) {
return request({
- url: "/api/salesLeads/add",
+ url: "/api-srm/salesLeads/add",
method: "post",
data
})
@@ -19,7 +19,7 @@
// 鍒犻櫎閿�鍞嚎绱�
export function getDeleteSalesLeads(data) {
return request({
- url: "/api/salesLeads/delete",
+ url: "/api-srm/salesLeads/delete",
method: "delete",
data
})
@@ -27,7 +27,7 @@
// 鏇存柊閿�鍞嚎绱�
export function getUpdateSalesLeads(data) {
return request({
- url: "/api/salesLeads/update",
+ url: "/api-srm/salesLeads/update",
method: "put",
data
})
@@ -36,7 +36,7 @@
// 鎺ㄨ繘閿�鍞嚎绱�
export function pushSalesSources(data) {
return request({
- url: "/api/salesLeads/push",
+ url: "/api-srm/salesLeads/push",
method: "post",
data
})
@@ -45,19 +45,19 @@
// 鍟嗘満鏉ユ簮鍒楄〃
export function getSalesSourcesList() {
return request({
- url: "/api/salesSources/list",
+ url: "/api-srm/salesSources/list",
method: "get"
})
}
// 閲囪喘鍗曞垪琛�
// export const getPurchaseList = async (data) => {
-// return await axios.get(`/api/purchase/purchaseList`, {
+// return await axios.get(`/api-srm/purchase/purchaseList`, {
// params: data
// })
// }
export function getPurchaseList(data) {
return request({
- url: "/api/purchase/purchaseList",
+ url: "/api-srm/purchase/purchaseList",
method: "get",
params: data
})
@@ -65,7 +65,7 @@
// 鍒涘缓閲囪喘鍗�
export function addPurchase(data) {
return request({
- url: "/api/purchase/purchase",
+ url: "/api-srm/purchase/purchase",
method: "post",
data
})
@@ -73,7 +73,7 @@
// 鏇存柊閲囪喘鍗�
export function updatePurchase(data) {
return request({
- url: "/api/purchase/purchase",
+ url: "/api-srm/purchase/purchase",
method: "put",
data
})
@@ -81,7 +81,7 @@
// 鑾峰彇閲囪喘鍗曚俊鎭�
export function getPurchaseInfo(data) {
return request({
- url: "/api/purchase/purchase/" + data.id,
+ url: "/api-srm/purchase/purchase/" + data.id,
method: "get",
data
})
@@ -89,7 +89,7 @@
// 鍒犻櫎閲囪喘鍗曚俊鎭�
export function deletePurchase(data) {
return request({
- url: "/api/purchase/purchase/" + data.id,
+ url: "/api-srm/purchase/purchase/" + data.id,
method: "delete",
data
})
@@ -97,7 +97,7 @@
// 鎻愪氦閲囪喘鍗�
export function submitPurchase(data) {
return request({
- url: "/api/purchase/submit",
+ url: "/api-srm/purchase/submit",
method: "post",
data
})
@@ -105,7 +105,7 @@
// 纭閲囪喘鍗�
export function newSubmitPurchase(data) {
return request({
- url: "/api/purchase/newSubmit",
+ url: "/api-srm/purchase/newSubmit",
method: "post",
data
})
@@ -113,7 +113,7 @@
// 鏂板缓閲囪喘绫诲瀷
export function savePurchaseType(data) {
return request({
- url: "/api/purchase/purchaseType",
+ url: "/api-srm/purchase/purchaseType",
method: "post",
data
})
@@ -121,28 +121,28 @@
// 鑾峰彇閲囪喘绫诲瀷
export function getPurchaseType(data) {
return request({
- url: "/api/purchase/purchaseTypeList",
+ url: "/api-srm/purchase/purchaseTypeList",
method: "get",
data
})
}
// 璐ㄦ鍒楄〃
export const qualityInspectList = async (data) => {
- return await axios.get(`/api/purchase/qualityInspectList`, {
+ return await axios.get(`/api-srm/purchase/qualityInspectList`, {
params: data
})
}
// 鑾峰彇浠撳簱鍒楄〃
export function getWarehouseInfo() {
return request({
- url: "/api/purchase/getWarehouseInfo/",
+ url: "/api-srm/purchase/getWarehouseInfo/",
method: "get"
})
}
// 鑾峰彇浜у搧/鏀惰揣淇℃伅
export function getOperationInfo(data) {
return request({
- url: "/api/purchase/getOperationInfo/" + data.id,
+ url: "/api-srm/purchase/getOperationInfo/" + data.id,
method: "get",
data
})
@@ -150,7 +150,7 @@
// 鑾峰彇纭鍒楄〃淇℃伅
export function getPurchaseProductConfirmInfo(data) {
return request({
- url: "/api/purchase/getPurchaseProductConfirmInfo/" + data,
+ url: "/api-srm/purchase/getPurchaseProductConfirmInfo/" + data,
method: "get",
data
})
@@ -158,7 +158,7 @@
// 纭鏀惰揣
export function savePurchaseProductConfirm(data) {
return request({
- url: "/api/purchase/savePurchaseProductConfirm",
+ url: "/api-srm/purchase/savePurchaseProductConfirm",
method: "post",
data
})
@@ -166,7 +166,7 @@
// 鑾峰彇璐ㄦ鍒楄〃淇℃伅
export function getPurchaseQualityInspectionInfo(data) {
return request({
- url: "/api/purchase/getPurchaseQualityInspectionInfo",
+ url: "/api-srm/purchase/getPurchaseQualityInspectionInfo",
method: "post",
data
})
@@ -174,7 +174,7 @@
// 鎵归噺鍚堟牸鍏ュ簱
export function savePurchaseQualityInspectionInfo(data) {
return request({
- url: "/api/purchase/savePurchaseQualityInspectionInfo",
+ url: "/api-srm/purchase/savePurchaseQualityInspectionInfo",
method: "post",
data
})
@@ -182,7 +182,7 @@
// 鍏ㄩ儴鍚堟牸鍏ュ簱
export function allProductInWarehouse(data) {
return request({
- url: "/api/purchase/allProductInWarehouse",
+ url: "/api-srm/purchase/allProductInWarehouse",
method: "post",
data
})
diff --git a/src/api/supplierManage/outsourceSupplier.js b/src/api/supplierManage/outsourceSupplier.js
index 4b6a478..3dcec63 100644
--- a/src/api/supplierManage/outsourceSupplier.js
+++ b/src/api/supplierManage/outsourceSupplier.js
@@ -3,7 +3,7 @@
// 濮斿浼佷笟鏂板
export const addEnterprise = (data) => {
return request({
- url: "/api-s/v1/outsourcing/enterprise/add",
+ url: "/api-srm/outsourcing/enterprise/add",
method: "post",
data
})
@@ -12,7 +12,7 @@
// 濮斿浼佷笟淇敼
export const updateEnterprise = (data) => {
return request({
- url: "/api-s/v1/outsourcing/enterprise/update",
+ url: "/api-srm/outsourcing/enterprise/update",
method: "post",
data
})
@@ -21,7 +21,7 @@
// 濮斿浼佷笟鍒楄〃
export const enterpriseList = (data) => {
return request({
- url: "/api-s/v1/outsourcing/enterprise/list",
+ url: "/api-srm/outsourcing/enterprise/list",
method: "get",
params: data
})
@@ -30,7 +30,7 @@
// 濮斿浼佷笟缁熻
export const enterpriseOverview = () => {
return request({
- url: "/api-s/v1/outsourcing/enterprise/overview",
+ url: "/api-srm/outsourcing/enterprise/overview",
method: "get"
})
}
@@ -38,7 +38,7 @@
// 娣诲姞澶栭儴鐢ㄦ埛璐﹀彿
export const addOutsideUser = (data) => {
return request({
- url: "/api/outsideUser/addUser",
+ url: "/api-srm/outsideUser/addUser",
method: "post",
data
})
@@ -47,7 +47,7 @@
// 鍚敤/绂佺敤澶栭儴鐢ㄦ埛
export const editOutsideUser = (data) => {
return request({
- url: "/api/outsideUser/editUser",
+ url: "/api-srm/outsideUser/editUser",
method: "post",
data
})
diff --git a/src/api/supplierManage/supplier.js b/src/api/supplierManage/supplier.js
index df43251..ade24f4 100644
--- a/src/api/supplierManage/supplier.js
+++ b/src/api/supplierManage/supplier.js
@@ -4,7 +4,7 @@
// 鏈嶅姟鍟嗗垪琛�
export function getSupplierList(data) {
return request({
- url: "/api/s/getSupplierList",
+ url: "/api-srm/s/getSupplierList",
method: "get",
params: data
})
@@ -12,7 +12,7 @@
// 鍒涘缓鏈嶅姟鍟�
export function createSupplier(data) {
return request({
- url: "/api/s/createSupplier",
+ url: "/api-srm/s/createSupplier",
method: "post",
data
})
@@ -20,7 +20,7 @@
// 鍒犻櫎鏈嶅姟鍟�
export function deleteSupplier(data) {
return request({
- url: "/api/s/deleteSupplier",
+ url: "/api-srm/s/deleteSupplier",
method: "delete",
data
})
@@ -28,7 +28,7 @@
// 鏇存柊鏈嶅姟鍟�
export function updateSupplier(data) {
return request({
- url: "/api/s/updateSupplier",
+ url: "/api-srm/s/updateSupplier",
method: "put",
data
})
@@ -36,7 +36,7 @@
// 淇敼鏈嶅姟鍟嗙姸鎬�
export function changeSupplierStatus(data) {
return request({
- url: "/api/s/changeSupplierStatus",
+ url: "/api-srm/s/changeSupplierStatus",
method: "post",
data
})
@@ -44,7 +44,7 @@
// 鐢╥d鏌ヨ鏈嶅姟鍟�
export function findSupplier(data) {
return request({
- url: "/api/s/findSupplier",
+ url: "/api-srm/s/findSupplier",
method: "get",
params: data
})
@@ -53,7 +53,7 @@
// 鏇存柊鏈嶅姟鍟嗙被鍨�
export function updateSupplierType(data) {
return request({
- url: "/api/st/updateSupplierType",
+ url: "/api-srm/st/updateSupplierType",
method: "put",
data
})
@@ -61,7 +61,7 @@
// 鏈嶅姟鍟嗙被鍨嬪垪琛�
export function getSupplierTypeList(data) {
return request({
- url: "/api/st/getSupplierTypeList",
+ url: "/api-srm/st/getSupplierTypeList",
method: "get",
params: data
})
@@ -69,13 +69,13 @@
// 涓婁紶鍚堝悓
// export const createContract = async (data) => {
-// return await axios.post(`/api/con/createContract`, data, {
+// return await axios.post(`/api-srm/con/createContract`, data, {
// headers: { "Content-Type": "application/x-www-form-urlencoded;charset=utf-8" }
// })
// }
export function createContract(data) {
return request({
- url: "/api/con/createContract",
+ url: "/api-srm/con/createContract",
method: "post",
data
})
@@ -83,7 +83,7 @@
// 鍒犻櫎鍚堝悓
export function deleteContract(data) {
return request({
- url: "/api/con/deleteContract",
+ url: "/api-srm/con/deleteContract",
method: "delete",
data
})
@@ -91,7 +91,7 @@
// 棰勮鍚堝悓
export function previewContract(data) {
return request({
- url: "/api/con/previewContract",
+ url: "/api-srm/con/previewContract",
method: "get",
params: data
})
@@ -99,7 +99,7 @@
// 涓嬭浇鍚堝悓
export function downloadContract(data) {
return request({
- url: "/api/downloadContract",
+ url: "/api-srm/downloadContract",
method: "get",
params: data
})
@@ -108,7 +108,7 @@
// 鏇存柊鎵�灞炶涓�
export function updateIndustry(data) {
return request({
- url: "/api/i/updateIndustry",
+ url: "/api-srm/i/updateIndustry",
method: "put",
data
})
@@ -116,7 +116,7 @@
// 鎵�灞炶涓氬垪琛�
export function getIndustryList(data) {
return request({
- url: "/api/i/getIndustryList",
+ url: "/api-srm/i/getIndustryList",
method: "get",
params: data
})
diff --git a/src/assets/style/index.scss b/src/assets/style/index.scss
index 44f2fe4..2d86218 100644
--- a/src/assets/style/index.scss
+++ b/src/assets/style/index.scss
@@ -11,6 +11,27 @@
border: 0;
outline: 0;
}
+.Badge {
+ width: 6px;
+ height: 6px;
+ background: red;
+ border-radius: 100%;
+ display: inline-block;
+ margin-bottom: 1px;
+ margin-right: 5px;
+}
+.success {
+ color: #06c062;
+}
+.error {
+ color: #f62f2f;
+}
+.warning-radio {
+ color: #e6a23c;
+}
+.warning {
+ color: rgba(0, 0, 0, 0.4);
+}
// 闂磋窛
.margin_left_3px {
margin-left: 3px;
diff --git a/src/components/makepager/CommonSearch.vue b/src/components/makepager/CommonSearch.vue
index f61df8c..d5fcac3 100644
--- a/src/components/makepager/CommonSearch.vue
+++ b/src/components/makepager/CommonSearch.vue
@@ -32,7 +32,7 @@
</dl>
</div>
<div class="top_right" style="width: 50%; margin-right: 15px">
- <dl v-for="item in otherOptions" :key="item.value">
+ <dl v-for="(item,index) in otherOptions" :key="index">
<dd class="font_weight">
{{ item.value }}
</dd>
@@ -248,6 +248,9 @@
flex: 1;
display: flex;
justify-content: right;
+ dd{
+ margin-left:0;
+ }
.top_left {
width: 10%;
border-right: 1px solid #ccc;
@@ -259,6 +262,7 @@
justify-content: center;
align-items: center;
text-align: center;
+
.font_weight {
font-weight: 500;
font-size: 18px;
@@ -266,6 +270,7 @@
}
.top_right_bottom {
font-size: 12px;
+
}
}
.top_right {
@@ -286,6 +291,7 @@
}
.top_right_bottom {
font-size: 12px;
+ margin-left:0;
}
}
}
diff --git a/src/views/supplierManage/outsourceSupplier/components/addEnterprise.vue b/src/views/supplierManage/outsourceSupplier/components/addEnterprise.vue
index 95e9958..2840394 100644
--- a/src/views/supplierManage/outsourceSupplier/components/addEnterprise.vue
+++ b/src/views/supplierManage/outsourceSupplier/components/addEnterprise.vue
@@ -340,6 +340,8 @@
<style lang="scss" scoped>
.dialog-content-box {
padding: 0px 30px;
+ height:380px;
+ overflow-y:auto;
// overflow-y: auto;
// .el-form {
// overflow: hidden;
@@ -354,5 +356,8 @@
height: calc(100% - 55px);
overflow-y: auto;
}
+ .el-dialog__body{
+ padding-top:15px;
+ }
}
</style>
diff --git a/src/views/supplierManage/outsourceSupplier/index.vue b/src/views/supplierManage/outsourceSupplier/index.vue
index bb006b4..9b597f7 100644
--- a/src/views/supplierManage/outsourceSupplier/index.vue
+++ b/src/views/supplierManage/outsourceSupplier/index.vue
@@ -1,19 +1,21 @@
<template>
- <d2-container>
- <template slot="header">
- <div class="top">
- <SearchCommonView
+ <div class="outsource-supplier-manage">
+ <div class="filter">
+ <div class="filter-card">
+ <CommonSearch
:add-title="'鏂板浼佷笟'"
:total-object="totalObject"
:other-options="otherOptions"
:placeholder="'璇疯緭鍏ュ悕绉�'"
@addCommonClick="addEnterpriseClick"
@searchClick="getEnterpriseList"
+ @clearClick="getEnterpriseList"
/>
</div>
- </template>
+ </div>
<div class="content">
- <div class="content-top">
+ <div class="body-card">
+ <div class="list-view">
<TableCommonView ref="tableListRef" :table-list="tableList" @selTableCol="selTableCol">
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="160" fixed="right">
@@ -32,10 +34,11 @@
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
+ </div>
<!-- <div class="overSpread" v-show="isopen || isCreateShop"></div> -->
<!-- 娣诲姞/缂栬緫澶囦欢 -->
<AddEnterprise ref="add" :showList="showList" :titleName="titleName" :editRow="editRow" @shutdown="shutdown" />
- </d2-container>
+ </div>
</template>
<script>
@@ -241,7 +244,7 @@
},
// 鎼滅储瑙﹀彂
async getEnterpriseList(val) {
- this.searchParam.keyword = val
+ this.searchParam.keyword = val?val:''
this.pagerOptions.currPage = 1
this.getData()
},
@@ -307,36 +310,52 @@
</script>
<style lang="scss" scoped>
-.top {
- width: 100%;
- height: 61px;
- display: flex;
- align-items: center;
- .fon_weight {
- font-size: 28px;
- height: 32px;
- }
- .top_right_bottom {
- font-size: 14px;
- line-height: 20px;
- color: #000;
- opacity: 0.6;
- margin-top: 9px;
- font-family: "PingFangSC-Medium," sans-serif;
+.outsource-supplier-manage{
+ height: 100%;
+ overflow: hidden;
+ .filter {
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card {
+ height: 80px;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
+ }
}
}
+
.el-button {
font-family: "PingFangSC";
}
.content {
- width: 100%;
- height: calc(100% - 30px);
- background: #fff;
+ // width: 100%;
+ height: calc(100% - 92px);
border-radius: 12px;
box-sizing: border-box;
- .content-top {
- height: calc(100% - 60px);
- }
+ padding: 10px 20px;
+ .body-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
+ }
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
+ }
}
::v-deep {
.el-table {
diff --git a/src/views/supplierManage/supplier/AddSupplier.vue b/src/views/supplierManage/supplier/AddSupplier.vue
index 8a7d35b..7b737ed 100644
--- a/src/views/supplierManage/supplier/AddSupplier.vue
+++ b/src/views/supplierManage/supplier/AddSupplier.vue
@@ -453,7 +453,7 @@
},
// 涓嬭浇鍚堝悓
downloadClick() {
- let url = "/api/downloadContract?id=" + this.file_id
+ let url = "/api-srm/downloadContract?id=" + this.file_id
download(url, "", "")
},
// 鍒犻櫎鍚堝悓
@@ -468,7 +468,7 @@
},
// 棰勮鍚堝悓
// async previewClick() {
- // this.previewUrl = "/api/con/previewContract?id=" + this.file_id
+ // this.previewUrl = "/api-srm/con/previewContract?id=" + this.file_id
// if (this.file_name.includes("pdf")) {
// window.open(this.previewUrl, "_blank")
// } else {
@@ -483,7 +483,7 @@
// }
// }
async previewClick() {
- this.previewUrl = "/api/previewContract?id=" + this.file_id
+ this.previewUrl = "/api-srm/previewContract?id=" + this.file_id
if (this.file_name.includes("pdf")) {
console.log("鏄痯df鏂囦欢")
await axios
diff --git a/src/views/supplierManage/supplier/DetailSupplier.vue b/src/views/supplierManage/supplier/DetailSupplier.vue
index 5c9aee8..9029af4 100644
--- a/src/views/supplierManage/supplier/DetailSupplier.vue
+++ b/src/views/supplierManage/supplier/DetailSupplier.vue
@@ -308,7 +308,7 @@
// 涓嬭浇鍚堝悓闄勪欢
downLoadFiles(){
if(this.detailConfig.infomation.contract.fileName){
- let url = "/api/downloadContract?id=" + this.commonDetail.infomation.fileId
+ let url = "/api-srm/downloadContract?id=" + this.commonDetail.infomation.fileId
download(url, "", "")
}
}
--
Gitblit v1.8.0