From 57e9b714aed209569db8e634300abbb176cc3fbd Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 14 Nov 2023 11:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=AF=B9=E6=8E=A5=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pro/ProWorkplanController.cs          | 24 ++++++++++++++
 ZR.Vue/src/api/productManagement/workplan.js  | 10 ++++++
 .../src/views/productManagement/workplan.vue  | 33 +++++++++++++++----
 3 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
 create mode 100644 ZR.Vue/src/api/productManagement/workplan.js

diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
new file mode 100644
index 00000000..218965ea
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.mes.md;
+using ZR.Service.MES.md;
+
+namespace ZR.Admin.WebApi.Controllers.MES.pro
+{
+
+
+    [Route("mes/pro/workplan")]
+    public class ProWorkplanController : BaseController
+    {
+
+        [HttpGet("list")]
+        public IActionResult List(int pageNum, int pageSize, int year , int week,string partNumber="",string color="")
+        {
+            (int, List<MdBom>) data = (0,null);
+
+            return ToResponse(new ApiResult(200, "success", data));
+        }
+
+
+
+    }
+}
diff --git a/ZR.Vue/src/api/productManagement/workplan.js b/ZR.Vue/src/api/productManagement/workplan.js
new file mode 100644
index 00000000..b9e95573
--- /dev/null
+++ b/ZR.Vue/src/api/productManagement/workplan.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+export function getWorkplanList(query) {
+    return request({
+      url: '/mes/pro/workplan/list',
+      method: 'get',
+      params: query,
+    })
+  }
\ No newline at end of file
diff --git a/ZR.Vue/src/views/productManagement/workplan.vue b/ZR.Vue/src/views/productManagement/workplan.vue
index 4cd46ac1..00995a8f 100644
--- a/ZR.Vue/src/views/productManagement/workplan.vue
+++ b/ZR.Vue/src/views/productManagement/workplan.vue
@@ -23,7 +23,7 @@
           <el-col :span="16"> <el-button type="primary">新建生产计划</el-button> </el-col>
         </el-row>
 
-        <el-table border stripe :data="workplanList" style="width: 100%" height="500" highlight-current-row @current-change="handleCurrentChange">
+        <el-table border stripe :data="workplanList" v-loading="loading_1" style="width: 100%" height="500" highlight-current-row @current-change="handleCurrentChange">
           <el-table-column prop="id" label="流水号" sortable></el-table-column>
           <el-table-column prop="year" label="年"> </el-table-column>
           <el-table-column prop="week" label="周"> </el-table-column>
@@ -53,7 +53,7 @@
           </el-table-column>
         </el-table>
         <pagination
-          v-show="total > 0"
+          v-show="pagination.total > 0"
           :total="pagination.total"
           :page.sync="pagination.pageNum"
           :limit.sync="pagination.pageSize"
@@ -98,6 +98,7 @@
 </template>
 
 <script>
+import { getWorkplanList } from '@/api/productManagement/workplan.js'
 export default {
   name: 'workplan',
   data() {
@@ -154,22 +155,40 @@ export default {
           remark: 12,
         },
       ], //生产计划列表
-      pagination: {},
+      pagination: {
+        total: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      loading_1:true
     }
   },
-  mounted() {},
-  methods: {},
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      const query = { ...this.search, ...this.pagination }
+      getWorkplanList(query).then((res)=>{
+        if(res.code==200){
+          this.loading_1=false;
+          this.workplanList=res.data;
+          this.pagination.total=res.total
+        }
+
+      })
+
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 .workplantable {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
-  
 }
 .workordertable {
   margin-top: 50px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
-
 }
 </style>