From bf04a3d97228529c11b2e84e8de7502519882236 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 26 十二月 2025 15:31:33 +0800
Subject: [PATCH] Merge branch 'dev_JTWY' of http://114.132.189.42:9002/r/TianJin-product-management into dev_JTWY
---
src/views/productionManagement/processRoute/index.vue | 1 -
src/views/basicData/product/ProductSelectDialog.vue | 4 ++--
src/views/productionManagement/processRoute/Edit.vue | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index 70d3f3e..246cd88 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -147,8 +147,8 @@
const res = await productModelList({
productName: query.productName.trim(),
model: query.model.trim(),
- pageNum: page.pageNum,
- pageSize: page.pageSize,
+ current: page.pageNum,
+ size: page.pageSize,
});
tableData.value = res.records;
total.value = res.total;
diff --git a/src/views/productionManagement/processRoute/Edit.vue b/src/views/productionManagement/processRoute/Edit.vue
index ad480a9..773d333 100644
--- a/src/views/productionManagement/processRoute/Edit.vue
+++ b/src/views/productionManagement/processRoute/Edit.vue
@@ -2,7 +2,7 @@
<div>
<el-dialog
v-model="isShow"
- title="缂栬緫宸ュ簭"
+ title="缂栬緫宸ヨ壓璺嚎"
width="400"
@close="closeModal"
>
diff --git a/src/views/productionManagement/processRoute/index.vue b/src/views/productionManagement/processRoute/index.vue
index 7b53dfd..05edce3 100644
--- a/src/views/productionManagement/processRoute/index.vue
+++ b/src/views/productionManagement/processRoute/index.vue
@@ -48,7 +48,6 @@
:record="record"
@completed="getList"
/>
- RouteItemForm
</div>
</template>
--
Gitblit v1.9.3