From a9e24c02828a056e8d05587744aba76393e96d98 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Wed, 7 Dec 2022 09:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=2012.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/team/StationList.vue            |  18 +--
 .../src/views/team/StationMachineList.vue     | 108 +++++++++---------
 .../src/views/team/StationToolList.vue        |  94 +++++++--------
 .../team/modules/StationMachineModal.vue      |   8 +-
 .../views/team/modules/StationToolModal.vue   |   9 +-
 .../jeecg/modules/team/entity/Station.java    |   2 +-
 6 files changed, 127 insertions(+), 112 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index adbea45b..9c456935 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -7,9 +7,13 @@
         <a-row :gutter="24">
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="车间ID">
-              <a-input placeholder="请输入车间ID" v-model="queryParam.departId"></a-input>
-            </a-form-item>
+<!--            <a-form-item label="车间ID">-->
+<!--              <a-input placeholder="请输入车间ID" v-model="queryParam.departId"></a-input>-->
+<!--            </a-form-item>-->
+            <a-form-model-item label="车间编号">
+              <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
+              <j-select-depart placeholder="请选择车间" v-model="queryParam.departId"/>
+            </a-form-model-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工位名称">
@@ -22,10 +26,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
 
diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
index edfa8b5f..4daa8cbd 100644
--- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
@@ -2,54 +2,54 @@
   <a-card :bordered="false">
 
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
+    <!--    <div class="table-page-search-wrapper">-->
+    <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+    <!--        <a-row :gutter="24">-->
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="工位ID">
-              <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备ID">
-              <a-input placeholder="请输入设备ID" v-model="queryParam.machineId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--            <a-form-item label="工位ID">-->
+    <!--              <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>-->
+    <!--            </a-form-item>-->
+    <!--          </a-col>-->
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--            <a-form-item label="设备ID">-->
+    <!--              <a-input placeholder="请输入设备ID" v-model="queryParam.machineId"></a-input>-->
+    <!--            </a-form-item>-->
+    <!--          </a-col>-->
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+    <!--              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+    <!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+    <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+    <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+    <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+    <!--              </a>-->
+    <!--            </span>-->
+    <!--          </a-col>-->
 
-        </a-row>
-      </a-form>
-    </div>
+    <!--        </a-row>-->
+    <!--      </a-form>-->
+    <!--    </div>-->
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-<!--                @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
+      <!--                @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel">-->
+      <!--            <a-icon type="delete"/>-->
+      <!--            删除-->
+      <!--          </a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作-->
+      <!--          <a-icon type="down"/>-->
+      <!--        </a-button>-->
+      <!--      </a-dropdown>-->
       <a-button type="primary" @click="fanHui()">返回</a-button>
     </div>
 
@@ -75,19 +75,21 @@
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          </a-popconfirm>
+          <!--          <a-divider type="vertical"/>-->
+          <!--          <a-dropdown>-->
+          <!--            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>-->
+          <!--            <a-menu slot="overlay">-->
+          <!--              <a-menu-item>-->
+          <!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+          <!--                  <a>删除</a>-->
+          <!--                </a-popconfirm>-->
+          <!--              </a-menu-item>-->
+          <!--            </a-menu>-->
+          <!--          </a-dropdown>-->
         </span>
 
       </a-table>
diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
index 81b7e095..0c687e67 100644
--- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
@@ -2,41 +2,41 @@
   <a-card :bordered="false">
 
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="工位ID">
-              <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="工具ID">
-              <a-input placeholder="请输入工具ID" v-model="queryParam.toolsId"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <!--    <div class="table-page-search-wrapper">-->
+    <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+    <!--        <a-row :gutter="24">-->
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--            <a-form-item label="工位ID">-->
+    <!--              <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>-->
+    <!--            </a-form-item>-->
+    <!--          </a-col>-->
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--            <a-form-item label="工具ID">-->
+    <!--              <a-input placeholder="请输入工具ID" v-model="queryParam.toolsId"></a-input>-->
+    <!--            </a-form-item>-->
+    <!--          </a-col>-->
+    <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+    <!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+    <!--              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+    <!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+    <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+    <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+    <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+    <!--              </a>-->
+    <!--            </span>-->
+    <!--          </a-col>-->
+    <!--        </a-row>-->
+    <!--      </a-form>-->
+    <!--    </div>-->
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('工序工具管理')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-<!--                @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
+      <!--                @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -74,19 +74,21 @@
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          </a-popconfirm>
+<!--          <a-divider type="vertical"/>-->
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
         </span>
 
       </a-table>
@@ -106,7 +108,7 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 
 export default {
   name: "StationToolList",
-  mixins: [JeecgListMixin,mixinDevice],
+  mixins: [JeecgListMixin, mixinDevice],
   components: {
     StationToolModal
   },
@@ -156,7 +158,8 @@ export default {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     }
   },
-  methods: {fanHui() {
+  methods: {
+    fanHui() {
       this.$router.push({
         path: '/team/StationList',
         //   query: {  // 路由携带参数
@@ -165,7 +168,8 @@ export default {
         //   }
         // });
       });
-    },}
+    },
+  }
 }
 </script>
 <style scoped>
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue
index c7bb1ed8..b9731a3b 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationMachineModal.vue
@@ -11,10 +11,12 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="工位ID">
-          <a-input placeholder="请输入工位ID" v-model="model.stationId" />
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="车间工位编号">
+          <j-select-depart placeholder="请选择工位" v-model="model.stationId"/>
         </a-form-model-item>
+<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="工位ID">-->
+<!--          <a-input placeholder="请输入工位ID" v-model="model.stationId" />-->
+<!--        </a-form-model-item>-->
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineId" label="设备ID">
           <a-input placeholder="请输入设备ID" v-model="model.machineId" />
         </a-form-model-item>
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
index 8cb42d77..908250c7 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
@@ -11,10 +11,13 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="工位ID">
-          <a-input placeholder="请输入工位ID" v-model="model.stationId" />
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="车间工位编号">
+          <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
+          <j-select-depart placeholder="请选择工位" v-model="model.stationId"/>
         </a-form-model-item>
+<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId" label="工位ID">-->
+<!--          <a-input placeholder="请输入工位ID" v-model="model.stationId" />-->
+<!--        </a-form-model-item>-->
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolsId" label="工具ID">
           <a-input placeholder="请输入工具ID" v-model="model.toolsId" />
         </a-form-model-item>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
index abaec42a..b56612e1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Station.java
@@ -64,7 +64,7 @@ public class Station {
     @Excel(name = "车间名称", width = 15)
     @ApiModelProperty(value = "车间")
 //    @Dict(dictTable = "depart_status")
-    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+//    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String departName;
     /**
      * 工位名称