From ff1c082618ba66b63d4bdcdfd087ab4c371c781a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 10:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportForm/src/ImportDetailForm.vue       |  9 +++++++-
 .../countManage/count/countJobMain/index.vue  | 22 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue
index d8a45338b..580183cee 100644
--- a/src/components/ImportForm/src/ImportDetailForm.vue
+++ b/src/components/ImportForm/src/ImportDetailForm.vue
@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <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
       ref="uploadRef"
       v-model:file-list="fileList"
@@ -198,6 +198,13 @@ const props = defineProps({
     required: false,
     default: false
   },
+  dialogTitle:{
+    type: String,
+    required: false,
+    default: ()=>{
+      return  '导入'
+    }
+  }
 })
 const importTemplateData = ref(props.importTemplateData)
 const accept = ref(props.accept)
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 49d33490a..b75414aa4 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -75,7 +75,8 @@
   <!-- 导入 -->
   <ImportDetailForm
     ref="importFormRef"
-    url="/wms/count-job-main/import"
+    :dialogTitle="importTitle"
+    :url="importUrl"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"
@@ -237,6 +238,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       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']) }), // 放弃
     {
       label: '完成',
@@ -250,7 +260,8 @@ const butttondata = (row, $index) => {
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
-
+const importTitle = ref('导入')
+const importUrl = ref('/wms/count-job-main/import')
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') {
@@ -284,6 +295,13 @@ const buttonTableClick = async (val, row) => {
     handleExportCountJob(row.id, row.number)
   } 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)
   } else if (val == 'done') {
     // 完成