Merge remote-tracking branch 'origin/master'

lyh

2025-06-05 bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f

 src/views/tms/modules/inbound/InboundListRight.vue

@@ -58,7 +58,7 @@
      <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>
      <a-button @click="handleInbound" type="primary">申请单入库</a-button>
    </div>

    <!-- table区域-begin -->
@@ -145,6 +145,7 @@
    </a-tabs>

    <inbound-model ref="modalForm" @ok="modalFormOk" :nodeSelected="nodeSelected"></inbound-model>
    <inbound-apply-model-list ref="inboundApplyModelList"></inbound-apply-model-list>
  </a-card>
</template>

@@ -163,6 +164,7 @@
  import ParaCommonToolList from '.././baseTools/ParaCommonToolList'
  import ParaBladeList from '.././baseTools/ParaBladeList'
  import InboundModel from './InboundModel'
  import InboundApplyModelList from './InboundApplyModelList.vue'

  export default {
    name: 'InboundListRight',
@@ -176,7 +178,8 @@
      ParaTurningToolsList,
      ParaCommonToolList,
      ParaBladeList,
      InboundModel
      InboundModel,
      InboundApplyModelList
    },
    data () {
      return {
@@ -211,9 +214,14 @@
            dataIndex: 'toolCode'
          },
          {
            title:'工具编号',
            align:"center",
            dataIndex: 'onlyCode'
          },
          {
            title:'入库类型',
            align:"center",
            dataIndex: 'inStorehouseType'
            dataIndex: 'inStorehouseTypeName'
          },
          {
            title:'型号/图号',
@@ -229,7 +237,7 @@
          {
            title:'入库数量',
            align:"center",
            dataIndex: 'inStorageQuantity'
            dataIndex: 'inNumber'
          },
          // {
          //   title:'备注',
@@ -249,17 +257,17 @@
              return !text?"":(text.length>10?text.substr(0,10):text)
            }
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
          // {
          //   title: '操作',
          //   dataIndex: 'action',
          //   align:"center",
          //   fixed:"right",
          //   width:147,
          //   scopedSlots: { customRender: 'action' }
          // }
        ],
        url: {
          list: "/tms/inboundDetail/list",
          list: "/tms/inStoreDetail/list",
          paraHolesToolsList:"/tms/baseTools/paraHolesToolsList",
          paraCommonToolList:"/tms/baseTools/paraCommonToolList",
          paraThreadingToolList:"/tms/baseTools/paraThreadingToolList",
@@ -308,6 +316,10 @@
          this.$refs.modalForm.title = "新增工具入库";
          this.$refs.modalForm.disableSubmit = false;
      },

      handleInbound() {
          this.$refs.inboundApplyModelList.show();
      },
      handleDelete(id) {
        deleteAction(this.url.delete, {id: id}).then((res) => {
                if (res.success) {