From 0fa372d580075a64c6e46dd86e67b59a645a259a Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Fri, 13 Jan 2023 15:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=201.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/erp/tool/ZyToolListRef.vue      | 528 +++++++++---------
 .../src/views/team/GroupxMemberList.vue       |   7 +-
 .../src/views/team/StationList.vue            |   6 +-
 .../src/views/team/StationMachineList.vue     |  53 +-
 .../src/views/team/StationToolList.vue        |  53 +-
 .../views/team/modules/StationToolModal.vue   |   2 +-
 .../src/views/tool/tool/ZyToolListRef.vue     | 137 +++++
 .../controller/StationToolController.java     |   2 +-
 .../modules/team/entity/StationTool.java      |   2 +-
 .../team/service/impl/StationServiceImpl.java |   4 +-
 10 files changed, 426 insertions(+), 368 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue

diff --git a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
index e1fdaddf..025cfe6c 100644
--- a/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
+++ b/ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
@@ -1,276 +1,276 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :sm="5">
-            <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
-              <a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :sm="5">
-            <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input>
-            </a-form-model-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>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-<!--    <div class="table-operator">-->
-<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--<template>-->
+<!--  <a-card :bordered="false">-->
+<!--    &lt;!&ndash; 查询区域 &ndash;&gt;-->
+<!--    <div class="table-page-search-wrapper">-->
+<!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+<!--        <a-row :gutter="24">-->
+<!--          <a-col :sm="5">-->
+<!--            <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">-->
+<!--              <a-input v-model="queryParam.code" placeholder="请输入工具编号"></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :sm="5">-->
+<!--            <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">-->
+<!--              <a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input>-->
+<!--            </a-form-model-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>-->
+<!--            </span>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--      </a-form>-->
 <!--    </div>-->
 
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--    &lt;!&ndash; 操作按钮区域 &ndash;&gt;-->
+<!--&lt;!&ndash;    <div class="table-operator">&ndash;&gt;-->
+<!--&lt;!&ndash;      &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--&lt;!&ndash;    </div>&ndash;&gt;-->
+
+<!--    &lt;!&ndash; table区域-begin &ndash;&gt;-->
+<!--    <div>-->
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+<!--        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        class="j-table-force-nowrap"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange">
+<!--      <a-table-->
+<!--        ref="table"-->
+<!--        size="middle"-->
+<!--        bordered-->
+<!--        rowKey="id"-->
+<!--        class="j-table-force-nowrap"-->
+<!--        :scroll="{x:true}"-->
+<!--        :columns="columns"-->
+<!--        :dataSource="dataSource"-->
+<!--        :pagination="ipagination"-->
+<!--        :loading="loading"-->
+<!--        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
+<!--        :customRow="clickThenSelect"-->
+<!--        @change="handleTableChange">-->
 
-        <!--        <template slot="htmlSlot" slot-scope="text">-->
-        <!--          <div v-html="text"></div>-->
-        <!--        </template>-->
-        <!--        <template slot="imgSlot" slot-scope="text">-->
-        <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
-        <!--          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
-        <!--        </template>-->
-        <!--        <template slot="fileSlot" slot-scope="text">-->
-        <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
-        <!--          <a-button-->
-        <!--            v-else-->
-        <!--            :ghost="true"-->
-        <!--            type="primary"-->
-        <!--            icon="download"-->
-        <!--            size="small"-->
-        <!--            @click="downloadFile(text)">-->
-        <!--            下载-->
-        <!--          </a-button>-->
-        <!--        </template>-->
+<!--        &lt;!&ndash;        <template slot="htmlSlot" slot-scope="text">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <div v-html="text"></div>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <template slot="imgSlot" slot-scope="text">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>&ndash;&gt;-->
+<!--        &lt;!&ndash;          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <template slot="fileSlot" slot-scope="text">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>&ndash;&gt;-->
+<!--        &lt;!&ndash;          <a-button&ndash;&gt;-->
+<!--        &lt;!&ndash;            v-else&ndash;&gt;-->
+<!--        &lt;!&ndash;            :ghost="true"&ndash;&gt;-->
+<!--        &lt;!&ndash;            type="primary"&ndash;&gt;-->
+<!--        &lt;!&ndash;            icon="download"&ndash;&gt;-->
+<!--        &lt;!&ndash;            size="small"&ndash;&gt;-->
+<!--        &lt;!&ndash;            @click="downloadFile(text)">&ndash;&gt;-->
+<!--        &lt;!&ndash;            下载&ndash;&gt;-->
+<!--        &lt;!&ndash;          </a-button>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </template>&ndash;&gt;-->
 
