Browse Source

线边盘点

hella_online_20241128
yufei_wang 4 days ago
parent
commit
ff1c082618
  1. 9
      src/components/ImportForm/src/ImportDetailForm.vue
  2. 22
      src/views/wms/countManage/count/countJobMain/index.vue

9
src/components/ImportForm/src/ImportDetailForm.vue

@ -1,6 +1,6 @@
<!-- 导入组件 --> <!-- 导入组件 -->
<template> <template>
<Dialog v-model="dialogVisible" :title="t('ts.导入')" width="600" :close-on-click-modal="false"> <Dialog v-model="dialogVisible" :title="t(`ts.${dialogTitle}`).replace('ts.','')" width="600" :close-on-click-modal="false">
<el-upload <el-upload
ref="uploadRef" ref="uploadRef"
v-model:file-list="fileList" v-model:file-list="fileList"
@ -198,6 +198,13 @@ const props = defineProps({
required: false, required: false,
default: false default: false
}, },
dialogTitle:{
type: String,
required: false,
default: ()=>{
return '导入'
}
}
}) })
const importTemplateData = ref(props.importTemplateData) const importTemplateData = ref(props.importTemplateData)
const accept = ref(props.accept) const accept = ref(props.accept)

22
src/views/wms/countManage/count/countJobMain/index.vue

@ -75,7 +75,8 @@
<!-- 导入 --> <!-- 导入 -->
<ImportDetailForm <ImportDetailForm
ref="importFormRef" ref="importFormRef"
url="/wms/count-job-main/import" :dialogTitle="importTitle"
:url="importUrl"
:importTemplateData="importTemplateData" :importTemplateData="importTemplateData"
@success="importSuccess" @success="importSuccess"
:updateIsDisable="true" :updateIsDisable="true"
@ -237,6 +238,15 @@ const butttondata = (row, $index) => {
link: true, // link: true, //
hasPermi: '' // wms:count-job-main:importCountJob hasPermi: '' // wms:count-job-main:importCountJob
}, },
{
label: '线边盘点',
name: 'lineTypeImport',
hide: false,//row.isLineType!=true,
type: 'success',
color: '',
link: true, //
hasPermi: '' // wms:count-job-main:lineTypeImport
},
defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), //
{ {
label: '完成', label: '完成',
@ -250,7 +260,8 @@ const butttondata = (row, $index) => {
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
] ]
} }
const importTitle = ref('导入')
const importUrl = ref('/wms/count-job-main/import')
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { if (val == 'mainJobExe') {
@ -284,6 +295,13 @@ const buttonTableClick = async (val, row) => {
handleExportCountJob(row.id, row.number) handleExportCountJob(row.id, row.number)
} else if (val == 'importCountJob') { } else if (val == 'importCountJob') {
// //
importUrl.value = "/wms/count-job-main/import"
importTitle.value = '导入'
handleImport(row.id)
} else if (val == 'lineTypeImport') {
// 线
importUrl.value = "/wms/count-job-main/lineTypeImport"
importTitle.value = '线边盘点'
handleImport(row.id) handleImport(row.id)
} else if (val == 'done') { } else if (val == 'done') {
// //

Loading…
Cancel
Save