Browse Source

新建工程代码提交

cxd 8 months ago
parent
commit
1ffaae57b4

+ 12 - 2
ui/src/api/worksCategory/worksCategory.js

@@ -3,10 +3,20 @@ import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
 
 
-export function addWorkCategory(data) {
+export function addWork(data) {
     return request({
       url: '/work/add',
       method: 'post',
       data: data
     })
-  }
+  }
+
+
+
+export function listWork(query) {
+  return request({
+    url: '/work/list',
+    method: 'get',
+    params: query
+  })
+}

+ 66 - 43
ui/src/views/ProductMent/worksCategory/index.vue

@@ -3,21 +3,31 @@
       <!-- 顶部操作区 -->
       <div class="operation-area">
         <el-button type="primary" @click="handleAdd">新建工程类别</el-button>
-        <el-input
-          v-model="searchQuery"
-          placeholder="请输入工程类别编号或名称"
-          style="width: 200px; margin-left: 16px"
-          @keyup.enter.native="handleSearch"
-        >
-          <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
-        </el-input>
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+                v-model="queryParams.wkNo"
+                placeholder="请输入工程类别编号或名称"
+                style="width: 200px; margin-left: 16px"
+                @keyup.enter.native="handleSearch"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
+          </el-form-item>
+        </el-form>
+
+
+
       </div>
-  
+
       <!-- 表格区域 -->
-      <el-table :data="tableData"  style="width: 100%; margin-top: 20px">
-        <el-table-column prop="projectCode" label="工程类别编号" width="180"></el-table-column>
-        <el-table-column prop="projectName" label="工程类别名称" width="180"></el-table-column>
-        <el-table-column prop="remark" label="备注"></el-table-column>
+      <el-table :data="tableData"  style="width: 100%; margin-top: 20px" id="worksCategoryList">
+        <el-table-column prop="wkNo" label="工程类别编号" width="180"></el-table-column>
+        <el-table-column prop="wkName" label="工程类别名称" width="180"></el-table-column>
+        <el-table-column prop="wkRemark" label="备注"></el-table-column>
         <el-table-column prop="productCount" label="产品数" width="120"></el-table-column>
         <el-table-column label="操作" width="250">
           <template slot-scope="scope">
@@ -27,7 +37,7 @@
           </template>
         </el-table-column>
       </el-table>
-  
+
       <!-- 分页 -->
       <el-pagination
         @size-change="handleSizeChange"
@@ -40,18 +50,18 @@
         style="margin-top: 20px; text-align: right"
       >
       </el-pagination>
-  
+
       <!-- 新增/编辑对话框 -->
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px">
         <el-form :model="form" :rules="rules" ref="form" label-width="120px">
-          <el-form-item label="工程类别编号" prop="projectCode">
-            <el-input v-model="form.projectCode"></el-input>
+          <el-form-item label="工程类别编号" prop="wkNo">
+            <el-input v-model="form.wkNo"></el-input>
           </el-form-item>
-          <el-form-item label="工程类别名称" prop="projectName">
-            <el-input v-model="form.projectName"></el-input>
+          <el-form-item label="工程类别名称" prop="wkName">
+            <el-input v-model="form.wkName"></el-input>
           </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input type="textarea" v-model="form.remark"></el-input>
+          <el-form-item label="备注" prop="wkRemark">
+            <el-input type="textarea" v-model="form.wkRemark"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer">
@@ -61,10 +71,11 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
 
-  import { addWorkCategory } from "@/api/worksCategory/worksCategory";
+  import { addWork, addWorkCategory, listWork } from '@/api/worksCategory/worksCategory'
+  import { listNotice } from '@/api/system/notice'
 
 
   export default {
@@ -72,31 +83,36 @@
     data() {
       return {
         searchQuery: '',
-        tableData: [
-          {
-            projectCode: 'ysp',
-            projectName: '音视频',
-            remark: '',
-            productCount: 5
-          }
-        ],
+        userList: null,
+        tableData: [], // 表格数据
         pagination: {
           currentPage: 1,
           pageSize: 10,
           total: 1
         },
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          userName: undefined,
+          phonenumber: undefined,
+          status: undefined,
+          deptId: undefined
+        },
+
+
         dialogVisible: false,
         dialogTitle: '',
         form: {
-          projectCode: '',
-          projectName: '',
-          remark: ''
+          wkNo: '',
+          wkName: '',
+          wkRemark: ''
         },
         rules: {
-          projectCode: [
+          wkNo: [
             { required: true, message: '请输入工程类别编号', trigger: 'blur' }
           ],
-          projectName: [
+          wkName: [
             { required: true, message: '请输入工程类别名称', trigger: 'blur' }
           ]
         }
@@ -111,9 +127,9 @@
       handleAdd() {
         this.dialogTitle = '新增工程类别'
         this.form = {
-          projectCode: '',
-          projectName: '',
-          remark: ''
+          wkNo: '',
+          wkName: '',
+          wkRemark: ''
         }
         this.dialogVisible = true
       },
@@ -153,7 +169,7 @@
             if (this.form.userId != undefined) {
             }else{
 
-              addWorkCategory(this.form).then(response => {
+              addWork(this.form).then(response => {
               debugger;
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -171,7 +187,14 @@
       },
       loadData() {
         // 实现数据加载逻辑
-        console.log('加载数据,当前页:', this.pagination.currentPage, '每页数量:', this.pagination.pageSize)
+        this.loading = true;
+        listWork(this.searchQuery).then(response => {
+          debugger;
+          this.tableData = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+
       }
     },
     created() {
@@ -179,7 +202,7 @@
     }
   }
   </script>
-  
+
   <style scoped>
   .project-category-container {
     padding: 20px;
@@ -188,4 +211,4 @@
     display: flex;
     align-items: center;
   }
-  </style>
+  </style>