From e5c9cfb90d2b5eb20332adde2696c072065fc268 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 4 May 2023 18:57:27 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E7=94=9F=E4=BA=A7=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/service/basedata/dao/Workshop.java |  7 +-
 .../basedata/impl/WorkshopServiceImpl.java    |  1 -
 nladmin-ui/src/views/wms/basedata/index.vue   | 70 ++++++++++++-------
 3 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java
index bbcf6ea..0023d57 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java
@@ -2,6 +2,7 @@ package org.nl.wms.service.basedata.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +17,7 @@ import java.io.Serializable;
 **/
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Table(name="md_base_workshop")
+@TableName("md_base_workshop")
 public class Workshop implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,10 +33,10 @@ public class Workshop implements Serializable {
     private String remark;
 
     @ApiModelProperty(value = "是否启用")
-    private String isUsed;
+    private Boolean isUsed;
 
     @ApiModelProperty(value = "是否删除")
-    private String isDelete;
+    private Boolean isDelete;
 
     @ApiModelProperty(value = "创建人")
     private String createId;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java
index 9d7218e..947b061 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java
@@ -48,7 +48,6 @@ public class WorkshopServiceImpl extends ServiceImpl< WorkshopMapper, Workshop>
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
-        entity.setWorkshopCode(IdUtil.getSnowflake(1, 1).nextIdStr());
         entity.setCreateId(currentUserId);
         entity.setCreateName(nickName);
         entity.setCreateTime(now);
diff --git a/nladmin-ui/src/views/wms/basedata/index.vue b/nladmin-ui/src/views/wms/basedata/index.vue
index 6e0345c..b2d53f5 100644
--- a/nladmin-ui/src/views/wms/basedata/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/index.vue
@@ -3,23 +3,24 @@
     <!--工具栏-->
     <div class="head-container">
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
-                 :title="crud.status.title" width="500px"
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="车间编码">
-            <el-input v-model="form.workshopCode" style="width: 370px;"/>
+            <el-input v-model="form.workshopCode" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="车间名称 ">
-            <el-input v-model="form.workshopName" style="width: 370px;"/>
+            <el-input v-model="form.workshopName" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="是否启用">
-            <el-input v-model="form.isUsed" style="width: 370px;"/>
+            <el-input v-model="form.remark" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -28,23 +29,40 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler"
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="workshopCode" label="车间编码"
-                         :min-width="flexWidth('workshopCode',crud.data,'车间编码')"
+        <el-table-column type="selection" width="55" />
+        <el-table-column
+          prop="workshopCode"
+          label="车间编码"
+          :min-width="flexWidth('workshopCode',crud.data,'车间编码')"
         />
-        <el-table-column prop="workshopName" label="车间名称 "
-                         :min-width="flexWidth('workshopName',crud.data,'车间名称 ')"
+        <el-table-column
+          prop="workshopName"
+          label="车间名称 "
+          :min-width="flexWidth('workshopName',crud.data,'车间名称 ')"
         />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
-        <el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')"/>
-        <el-table-column prop="isDelete" label="是否删除" :min-width="flexWidth('isDelete',crud.data,'是否删除')"/>
-        <el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')"/>
-        <el-table-column prop="createTime" label="创建时间" :min-width="flexWidth('createTime',crud.data,'创建时间')"/>
-        <el-table-column prop="updateName" label="修改人" :min-width="flexWidth('updateName',crud.data,'修改人')"/>
-        <el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')"/>
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')">
+          <template slot-scope="scope">
+            {{scope.row.isUsed?'是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="isDelete" label="是否删除" :min-width="flexWidth('isDelete',crud.data,'是否删除')">
+          <template slot-scope="scope">
+            {{scope.row.isDelete?'是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
+        <el-table-column prop="createTime" label="创建时间" :min-width="flexWidth('createTime',crud.data,'创建时间')" />
+        <el-table-column prop="updateName" label="修改人" :min-width="flexWidth('updateName',crud.data,'修改人')" />
+        <el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -55,7 +73,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>
@@ -72,8 +90,8 @@ const defaultForm = {
   workshopCode: null,
   workshopName: null,
   remark: null,
-  isUsed: null,
-  isDelete: null,
+  isUsed: true,
+  isDelete: false,
   createId: null,
   createName: null,
   createTime: null,