Merge remote-tracking branch 'origin/master'

lyh

2025-06-05 bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f

 src/views/tms/modules/outBound/OutboundListRight.vue

@@ -55,10 +55,10 @@
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">新增</a-button>
      </Tooltip>
      <a-button type="primary" @click="selectOutboundOrder">申请单出库</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-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>-->
    </div>

    <!-- table区域-begin -->
@@ -210,7 +210,7 @@
          {
            title:'工具类型',
            align:"center",
            dataIndex: 'signCode'
            dataIndex: 'applicationType'
          },
          {
            title:'中文名称',
@@ -236,6 +236,11 @@
            title:'出库类型',
            align:"center",
            dataIndex: 'outStorehouseType_dictText'
          },
          {
            title:'出库方式',
            align:"center",
            dataIndex: 'operateType'
          },
          {
            title:'库位号',
@@ -277,7 +282,7 @@
          delete: "/tms/baseTools/delete",
          deleteBatch: "/tms/baseTools/deleteBatch",
          edit: '/tms/baseTools/edit',
          exportXlsUrl: "/tms/baseTools/exportXls",
          exportXlsUrl: "/tms/outStoreDetail/exportXls",
          importExcelUrl: "tms/baseTools/importExcel",
          queryParaByToolCode:"/tms/baseTools/queryByToolCode",
          queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode"