From 6eaf0550980be829607795ad8d132c90ddb930c4 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期六, 20 一月 2024 16:07:55 +0800
Subject: [PATCH] fix 合箱上线
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 9 +++++++++
jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js | 8 +++++++-
jcdm-ui/src/views/main/kb/prepareOnline/index.vue | 4 ++--
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 7058b2c..897b358 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -41,6 +41,15 @@
@GetMapping("/list")
public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
{
+ startPage();
+ List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ return getDataTable(list);
+ }
+
+ @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
+ @GetMapping("/list2")
+ public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
+ {
// startPage();
List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
return getDataTable(list);
diff --git a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
index 8727d5c..6ab9b97 100644
--- a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
+++ b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
@@ -8,7 +8,13 @@
params: query
})
}
-
+export function listOrderScheduling2(query) {
+ return request({
+ url: '/bs/orderScheduling/list2',
+ method: 'get',
+ params: query
+ })
+}
// 鏌ヨ璁㈠崟鎺掍骇璇︾粏
export function getOrderScheduling(id) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
index 307d290..3a4c8ac 100644
--- a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
+++ b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
@@ -92,7 +92,7 @@
</template>
<script>
-import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling";
+import {listOrderScheduling2} from "@/api/main/bs/orderScheduling/orderScheduling";
import VueQr from 'vue-qr'
export default {
name: "index",
@@ -118,7 +118,7 @@
this.getList();
},
getList(){
- listOrderScheduling(this.queryParams).then(response => {
+ listOrderScheduling2(this.queryParams).then(response => {
console.log("--------------------"+response.rows)
this.dataList = response.rows
if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){
--
Gitblit v1.9.3