-        <!--        <span slot="action" slot-scope="text, record">-->
-        <!--          <a @click="handleEdit(record)">编辑</a>-->
+<!--        &lt;!&ndash;        <span slot="action" slot-scope="text, record">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <a @click="handleEdit(record)">编辑</a>&ndash;&gt;-->
 
-        <!--          <a-divider type="vertical" />-->
-        <!--          <a-dropdown>-->
-        <!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
-        <!--            <a-menu slot="overlay">-->
-        <!--              <a-menu-item>-->
-        <!--                <a @click="handleDetail(record)">详情</a>-->
-        <!--              </a-menu-item>-->
-        <!--              <a-menu-item>-->
-        <!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
-        <!--                  <a>删除</a>-->
-        <!--                </a-popconfirm>-->
-        <!--              </a-menu-item>-->
-        <!--            </a-menu>-->
-        <!--          </a-dropdown>-->
-        <!--        </span>-->
+<!--        &lt;!&ndash;          <a-divider type="vertical" />&ndash;&gt;-->
+<!--        &lt;!&ndash;          <a-dropdown>&ndash;&gt;-->
+<!--        &lt;!&ndash;            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>&ndash;&gt;-->
+<!--        &lt;!&ndash;            <a-menu slot="overlay">&ndash;&gt;-->
+<!--        &lt;!&ndash;              <a-menu-item>&ndash;&gt;-->
+<!--        &lt;!&ndash;                <a @click="handleDetail(record)">详情</a>&ndash;&gt;-->
+<!--        &lt;!&ndash;              </a-menu-item>&ndash;&gt;-->
+<!--        &lt;!&ndash;              <a-menu-item>&ndash;&gt;-->
+<!--        &lt;!&ndash;                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">&ndash;&gt;-->
+<!--        &lt;!&ndash;                  <a>删除</a>&ndash;&gt;-->
+<!--        &lt;!&ndash;                </a-popconfirm>&ndash;&gt;-->
+<!--        &lt;!&ndash;              </a-menu-item>&ndash;&gt;-->
+<!--        &lt;!&ndash;            </a-menu>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </a-dropdown>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </span>&ndash;&gt;-->
 
-      </a-table>
-    </div>
+<!--      </a-table>-->
+<!--    </div>-->
 
-    <!--    <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>-->
-  </a-card>
-</template>
+<!--    &lt;!&ndash;    <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>&ndash;&gt;-->
+<!--  </a-card>-->
+<!--</template>-->
 
-<script>
+<!--<script>-->
 
-import '@/assets/less/TableExpand.less'
-// import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import {getAction} from "@api/manage";
-// import ZyToolModal from './modules/ZyToolModal'
+<!--import '@/assets/less/TableExpand.less'-->
+<!--// import {mixinDevice} from '@/utils/mixin'-->
+<!--import {JeecgListMixin} from '@/mixins/JeecgListMixin'-->
+<!--import {getAction} from "@api/manage";-->
+<!--// import ZyToolModal from './modules/ZyToolModal'-->
 
