From 2fea9072aa2fbe80495ff232c4a0601e31c51e70 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 25 三月 2024 16:43:00 +0800
Subject: [PATCH] 申请物料获取产品信息接口联调及公共组件优化
---
src/components/makepager/pager/PagerView.vue | 2 +-
src/api/common/other.js | 2 +-
src/views/other/commonDialog/SelectCommonDialog.vue | 3 +--
src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/api/common/other.js b/src/api/common/other.js
index c08f55c..8c6e484 100644
--- a/src/api/common/other.js
+++ b/src/api/common/other.js
@@ -17,7 +17,7 @@
// 鑾峰彇浜у搧淇℃伅
export const getMaterialList = (data) => {
return request({
- url: "/api-s/v1/material/getMaterialList",
+ url: "/api-outsourcing/v1/order/materialSearch",
method: "post",
IsHeader: true,
data
diff --git a/src/components/makepager/pager/PagerView.vue b/src/components/makepager/pager/PagerView.vue
index ac30707..17de6ed 100644
--- a/src/components/makepager/pager/PagerView.vue
+++ b/src/components/makepager/pager/PagerView.vue
@@ -29,7 +29,7 @@
props: {
pageSizes: {
type: Array,
- default: () => [5, 10, 20, 30, 40]
+ default: () => [10, 20, 30, 40]
},
layout: {
type: String,
diff --git a/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue b/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
index 55e12eb..0b8f7d2 100644
--- a/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
+++ b/src/views/orderManageModule/orderManage/components/ApplyMaterialsDialog.vue
@@ -360,7 +360,7 @@
for (let i in arr) {
let item = {
outsourcingOrderNumber: this.editRow.infomation.outsourcingOrderNumber,
- materialNumber: arr[i].id,
+ materialNumber: arr[i].number,
materialName: arr[i].name,
amount: 1,
unit: arr[i].unit ? arr[i].unit : 1,
@@ -368,7 +368,7 @@
specs: arr[i].specs ? arr[i].specs : ""
}
console.log(arr, "8989")
- isPush = this.getIsPush(this.productTableList.tableInfomation, arr[i].id)
+ isPush = this.getIsPush(this.productTableList.tableInfomation, arr[i].number)
if (isPush) {
this.productTableList.tableInfomation.splice(this.productTableList.tableInfomation.length, 0, item)
}
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 27e8e4b..0b8671e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -34,7 +34,6 @@
<PagerView
class="page"
:pager-options="pagerOptions"
- :pagerCount="pagerCount"
layout="total, sizes, prev, pager, next"
v-on="pagerEvents"
/>
@@ -123,7 +122,7 @@
},
{
label: "浜у搧缂栫爜",
- prop: "id",
+ prop: "number",
isShowColumn: true,
default: true
},
--
Gitblit v1.8.0