cuijian
2025-05-28 7e2d31c20b816309cb222c2159c3875623f74385
工具入库功能
已重命名5个文件
已添加3个文件
已修改4个文件
已复制1个文件
1032 ■■■■■ 文件已修改
src/views/tms/InboundList.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/InboundOrderList.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/BaseToolsListRight.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inbound/InboundListLeft.vue 323 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inbound/InboundListRight.vue 515 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inbound/InboundModel.vue 87 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/InboundDetailList.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/InboundOrderModel.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/InboundList.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
<template>
  <a-row
    type="flex"
    :gutter="16"
  >
    <a-col
      :md="5"
      :sm="24"
    >
      <inbound-list-left />
    </a-col>
    <a-col
      :md="24-5"
      :sm="24"
    >
      <inbound-list-right />
    </a-col>
  </a-row>
</template>
<script>
import InboundListLeft from './modules/inbound/InboundListLeft'
import InboundListRight from './modules/inbound/InboundListRight'
export default {
  name: 'InboundList',
  components: { InboundListLeft, InboundListRight },
  data() {
    return {
      description: '工具入库',
      currentOrgCode: ''
    }
  },
  methods: {}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>
src/views/tms/InboundOrderList.vue
@@ -72,8 +72,8 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import InboundOrderModel from './modules/inbound/InboundOrderModel'
import InboundDetailList from './modules/inbound/InboundDetailList'
import InboundOrderModel from './modules/inboundOrder/InboundOrderModel'
import InboundDetailList from './modules/inboundOrder/InboundDetailList'
import { requestPut } from '@/api/manage'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
@@ -93,10 +93,8 @@
      description: '入库申请单',
      url: {
        list: '/tms/inboundOrder/list',
        toolingStorageStatus: '/tooling/storage/toolingStorageStatus',
        importExcelUrl: 'tooling/storage/importExcel',
        exportXlsUrl: '/tooling/storage/exportXls',
        takeBack: '/tooling/storage/takeBack',
        importExcelUrl: '/tms/inboundOrder/importExcel',
        exportXlsUrl: '/tms/inboundOrder/exportXls',
        edit:'/tms/inboundOrder/edit',
        submit:'/tms/inboundOrder/submit'
      },
src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -54,10 +54,10 @@
      >
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">新增</a-button>
      </Tooltip>
      <a-button type="primary" icon="download" @click="handleExportXls('tms_tools_classify')">导出</a-button>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('tms_tools_classify')">导出</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> -->
    </div>
    <!-- table区域-begin -->
@@ -75,6 +75,7 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
        class="j-table-force-nowrap"
        :customRow="customRow"
        @change="handleTableChange">
        <template slot="htmlSlot" slot-scope="text">
@@ -200,6 +201,18 @@
    data () {
      return {
        description: '工具信息管理页面',
        /* åˆ†é¡µå‚æ•° */
      ipagination:{
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " å…±" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
        // è¡¨å¤´
        columns: [
          {
@@ -520,8 +533,10 @@
          .then((res) => {
            if (res.success) {
              this.dataSource = res.result.records; // æ›´æ–°è¡¨æ ¼æ•°æ®
              this.ipagination.total = res.result.total
            } else {
              this.$message.warning("请选择叶子节点进行查询");
              this.ipagination.total = 0
            }
          })
          .finally(() => {
@@ -552,7 +567,16 @@
        this.$refs.paraTurningToolsList.visable = false
        this.$refs.paraBladeList.visable = false
        this.$refs.toolsConfigPropertyList.visable = false
      }
      },
      customRow(record) {
        return {
          on: {
            click: () => {
              this.onSelectChange(record.id.split(","), [record]);
            }
          }
        }
      },
      
    },
  }
src/views/tms/modules/inbound/InboundListLeft.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,323 @@
<template>
  <a-card
    :loading="cardLoading"
    :bordered="false"
    title="工具分类"
    style="height: 100%;"
  >
    <a-spin :spinning="loading">
      <a-alert
        type="info"
        :showIcon="true"
        style="margin-right: 54px;"
      >
        <div slot="message">
          å½“前:<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
          <a
            v-if="this.currSelected.title"
            style="margin-left: 10px"
            @click="onClearSelected"
          >取消</a>
        </div>
      </a-alert>
      <!-- <div class="drawer-bootom-button">
        <a-dropdown
          :trigger="['click']"
          placement="bottomCenter"
        >
          <a-menu slot="overlay">
            <a-menu-item
              key="1"
              @click="expandAll"
            >展开所有</a-menu-item>
            <a-menu-item
              key="2"
              @click="closeAll"
            >合并所有</a-menu-item>
            <a-menu-item
              key="3"
              @click="refreshTree"
            >刷新</a-menu-item>
          </a-menu>
          <a-button>
            <a-icon type="bars" />
          </a-button>
        </a-dropdown>
      </div> -->
      <a-input-search
        @search="handleSearch"
        style="width:100%;margin-top: 10px"
        placeholder="检索工具分类"
        allowClear
        v-model="searchInput"
        @change="handleChange"
      />
      <!-- showLine -->
      <a-tree
        :checkStrictly="checkStrictly"
        :selectedKeys="selectedKeys"
        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
        :treeData="treeDataSource"
        :defaultExpandAll="true"
        @select="onSelect"
        @expand="onExpand"
      >
        <template
          slot="title"
          slot-scope="{title, type, rfield1}"
        >
          <Tooltip
            placement="top"
            title="工具分类"
          >
            <i
              v-if="type == 0"
              class="action-jeecg actioncompany2"
              style="font-size: 18px;"
            />
          </Tooltip>
          <span v-if="title.indexOf(searchValue) > -1">
            {{ title.substr(0, title.indexOf(searchValue)) }}
            <span class="replaceSearch">{{ searchValue }}</span>
            {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
          </span>
          <span v-else>{{ title }}</span>
        </template>
      </a-tree>
    </a-spin>
  </a-card>
</template>
<script>
import { getAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
export default {
  name: 'inboundListLeft',
  components: {
    Tooltip,
  },
  props: ['value'],
  data() {
    return {
      searchInput: '',
      cardLoading: false,
      loading: false,
      treeDataSource: [],
      selectedKeys: [],
      expandedKeys: [],
      url: {
        factoryTreeList: '/tms/toolsClassify/loadTree',
      },
      searchValue: '',
      dataList: [],
      autoExpandParent: true,
      checkStrictly: true,
      allTreeKeys: [],
      currSelected: {},
      hiding: false,
    }
  },
  created() {
    this.queryTreeData();
    this.closeAll();
  },
  methods: {
    getCurrSelectedTitle() {
      return !this.currSelected.title ? '' : this.currSelected.title;
    },
    onClearSelected() {
      this.hiding = true;
      this.currSelected = {};
      this.selectedKeys = [];
    },
    onSelect(selectedKeys, e) {
      this.hiding = false;
      let record = e.node.dataRef;
      this.currSelected = Object.assign({}, record);
      this.selectedKeys = [record.key];
    },
    onExpand(expandedKeys) {
      this.expandedKeys = expandedKeys;
      this.autoExpandParent = false;
    },
    queryTreeData() {
      this.loading = true;
      this.cardLoading = true;
      getAction(this.url.factoryTreeList).then((res) => {
        if (res.success) {
          this.dataList = [];
          this.allTreeKeys = [];
          this.treeDataSource = res.result;
          this.generateList(res.result);
        } else {
          this.$message.warn(res.message);
        }
      }).finally(() => {
        this.loading = false;
        this.cardLoading = false;
      })
    },
    handleChange() {
      let search = this.searchInput;
      let expandedKeys = this.dataList
        .map(item => {
          if (item.title.indexOf(search) > -1) {
            return this.getParentKey(item.key, this.treeDataSource);
          }
          return null;
        })
        .filter((item, i, self) => item && self.indexOf(item) === i);
      Object.assign(this, {
        expandedKeys,
        searchValue: search,
        autoExpandParent: true,
      });
    },
    handleSearch(value) {
      let search = value;
      let expandedKeys = this.dataList
        .map(item => {
          if (item.title.indexOf(search) > -1) {
            return this.getParentKey(item.key, this.treeDataSource);
          }
          return null;
        })
        .filter((item, i, self) => item && self.indexOf(item) === i);
      Object.assign(this, {
        expandedKeys,
        searchValue: search,
        autoExpandParent: true,
      });
    },
    getParentKey(key, tree) {
      let parentKey;
      for (let i = 0; i < tree.length; i++) {
        const node = tree[i];
        if (node.children) {
          if (node.children.some(item => item.key === key)) {
            parentKey = node.key;
          } else if (
            this.getParentKey(key, node.children)) {
            parentKey = this.getParentKey(key, node.children);
          }
        }
      }
      return parentKey;
    },
    generateList(data) {
      for (let i = 0; i < data.length; i++) {
        const node = data[i];
        const key = node.key;
        const title = node.title;
        this.dataList.push({ key, title: title });
        this.allTreeKeys.push(key);
        if (node.children) {
          this.generateList(node.children);
        }
      }
    },
    expandAll() {
      this.expandedKeys = this.allTreeKeys;
    },
    closeAll() {
      this.expandedKeys = this.allSiteIds;
    },
    refreshTree() {
      this.queryTreeData();
    }
  },
  mounted() {
    this.$bus.$on('queryTreeData', this.queryTreeData);
  },
  //监听
  watch: {
    currSelected(val) {//监听currSelected å˜åŒ–,将变化后的数值传递给 getCurrSelected äº‹ä»¶
      this.$bus.$emit('getCurrSelected', val)
    },
  }
}
</script>
<style scoped>
.replaceSearch {
  color: #40a9ff;
  font-weight: bold;
  background-color: rgb(204, 204, 204);
}
/*隐藏树的默认icon*/
.ant-tree-switcher-noop {
  display: none !important;
}
/*隐藏树的默认竖线*/
.ant-tree.ant-tree-show-line li:not(:last-child):before {
  border-left: 0px;
}
.ant-card-body .table-operator {
  margin: 15px;
}
.anty-form-btn {
  width: 100%;
  text-align: center;
}
.anty-form-btn button {
  margin: 0 5px;
}
.anty-node-layout .ant-layout-header {
  padding-right: 0;
}
.header {
  padding: 0 8px;
}
.header button {
  margin: 0 3px;
}
.ant-modal-cust-warp {
  height: 100%;
}
.ant-modal-cust-warp .ant-modal-body {
  height: calc(100% - 110px) !important;
  overflow-y: auto;
}
.ant-modal-cust-warp .ant-modal-content {
  height: 90% !important;
  overflow-y: hidden;
}
#app .desktop {
  height: auto !important;
}
/** Button按钮间距 */
.ant-btn {
  margin-left: 3px;
}
.ant-alert {
  padding: 5px 15px 5px 37px;
}
.drawer-bootom-button {
  position: absolute;
  top: 1px;
  /* padding: 10px 16px; */
  text-align: left;
  right: 0;
  background: #fff;
  border-radius: 0 0 2px 2px;
}
</style>
src/views/tms/modules/inbound/InboundListRight.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,515 @@
<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
            :md="6"
            :sm="8"
          >
            <a-form-item
              label="工具编号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <a-input
                placeholder="请输入工具编号检索"
                v-model="queryParam.toolCode"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item
              label="型号/图号"
              :labelCol="{span: 5}"
              :wrapperCol="{span: 18, offset: 1}"
            >
              <a-input
                placeholder="请输入型号/图号检索"
                v-model="queryParam.toolModel"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :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 -->
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
       <Tooltip
        placement="top"
        title="选择叶子节点后再执行新增"
      >
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">新增</a-button>
      </Tooltip>
      <!-- <a-button type="primary" icon="download" @click="handleExportXls('tms_tools_classify')">导出</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-button @click="handleInbound(nodeSelected)" type="primary" icon="plus">申请单入库</a-button>
    </div>
    <!-- table区域-begin -->
    <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,type:'radio'}"
        class="j-table-force-nowrap"
        @change="handleTableChange">
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" 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>
        <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 @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>
      </a-table>
    </div>
     <a-tabs defaultActiveKey="1">
      <a-tab-pane key="1">
        <span slot="tab">
          <a-badge>参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <para-hole-tools-list ref="paraHoleToolsList"></para-hole-tools-list>
        <para-threading-tool-list ref="paraThreadingToolList"></para-threading-tool-list>
        <para-mill-tool-list ref="paraMillToolList"></para-mill-tool-list>
        <para-turning-tools-list ref="paraTurningToolsList"></para-turning-tools-list>
        <para-blade-list ref="paraBladeList"></para-blade-list>
        <para-common-tool-list ref="paraCommonToolList"></para-common-tool-list>
      </a-tab-pane>
      <a-tab-pane
        key="2"
        forceRender
      >
        <span slot="tab">
          <a-badge>管理参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tools-config-property-list ref="toolsConfigPropertyList"></tools-config-property-list>
      </a-tab-pane>
    </a-tabs>
    <inbound-model ref="modalForm" @ok="modalFormOk" :nodeSelected="nodeSelected"></inbound-model>
  </a-card>
</template>
<script>
  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { getAction, postAction, deleteAction, requestPut } from '@api/manage'
  import ParaHoleToolsList from '.././baseTools/ParaHoleToolsList'
  import ToolsConfigPropertyList from '.././baseTools/ToolsConfigPropertyList'
  import ParaMillToolList from '.././baseTools/ParaMillToolList'
  import ParaThreadingToolList from '.././baseTools/ParaThreadingToolList'
  import ParaTurningToolsList from '.././baseTools/ParaTurningToolsList'
  import ParaCommonToolList from '.././baseTools/ParaCommonToolList'
  import ParaBladeList from '.././baseTools/ParaBladeList'
  import InboundModel from './InboundModel'
  export default {
    name: 'InboundListRight',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      Tooltip,
      ParaHoleToolsList,
      ToolsConfigPropertyList,
      ParaMillToolList,
      ParaThreadingToolList,
      ParaTurningToolsList,
      ParaCommonToolList,
      ParaBladeList,
      InboundModel
    },
    data () {
      return {
        description: '工具入库管理页面',
        /* åˆ†é¡µå‚æ•° */
      ipagination:{
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " å…±" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'工具编码',
            align:"center",
            dataIndex: 'toolCode'
          },
          {
            title:'入库类型',
            align:"center",
            dataIndex: 'inStorehouseType'
          },
          {
            title:'型号/图号',
            align:"center",
            dataIndex: 'toolModel'
          },
          {
            title:'中文名称',
            align:"center",
            dataIndex: 'chineseName'
          },
          {
            title:'入库数量',
            align:"center",
            dataIndex: 'inStorageQuantity'
          },
          // {
          //   title:'备注',
          //   align:"center",
          //   dataIndex: 'remark'
          // },
          {
            title:'创建人',
            align:"center",
            dataIndex: 'createBy'
          },
          {
            title:'创建时间',
            align:"center",
            dataIndex: 'createTime',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            }
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/tms/inboundDetail/list",
          paraHolesToolsList:"/tms/baseTools/paraHolesToolsList",
          paraCommonToolList:"/tms/baseTools/paraCommonToolList",
          paraThreadingToolList:"/tms/baseTools/paraThreadingToolList",
          paraMillToolList:"/tms/baseTools/paraMillToolList",
          paraTurningToolsList:"/tms/baseTools/paraTurningToolsList",
          paraBladeList:"/tms/baseTools/paraBladeList",
          delete: "/tms/baseTools/delete",
          deleteBatch: "/tms/baseTools/deleteBatch",
          edit: '/tms/baseTools/edit',
          exportXlsUrl: "/tms/baseTools/exportXls",
          importExcelUrl: "tms/baseTools/importExcel",
          queryParaByToolCode:"/tms/baseTools/queryByToolCode",
          queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode"
        },
        dictOptions:{},
        superFieldList:[],
        nodeSelected: {}, // å½“前选中的节点数据
        paraTypeFlag:'',
        disableMixinCreated:true
      }
    },
    created() {
      this.$bus.$on('getCurrSelected', (data) => {
      //getCurrSelected äº‹ä»¶ æŽ¥æ”¶ç»„件传递的参数
      this.nodeType = (data.type == undefined ? 0 : data.type);
      this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
      this.nodeSelected = data;
      this.loadData()
      this.clearPara()
    })
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {
      handleAdd(entity) {
        if (!this.nodeSelected ) {
          this.$message.warning('请先选择一个工具分类');
          return;
        }
        // æ‰“开新增模态框,并传递当前选中的节点
          this.$refs.modalForm.add(this.nodeSelected);
          this.$refs.modalForm.title = "新增通用参数类型工具";
          this.$refs.modalForm.disableSubmit = false;
      },
      handleDelete(id) {
        deleteAction(this.url.delete, {id: id}).then((res) => {
                if (res.success) {
                  //重新计算分页问题
                  this.loadData()
                  this.$message.success(res.message);
                  this.$bus.$emit('queryTreeData')
                  this.clearPara()
                } else {
                  this.$message.warning(res.message);
                }
              });
      },
      modalFormOk() {
        this.loadData(); // åˆ·æ–°è¡¨æ ¼æ•°æ®
        this.$bus.$emit('queryTreeData') //刷新左侧树
      },
      onSelectChange(selectedRowKeys) {
        this.selectedRowKeys = selectedRowKeys;
        //通过id查询管理参数和参数数据
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
          if (res.success) {
            if(this.paraTypeFlag === "1"){
              this.$refs.paraCommonToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "2"){
              this.$refs.paraHoleToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "3"){
              this.$refs.paraThreadingToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "4"){
              this.$refs.paraMillToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "5"){
              this.$refs.paraTurningToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "6"){
              this.$refs.paraBladeList.getPara(res.result);
            }
          } else {
            this.$message.warning(res.message);
          }
        })
        getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
          if (res.success) {
            this.$refs.toolsConfigPropertyList.getPara(res.result);
          } else {
            this.$message.warning(res.message);
          }
        })
      },
      // å¤„理编辑按钮点击事件
      handleEditSelected() {
        if (this.selectedRowKeys.length === 0) {
          this.$message.warning('请选择一条记录进行编辑');
          return;
        }
        const selectedRecord = this.dataSource.find(item => item.id === this.selectedRowKeys[0]);
        if (selectedRecord) {
          this.handleEdit(selectedRecord);
        }
      },
      //编辑
      handleEdit(record) {
        if(record.paramaTableName === "1"){
              this.$refs.paraCommonToolModal.edit(record);
              this.$refs.paraCommonToolModal.title = "编辑";
              this.$refs.paraCommonToolModal.disableSubmit = false;
            }else if(record.paramaTableName === "2"){
              this.$refs.paraHoleToolsModal.edit(record);
              this.$refs.paraHoleToolsModal.title = "编辑";
              this.$refs.paraHoleToolsModal.disableSubmit = false;
            }else if(record.paramaTableName === "3"){
              this.$refs.paraThreadingToolModal.edit(record);
              this.$refs.paraThreadingToolModal.title = "编辑";
              this.$refs.paraThreadingToolModal.disableSubmit = false;
            }else if(record.paramaTableName === "4"){
              this.$refs.paraMillToolModal.edit(record);
              this.$refs.paraMillToolModal.title = "编辑";
              this.$refs.paraMillToolModal.disableSubmit = false;
            }else if(record.paramaTableName === "5"){
              this.$refs.paraTurningToolsModal.edit(record);
              this.$refs.paraTurningToolsModal.title = "编辑";
              this.$refs.paraTurningToolsModal.disableSubmit = false;
            }else if(record.paramaTableName === "6"){
              this.$refs.paraBladeModal.edit(record);
              this.$refs.paraBladeModal.title = "编辑";
              this.$refs.paraBladeModal.disableSubmit = false;
            }
      },
      //详情
      handleDetail:function(record){
        if(record.paramaTableName === "1"){
              this.$refs.paraCommonToolModal.edit(record);
              this.$refs.paraCommonToolModal.title="详情";
              this.$refs.paraCommonToolModal.disableSubmit = true;
              this.$refs.paraCommonToolModal.disSeach = true;
              if(this.$refs.paraCommonToolModal.removeValidate) {
                this.$refs.paraCommonToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "2"){
              this.$refs.paraHoleToolsModal.edit(record);
              this.$refs.paraHoleToolsModal.title="详情";
              this.$refs.paraHoleToolsModal.disableSubmit = true;
              this.$refs.paraHoleToolsModal.disSeach = true;
              if(this.$refs.paraHoleToolsModal.removeValidate) {
                this.$refs.paraHoleToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "3"){
               this.$refs.paraThreadingToolModal.edit(record);
              this.$refs.paraThreadingToolModal.title="详情";
              this.$refs.paraThreadingToolModal.disableSubmit = true;
              this.$refs.paraThreadingToolModal.disSeach = true;
              if(this.$refs.paraThreadingToolModal.removeValidate) {
                this.$refs.paraThreadingToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "4"){
               this.$refs.paraMillToolModal.edit(record);
              this.$refs.paraMillToolModal.title="详情";
              this.$refs.paraMillToolModal.disableSubmit = true;
              this.$refs.paraMillToolModal.disSeach = true;
              if(this.$refs.paraMillToolModal.removeValidate) {
                this.$refs.paraMillToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "5"){
               this.$refs.paraTurningToolsModal.edit(record);
              this.$refs.paraTurningToolsModal.title="详情";
              this.$refs.paraTurningToolsModal.disableSubmit = true;
              this.$refs.paraTurningToolsModal.disSeach = true;
              if(this.$refs.paraTurningToolsModal.removeValidate) {
                this.$refs.paraTurningToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "6"){
               this.$refs.paraBladeModal.edit(record);
              this.$refs.paraBladeModal.title="详情";
              this.$refs.paraBladeModal.disableSubmit = true;
              this.$refs.paraBladeModal.disSeach = true;
              if(this.$refs.paraBladeModal.removeValidate) {
                this.$refs.paraBladeModal.removeValidate()
              }
            }
    },
      //禁用状态样式
      tableRowClass(record, index) {
        if (record.status != "1") {
          return "frozenRowClass";
        }
        return "";
      },
      loadData() {
        let params = this.getQueryParams();
        if (this.nodeSelected && this.nodeSelected.key !== '-1') {
          // åŠ è½½é€‰ä¸­èŠ‚ç‚¹çš„å­ç±»
          params.classifyId = this.nodeSelected.key;
          this.loading = true;
        getAction(this.url.list, params)
          .then((res) => {
            if (res.success) {
              this.dataSource = res.result.records; // æ›´æ–°è¡¨æ ¼æ•°æ®
              this.ipagination.total = res.result.total
            } else {
              this.$message.warning("请选择叶子节点进行查询");
              this.ipagination.total = 0
            }
          })
          .finally(() => {
            this.loading = false;
          });
        } else {
          this.$message.warning("请选择叶子节点进行查询");
        }
      },
      onClearSelected() {
        this.selectedKeys = [];
        this.nodeSelected = {}; // æ¸…空选中的节点
        this.dataSource = []; // æ¸…空表格数据
      },
      //重置
      searchReset() {
        this.queryParam = {}
        this.loadData(1);
        this.clearPara()
      },
      //清空选中及参数
      clearPara(){
        this.selectedRowKeys = []
        this.$refs.paraCommonToolList.visable = false
        this.$refs.paraHoleToolsList.visable = false
        this.$refs.paraThreadingToolList.visable = false
        this.$refs.paraMillToolList.visable = false
        this.$refs.paraTurningToolsList.visable = false
        this.$refs.paraBladeList.visable = false
        this.$refs.toolsConfigPropertyList.visable = false
      }
    },
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
   .enable {
    color: green;
  }
  .disable {
    color: red;
  }
</style>
src/views/tms/modules/inbound/InboundModel.vue
copy from src/views/tms/modules/inbound/InboundOrderModel.vue copy to src/views/tms/modules/inbound/InboundModel.vue
Îļþ´Ó src/views/tms/modules/inbound/InboundOrderModel.vue ¸´ÖÆ
@@ -11,11 +11,6 @@
      <a-form :form="form">
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="入库申请单编号">
              <a-input :disabled="true" placeholder="系统自动生成" v-decorator="['inboundNum', validatorRules.inboundNum]" />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="入库类型">
              <j-dict-select-tag
                :disabled="disableSubmit"
@@ -28,9 +23,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
           <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="入库时间">
              <a-date-picker
                @change="onChange"
@@ -40,73 +33,15 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="申请原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入申请原因"  :disabled="disableSubmit" v-decorator="['applicationReason', validatorRules.applicationReason]" />
            <a-form-item label="入库数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入入库数量"  :disabled="disableSubmit" v-decorator="['in_number', validatorRules.applicationReason]" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="true"
                v-if="!barcodeCurrentType"
                placeholder="请选择经手人"
                v-decorator="['handler', { rules: [{ required: false, message: '请选择经手人' }] }]"
                dict="sys_user,realname,id,del_flag=0"
                @change="selectCurrentUserChange"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item label="审核人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="true"
                placeholder="请选择审核人"
                v-decorator="['reviewer', validatorRules.reviewer]"
                dict="sys_user,realname,id,del_flag=0"
                @change="selectCurrentUserChange"
              />
            </a-form-item>
          </a-col>
        </a-row>
         <a-row style="width: 100%">
           <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="审核时间">
              <a-date-picker
                @change="onChange"
                :disabled="true"
                style="width: 100%"
                v-decorator="['approvalDate', validatorRules.approvalDate]"
              />
            </a-form-item>
          </a-col>
           <a-col :span="24 / 2">
            <a-form-item label="审核意见" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入审核意见" :disabled="true" v-decorator="['approvalOpinion', validatorRules.approvalOpinion]" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24">
            <a-form-item :labelCol="{ span: 3 }" :wrapperCol="{ span: 21 }" label="备注">
              <a-textarea
                :disabled="disableSubmit"
                :rows="2"
                placeholder="..."
                v-decorator="['remark', validatorRules.remark]"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
@@ -121,7 +56,7 @@
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
       @change="handleTableChange"
      @change="handleTableChange"
    >
      <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div :key="col.dataIndex">
@@ -142,7 +77,7 @@
    </a-table>
    <template slot="footer" v-if="disableSubmit == false">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
      <a-button @click="handleOk" :disabled="isDisabled" type="primary">确定</a-button>
      <a-button @click="handleOk" :disabled="isDisabled" type="primary">入库</a-button>
    </template>
    <template slot="footer" v-if="disableSubmit == true">
@@ -156,7 +91,7 @@
<script>
import pick from 'lodash.pick'
import JSelectToolingModal from './JSelectToolingModal'
import JSelectToolingModal from '.././inboundOrder/JSelectToolingModal'
import { ajaxGetDictItems } from '@/api/api'
import moment from 'moment'
import { getAction, postAction, requestPut } from '@/api/manage'
@@ -164,8 +99,8 @@
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
import { filterObj } from '@/utils/util'
import JSelectReturnListModal from './JSelectReturnListModal'
import JSelectSharpenListModal from './JSelectSharpenListModal'
import JSelectReturnListModal from '.././inboundOrder/JSelectReturnListModal'
import JSelectSharpenListModal from '.././inboundOrder/JSelectSharpenListModal'
export default {
  name: 'InboundOrderModel',
src/views/tms/modules/inboundOrder/InboundDetailList.vue
src/views/tms/modules/inboundOrder/InboundOrderModel.vue
ÎļþÃû´Ó src/views/tms/modules/inbound/InboundOrderModel.vue ÐÞ¸Ä
@@ -109,9 +109,9 @@
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="toolingShow && !disableSubmit">选择工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="sharpenShow && !disableSubmit">选择刃磨出库单</a-button>
    <a-table
      ref="table"
      bordered
@@ -265,9 +265,9 @@
        edit: '/tms/inboundOrder/edit',
        queryByUserName: '/sys/user/queryByUserName',
        toolingList:'/tms/baseTools/list',
        queryAccountList:'/tooling/storage/queryAccountList',
        querySharpenList:'/sharpen/sharpenDetail/querySharpenList',
        queryReturnList:'/returnInventory/queryReturnList',
        queryAccountList:'/tms/baseTools/list',
        querySharpenList:'/tms/baseTools/list',
        queryReturnList:'/tms/baseTools/list',
        detailList:'/tms/inboundDetail/list',
      },
      toolingOptions:[],
src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
ÎļþÃû´Ó src/views/tms/modules/inbound/JSelectReturnListModal.vue ÐÞ¸Ä
@@ -144,7 +144,7 @@
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/returnInventory/queryReturnList',
         list: '/tms/baseTools/list',
         queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
      },
    }
src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
@@ -108,7 +108,7 @@
        leafFlagShow:true,
         validatorRules: {
           classifyId: [
              { required: true, message: '请输入工具分类编号!'},
              { required: false, message: '请输入工具分类编号!'},
              { validator: this.validateNum },
           ],
           typeName: [
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
@@ -167,6 +167,18 @@
    data () {
      return {
        description: '工具分类管理页面',
         /* åˆ†é¡µå‚æ•° */
      ipagination:{
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " å…±" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
        // è¡¨å¤´
        columns: [
          {
@@ -366,8 +378,10 @@
          .then((res) => {
            if (res.success) {
              this.dataSource = res.result.records; // æ›´æ–°è¡¨æ ¼æ•°æ®
              this.ipagination.total = res.result.total
            } else {
              this.$message.warning(res.message);
              this.ipagination.total = 0
            }
          })
          .finally(() => {