-export default {
-  name: 'ZyToolList',
-  mixins: [JeecgListMixin],
-  components: {
-    // ZyToolModal
-  },
-  data() {
-    return {
-      description: 'zy_tool管理页面',
-      // 表头
-      columns: [
-        // {
-        //   title: '#',
-        //   dataIndex: '',
-        //   key:'rowIndex',
-        //   width:60,
-        //   align:"center",
-        //   customRender:function (t,r,index) {
-        //     return parseInt(index)+1;
-        //   }
-        // },
-        {
-          title: '工具编号',
-          align: "center",
-          dataIndex: 'id'
-        },
-        {
-          title: '工具名称',
-          align: "center",
-          dataIndex: 'name'
-        },
-        {
-          title: '功能',
-          align: "center",
-          dataIndex: 'function'
-        },
-        {
-          title: '规格',
-          align: "center",
-          dataIndex: 'specs'
-        },
-        // {
-        //   title:'适用范围',
-        //   align:"center",
-        //   dataIndex: 'scope'
-        // },
-        // {
-        //   title:'责人工段',
-        //   align:"center",
-        //   dataIndex: 'workshopSection'
-        // },
-        // {
-        //   title:'状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)',
-        //   align:"center",
-        //   dataIndex: 'status'
-        // },
-        // {
-        //   title:'二维码',
-        //   align:"center",
-        //   dataIndex: 'qrode'
-        // },
-        // {
-        //   title: '操作',
-        //   dataIndex: 'action',
-        //   align:"center",
-        //   fixed:"right",
-        //   width:147,
-        //   scopedSlots: { customRender: 'action' }
-        // }
-      ],
-      url: {
-        list: "/tool/zyTool/list",
-        delete: "/tool/zyTool/delete",
-        deleteBatch: "/tool/zyTool/deleteBatch",
-        exportXlsUrl: "/tool/zyTool/exportXls",
-        importExcelUrl: "tool/zyTool/importExcel",
+<!--export default {-->
+<!--  name: 'ZyToolList',-->
+<!--  mixins: [JeecgListMixin],-->
+<!--  components: {-->
+<!--    // ZyToolModal-->
+<!--  },-->
+<!--  data() {-->
+<!--    return {-->
+<!--      description: 'zy_tool管理页面',-->
+<!--      // 表头-->
+<!--      columns: [-->
+<!--        // {-->
+<!--        //   title: '#',-->
+<!--        //   dataIndex: '',-->
+<!--        //   key:'rowIndex',-->
+<!--        //   width:60,-->
+<!--        //   align:"center",-->
+<!--        //   customRender:function (t,r,index) {-->
+<!--        //     return parseInt(index)+1;-->
+<!--        //   }-->
+<!--        // },-->
+<!--        {-->
+<!--          title: '工具编号',-->
+<!--          align: "center",-->
+<!--          dataIndex: 'code'-->
+<!--        },-->
+<!--        {-->
+<!--          title: '工具名称',-->
+<!--          align: "center",-->
+<!--          dataIndex: 'name'-->
+<!--        },-->
+<!--        {-->
+<!--          title: '功能',-->
+<!--          align: "center",-->
+<!--          dataIndex: 'function'-->
+<!--        },-->
+<!--        {-->
+<!--          title: '规格',-->
+<!--          align: "center",-->
+<!--          dataIndex: 'specs'-->
+<!--        },-->
+<!--        // {-->
+<!--        //   title:'适用范围',-->
+<!--        //   align:"center",-->
+<!--        //   dataIndex: 'scope'-->
+<!--        // },-->
+<!--        // {-->
+<!--        //   title:'责人工段',-->
+<!--        //   align:"center",-->
+<!--        //   dataIndex: 'workshopSection'-->
+<!--        // },-->
+<!--        // {-->
+<!--        //   title:'状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)',-->
+<!--        //   align:"center",-->
+<!--        //   dataIndex: 'status'-->
+<!--        // },-->
+<!--        // {-->
+<!--        //   title:'二维码',-->
+<!--        //   align:"center",-->
+<!--        //   dataIndex: 'qrode'-->
+<!--        // },-->
+<!--        // {-->
+<!--        //   title: '操作',-->
+<!--        //   dataIndex: 'action',-->
+<!--        //   align:"center",-->
+<!--        //   fixed:"right",-->
+<!--        //   width:147,-->
+<!--        //   scopedSlots: { customRender: 'action' }-->
+<!--        // }-->
+<!--      ],-->
+<!--      url: {-->
+<!--        list: "/tool/zyTool/list",-->
+<!--        delete: "/tool/zyTool/delete",-->
+<!--        deleteBatch: "/tool/zyTool/deleteBatch",-->
+<!--        exportXlsUrl: "/tool/zyTool/exportXls",-->
+<!--        importExcelUrl: "tool/zyTool/importExcel",-->
 
-      },
-      dictOptions:{
-      },
-      /* 分页参数 */
-      ipagination:{
-        current: 1,
-        pageSize: 5,
-        pageSizeOptions: ['5', '10', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 共" + total + "条"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId:'',
-      superFieldList:[],
-      selectedRowKeys: [],
-    }
-  },
-  created() {
-    this.getSuperFieldList();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
-  },
-  methods: {
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId=''
-    },
-    onSelectChange(selectedRowKeys) {
-      console.log('selectedRowKeys changed: ', selectedRowKeys);
-      this.selectedRowKeys = selectedRowKeys;
-    },
-    initDictConfig() {
-    },
-    loadData(arg) {
-      if(!this.url.list){
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if(res.code===510){
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'name', text: '工具名称'})
-      fieldList.push({type: 'string', value: 'nums', text: '工具编号'})
-      fieldList.push({type: 'string', value: 'function', text: '功能'})
-      fieldList.push({type: 'string', value: 'specs', text: '规格'})
-      fieldList.push({type: 'string', value: 'scope', text: '适用范围'})
-      fieldList.push({type: 'string', value: 'workshopSection', text: '责人工段'})
-      fieldList.push({type: 'string', value: 'status', text: '状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)'})
-      fieldList.push({type: 'string', value: 'qrode', text: '二维码'})
-      this.superFieldList = fieldList
-    }
-  }
-}
-</script>
-<style scoped>
-@import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+<!--      },-->
+<!--      dictOptions:{-->
+<!--      },-->
+<!--      /* 分页参数 */-->
+<!--      ipagination:{-->
+<!--        current: 1,-->
+<!--        pageSize: 5,-->
+<!--        pageSizeOptions: ['5', '10', '50'],-->
+<!--        showTotal: (total, range) => {-->
+<!--          return range[0] + "-" + range[1] + " 共" + total + "条"-->
+<!--        },-->
+<!--        showQuickJumper: true,-->
+<!--        showSizeChanger: true,-->
+<!--        total: 0-->
+<!--      },-->
+<!--      selectedMainId:'',-->
+<!--      superFieldList:[],-->
+<!--      selectedRowKeys: [],-->
+<!--    }-->
+<!--  },-->
+<!--  created() {-->
+<!--    this.getSuperFieldList();-->
+<!--  },-->
+<!--  computed: {-->
+<!--    importExcelUrl: function () {-->
+<!--      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;-->
+<!--    },-->
+<!--  },-->
+<!--  methods: {-->
+<!--    clickThenSelect(record) {-->
+<!--      return {-->
+<!--        on: {-->
+<!--          click: () => {-->
+<!--            this.onSelectChange(record.id.split(","), [record]);-->
+<!--          }-->
+<!--        }-->
+<!--      }-->
+<!--    },-->
+<!--    onClearSelected() {-->
+<!--      this.selectedRowKeys = [];-->
+<!--      this.selectionRows = [];-->
+<!--      this.selectedMainId=''-->
+<!--    },-->
+<!--    onSelectChange(selectedRowKeys) {-->
+<!--      console.log('selectedRowKeys changed: ', selectedRowKeys);-->
+<!--      this.selectedRowKeys = selectedRowKeys;-->
+<!--    },-->
+<!--    initDictConfig() {-->
+<!--    },-->
+<!--    loadData(arg) {-->
+<!--      if(!this.url.list){-->
+<!--        this.$message.error("请设置url.list属性!")-->
+<!--        return-->
+<!--      }-->
+<!--      //加载数据 若传入参数1则加载第一页的内容-->
+<!--      if (arg === 1) {-->
+<!--        this.ipagination.current = 1;-->
+<!--      }-->
+<!--      this.onClearSelected()-->
+<!--      var params = this.getQueryParams();//查询条件-->
+<!--      this.loading = true;-->
+<!--      getAction(this.url.list, params).then((res) => {-->
+<!--        if (res.success) {-->
+<!--          this.dataSource = res.result.records;-->
+<!--          this.ipagination.total = res.result.total;-->
+<!--        }-->
+<!--        if(res.code===510){-->
+<!--          this.$message.warning(res.message)-->
+<!--        }-->
+<!--        this.loading = false;-->
+<!--      })-->
+<!--    },-->
+<!--    getSuperFieldList() {-->
+<!--      let fieldList = [];-->
+<!--      fieldList.push({type: 'string', value: 'name', text: '工具名称'})-->
+<!--      fieldList.push({type: 'string', value: 'nums', text: '工具编号'})-->
+<!--      fieldList.push({type: 'string', value: 'function', text: '功能'})-->
+<!--      fieldList.push({type: 'string', value: 'specs', text: '规格'})-->
+<!--      fieldList.push({type: 'string', value: 'scope', text: '适用范围'})-->
+<!--      fieldList.push({type: 'string', value: 'workshopSection', text: '责人工段'})-->
+<!--      fieldList.push({type: 'string', value: 'status', text: '状态 ( 0 在库、1   在用、2   遗失 、3   损坏、4   报废)'})-->
+<!--      fieldList.push({type: 'string', value: 'qrode', text: '二维码'})-->
+<!--      this.superFieldList = fieldList-->
+<!--    }-->
+<!--  }-->
+<!--}-->
+<!--</script>-->
+<!--<style scoped>-->
+<!--@import '~@assets/less/common.less';-->
+<!--</style>-->
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
index 2ce52a4b..455a13e8 100644
--- a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
+++ b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
@@ -60,6 +60,7 @@ export default {
   },
   data() {
     return {
+      // biaoTi: '',
       description: '班组成员表管理管理页面',
       // 表头
       columns: [
@@ -89,7 +90,7 @@ export default {
           dataIndex: 'workNo'
         },
         {
-          title: '成员名称',
+          title: '成员姓名',
           align: "center",
           dataIndex: 'userId'
         },
@@ -144,8 +145,8 @@ export default {
         this.groupxId = this.$route.query.groupxId;
         this.groupName = this.$route.query.groupName;
         this.departName = this.$route.query.departName;
-        // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
-        console.log("*******departName:" + this.departName)
+        // this.biaoTi = this.departName + "车间" + "工位管理";
+        // console.log("*******departName:" + this.departName)
         this.loadRouteType = true;
       }
     },
diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index e2b50faa..0946155e 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -116,9 +116,9 @@
             <a>删除</a>
           </a-popconfirm>
            <a-divider type="vertical"/>
-                    <a @click="up(record.id)">升序</a>
+                    <a @click="up(record.id)">前移</a>
            <a-divider type="vertical"/>
-           <a @click="down(record.id)">降序</a>
+           <a @click="down(record.id)">后移</a>
         </span>
       </a-table>
     </div>
@@ -244,6 +244,7 @@ export default {
           'stationId': record.id,
           'stationName': record.stationName,
           'stationNum': record.stationNum,
+          'departName': record.departName,
         },
       });
     },
