From bb83e4002bcc2813a901254b5caa34289e30222f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 23 Apr 2024 11:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92--=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BE=9B=E5=BA=94=E5=95=86=E7=94=B3=E8=AF=B7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                | 23 ++++-
 .../supplierdeliverRequestMain/index.vue      | 84 ++++++++++---------
 2 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 6025aae49..114382cb5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -64,6 +64,8 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  <!-- 创建供应商发货申请 -->
+  <supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
 </template>
 
 <script setup lang="ts">
@@ -76,6 +78,7 @@
   import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import { PurchaseDetail } from '../purchaseMain/purchaseMain.data'
   import dayjs from 'dayjs'
+  import supplierdeliverBasicForm from '../supplierdeliverRequestMain/supplierdeliverBasicForm.vue'
 
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
@@ -230,6 +233,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
+    
     // {
     //   label: '自定义扩展按钮',
     //   name: 'zdy',
@@ -287,8 +291,19 @@ const getSearchTableData = async (number,formField,searchField)=>{
       defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
       // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
+      {
+        label: '创建供应商发货申请',
+        name: 'supplierdeliver',
+        hide: false,
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true // 文本展现按钮
+      }
     ]
   }
+  const supplierdeliverFormRef = ref()
 
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
@@ -310,9 +325,15 @@ const getSearchTableData = async (number,formField,searchField)=>{
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.masterId)
+    } else if (val == 'supplierdeliver') { // 创建供应商发货申请
+      supplierdeliverFormRef.value.openFormByCreate({
+        number:row.number, //要货单号
+        supplierCode:row.supplierCode, //供应商代码 
+        endTime:row.endTime, //结束时间
+        deliveryDate:row.deliveryDate // 送达日期
+      })
     }
   }
-
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c449b614b..dc23682d8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -44,7 +44,8 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
+  <!-- <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
     :indexTableColumn="0"
@@ -63,15 +64,15 @@
     @submitForm="submitForm"
     @formFormDateChange="formFormDateChange"
     @onEnter="onEnter"
-  >
-  <template  v-slot="{row}">
+  > -->
+  <!-- <template  v-slot="{row}">
     <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']).format('YYYY-MM-DD'):'2099-12-31'"
     :clearable="true"
     style="width: 100%"
     :disabled="true" 
     placeholder="选择日期"/>
     </template>
-  </BasicForm>
+  </BasicForm> -->
 
   <!-- 详情 -->
   <Detail
@@ -179,7 +180,7 @@ import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
 import { addDay } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-
+import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -528,42 +529,45 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 //添加/修改操作
 const formRef = ref()
+const supplierdeliverFormRef = ref()
+
 const openForm = async (type: string, row?: number) => {
-  if(type == "update"){
-    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
-      if(item.field == 'supplierCode'){
-        item.componentProps.isSearchList = false
-        item.componentProps.disabled = true
-      }
-      if(item.field == 'ppNumber'){
-        item.componentProps.isSearchList = false
-        item.componentProps.disabled = true
-      }
-      if(item.field == 'asnNumber'){
-        item.componentProps.disabled = true
-      }
-      if(item.field == 'planArriveTime'){
-        item.componentProps.disabled = true
-      }
-    })
-  }else {
-    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
-      if(item.field == 'supplierCode'){
-        item.componentProps.isSearchList = true
-      }
-      if(item.field == 'ppNumber'){
-        item.componentProps.isSearchList = true
-      }
-      if(item.field == 'asnNumber'){
-        item.componentProps.disabled = false
-      }
-      if(item.field == 'planArriveTime'){
-        item.componentProps.disabled = false
-      }
-    })
-  }
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
+  supplierdeliverFormRef.value.openForm(type, row)
+  // if(type == "update"){
+  //   SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+  //     if(item.field == 'supplierCode'){
+  //       item.componentProps.isSearchList = false
+  //       item.componentProps.disabled = true
+  //     }
+  //     if(item.field == 'ppNumber'){
+  //       item.componentProps.isSearchList = false
+  //       item.componentProps.disabled = true
+  //     }
+  //     if(item.field == 'asnNumber'){
+  //       item.componentProps.disabled = true
+  //     }
+  //     if(item.field == 'planArriveTime'){
+  //       item.componentProps.disabled = true
+  //     }
+  //   })
+  // }else {
+  //   SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+  //     if(item.field == 'supplierCode'){
+  //       item.componentProps.isSearchList = true
+  //     }
+  //     if(item.field == 'ppNumber'){
+  //       item.componentProps.isSearchList = true
+  //     }
+  //     if(item.field == 'asnNumber'){
+  //       item.componentProps.disabled = false
+  //     }
+  //     if(item.field == 'planArriveTime'){
+  //       item.componentProps.disabled = false
+  //     }
+  //   })
+  // }
+  // tableData.value = [] // 重置明细数据
+  // formRef.value.open(type, row)
 }
 
 /** 删除按钮操作 */