From d7d23b38b1ff781b674f2c4f21d546fcb6840424 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 16:19:13 +0800
Subject: [PATCH] =?UTF-8?q?HL-5853=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=B1=A5=E5=8E=86=E8=A1=A8=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 12 +++-
 .../supplierdeliverRequestMain/index.vue      | 71 ++++++++-----------
 2 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index dae76deaf..2d536e709 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -646,10 +646,18 @@ const change = (item, index) => {
   emit('changeTabs', item)
   if(otherList.find(other=>other.label==item.label)){
     // 附件/备注/变更记录 -- 点击回到顶部
-    scrollbar.value.scrollTo({ top: 0});
+    scrollbar.value?.scrollTo({ top: 0});
   }
       
 }
+const changeTabCurrent = ({label,index})=>{
+  if(label){
+    let tab = tabsList.value.find(item=>item.label==label)
+    change(tab,tabsList.value.indexOf(tab))
+  }else{
+    change(tabsList.value[index],index)
+  }
+}
 
 //主表所需的参数
 const masterParmas = ref({
@@ -1106,7 +1114,7 @@ watch(
     getList()
   }
 )
-defineExpose({ openDetail, formRef ,updateList,submitUpdateList}) // 提供 open 方法，用于打开弹窗
+defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss">
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index bedc09039..9b57b0159 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -152,14 +152,7 @@
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
   />
-  <!-- 上传履历表 -->
-  <BasicForm
-    ref="curriculumVitaeRef"
-    :formAllSchemas="CurriculumVitae.allSchemas"
-    @success="submitCurriculumVitae"
-    :tableFormRules="CurriculumVitaeRules"
-    :isBusiness="false"
-  />
+  
   <!-- 上传质量报告 -->
   <BasicForm
     ref="ploadQualityReportRef"
@@ -544,16 +537,16 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
     }), // 上传质量报告
-    // {
-    //   label: t('ts.上传履历表'),
-    //   name: 'mainPlanCurriculumVitae',
-    //   hide: row.status!=5,
-    //   type: 'primary',
-    //   icon: '',
-    //   color: '',
-    //   hasPermi: '',
-    //   link: true // 文本展现按钮
-    // }, // 上传履历表
+    {
+      label: t('ts.上传履历表'),
+      name: 'mainPlanCurriculumVitae',
+      hide: row.status!=5,
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    }, // 上传履历表
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -628,7 +621,7 @@ const buttonTableClick = async (val, row) => {
     handleUploadQualityReport(row)
   }else if (val == 'mainPlanCurriculumVitae') {
     // 上传履历表
-    handleUploadCurriculumVitae(row)
+    handleUploadCurriculumVitae(row,'发货单号', row.asnNumber)
   } else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.masterId)
@@ -830,6 +823,20 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
   detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
+/** 上传履历表 */
+const handleUploadCurriculumVitae = async (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
+  nextTick(()=>{
+    detailRef.value.changeTabCurrent({
+      label:'履历表'
+    })
+  })
+}
 //添加/修改操作
 const formRef = ref()
 const supplierdeliverFormRef = ref()
@@ -971,30 +978,8 @@ const handleUploadQualityReport = async (row) => {
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
-const curriculumVitaeRef = ref()
-const submitCurriculumVitae = async (formType, data) => {
-  console.log('上传履历表',data)
-  await SupplierdeliverRequestDetailApi.uploadCurriculumVitae(data)
-  message.success(t('common.createSuccess'))
-  curriculumVitaeRef.value.dialogVisible = false
-  getList()
-}
-/** 上传质量报告 */
-const handleUploadCurriculumVitae = async (row) => {
-  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
-    (item) => item.field == 'uploadFile'
-  )
-  if (uploadFile) {
-    uploadFile['componentProps']['upData']['tableId'] = row.masterId
-  }
-  curriculumVitaeRef.value.open(
-    'create',
-    null,
-    { masterId: row.masterId },
-    t('ts.上传履历表'),
-    t('ts.上传履历表')
-  ) 
-}
+
+
 
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number