@@ -254,6 +255,7 @@ export default {
           'stationId': record.id,
           'stationName': record.stationName,
           'stationNum': record.stationNum,
+          'departName': record.departName,
         },
       });
     },
diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
index ed14de28..c2e9d88b 100644
--- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
@@ -1,56 +1,11 @@
 <template>
   <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.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>-->
-
+    <p style="font-size: 30px;color:#333; padding-left: 40% ">{{ biaoTi }}</p>
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button @click="zyStyleFabricHandleAdd(stationId)" 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-button type="primary" @click="fanHui()">返回</a-button>
     </div>
 
@@ -175,6 +130,8 @@ export default {
       stationId: "",
       stationName: "",
       stationNum: "",
+      departName: "",
+      biaoTi:"",
       dictOptions: {},
       // superFieldList: [],
     }
@@ -205,8 +162,8 @@ export default {
         this.stationId = this.$route.query.stationId;
         this.stationName = this.$route.query.stationName;
         this.stationNum = this.$route.query.stationNum;
-        // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
-        // console.log("*******传递的stationId:" + this.stationId)
+        this.departName = this.$route.query.departName;
+        this.biaoTi = this.departName + this.stationName + "设备管理";
         this.loadRouteType = true;
       }
     },
diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
index ef038d48..0793aaae 100644
--- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
@@ -1,43 +1,12 @@
 <template>
   <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>-->
+    <p style="font-size: 30px;color:#333; padding-left: 40% ">{{ biaoTi }}</p>
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>
-<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <!--      <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-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -78,17 +47,6 @@
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
           </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>
@@ -116,6 +74,7 @@ export default {
   },
   data() {
     return {
+      biaoTi: '',
       description: '工位工具管理页面',
       // 表头
       columns: [
@@ -147,7 +106,7 @@ export default {
         {
           title: '工具编码',
           align: "center",
-          dataIndex: 'nums'
+          dataIndex: 'code'
         },
         {
           title: '工具名称',
@@ -173,6 +132,7 @@ export default {
       stationId: "",
       stationName: "",
       stationNum: "",
+      departName: "",
       dictOptions: {},
       // superFieldList: [],
     }
@@ -203,7 +163,8 @@ export default {
         this.stationId = this.$route.query.stationId;
         this.stationName = this.$route.query.stationName;
         this.stationNum = this.$route.query.stationNum;
-        // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
+        this.departName = this.$route.query.departName;
+        this.biaoTi = this.departName + this.stationName + "工位管理";
         // console.log("*******传递的stationId:" + this.stationId)
         this.loadRouteType = true;
       }
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 4c326423..e06a79b4 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
@@ -23,7 +23,7 @@
 <script>
 import {httpAction} from '@/api/manage'
 import moment from "moment"
-import ZyToolListRef from "@views/erp/tool/ZyToolListRef"
+import ZyToolListRef from "@views/tool/tool/ZyToolListRef"
 
 export default {
   name: "StationToolModal",
diff --git a/ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue b/ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue
new file mode 100644
index 00000000..5012fc02
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue
@@ -0,0 +1,137 @@
+<template>
+  <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-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+              <a-input v-model="queryParam.code" placeholder="请输入编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="queryParam.name" placeholder="请输入名称"></a-input>
+            </a-form-model-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>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+      </a-table>
+    </div>
+
+    <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ZyToolModal from './modules/ZyToolModal'
+
+  export default {
+    name: 'ZyToolList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ZyToolModal
+    },
+    data () {
+      return {
+        description: '工具表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'工具编号',
+            align:"center",
+            dataIndex: 'code'
+          },
+          {
+            title:'工具名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+        ],
+        url: {
+          list: "/zytool/zyTool/list",
+          delete: "/zytool/zyTool/delete",
+          deleteBatch: "/zytool/zyTool/deleteBatch",
+          exportXlsUrl: "/zytool/zyTool/exportXls",
+          importExcelUrl: "zytool/zyTool/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'typeCode',text:'类型编号',dictCode:''})
+        fieldList.push({type:'string',value:'brandId',text:'工具品牌',dictCode:''})
+        fieldList.push({type:'string',value:'modelId',text:'工具型号',dictCode:''})
+        fieldList.push({type:'string',value:'code',text:'工具编号',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'工具名称',dictCode:''})
+        fieldList.push({type:'date',value:'buydate',text:'购买时间'})
+        fieldList.push({type:'sel_user',value:'agent',text:'经办人'})
+        fieldList.push({type:'string',value:'status',text:'工具状态',dictCode:''})
+        fieldList.push({type:'string',value:'qrcode',text:'二维码',dictCode:''})
+        fieldList.push({type:'date',value:'maintenancecycle',text:'维护周期'})
+        fieldList.push({type:'sel_user',value:'administrator',text:'管理人'})
+        fieldList.push({type:'date',value:'maintenancedate',text:'上次维护时间'})
+        fieldList.push({type:'string',value:'img',text:'工具图片',dictCode:''})
+        fieldList.push({type:'string',value:'img3d',text:'3d模型',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
index 55001e9e..8b82e6ba 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
@@ -76,7 +76,7 @@ public class StationToolController extends JeecgController<StationTool, IStation
         if (!ObjectUtils.isEmpty(records)) {
             records.forEach(e -> {
                 ZyTool zyTool = iZyToolService.getById(e.getToolsId());
-//                e.setNums(StringUtils.isNotBlank(zyTool.getNums()) ? zyTool.getNums() : "");
+                e.setCode(StringUtils.isNotBlank(zyTool.getCode()) ? zyTool.getCode() : "");
             });
         }
         return Result.OK(pageList);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
index 32f68688..6ae5861c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
@@ -51,7 +51,7 @@ public class StationTool {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "工具编码")
-    private String nums;
+    private String code;
     /**
      * 创建日期
      */
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
index ec60d37c..39103f1a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
@@ -40,7 +40,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
     }
 
     @Override
-    public void up(String id) {
+    public void down(String id) {
         Station entity = this.getById(id);
         if (ObjectUtils.isEmpty(entity)) {
             throw new JeecgBootException(id + "不存在");
@@ -52,7 +52,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
     }
 
     @Override
-    public void down(String id) {
+    public void up(String id) {
         Station entity = this.getById(id);
         if (ObjectUtils.isEmpty(entity)) {
             throw new JeecgBootException(id + "不存在");