BUG修改

src/api/wms/purchasePlanDetail/index.ts

@@ -21,6 +21,11 @@ export const getPurchasePlanDetailPage = async (params) => {
   return await request.get({ url: `/wms/purchase-plan-detail/page`, params })
 }
 
+// 查询采购收货记录子列表
+export const getPurchasePlanDetailList = async (params) => {
+    return await request.get({ url: `/wms/purchase-plan-detail/allList`, params })
+}
+
 // 查询要货计划子详情
 export const getPurchasePlanDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchase-plan-detail/get?id=` + id })

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -100,3 +100,4 @@ export const exportSupplierdeliverRequestMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-request-main/get-import-template' })
 }
+

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 const { t } = useI18n() // 国际化
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
@@ -14,14 +14,14 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
+  pageSize: 10,
-  pageNo:1,
+  pageNo: 1,
-  code:'SupplierDeliverRequest'
+  code: 'SupplierDeliverRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
+// 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
@@ -75,7 +75,18 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
         searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage // 查询弹窗所需分页方法
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          }]
       }
     }
   },
@@ -159,7 +170,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -210,8 +221,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       value: 'SupplierDeliver',
-      componentProps:{
+      componentProps: {
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -238,7 +249,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -269,7 +280,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -291,7 +302,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -308,8 +319,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       value: userDept.name,
-      componentProps:{
+      componentProps: {
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -345,7 +356,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -378,7 +389,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -398,7 +409,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -418,7 +429,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -438,7 +449,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled:true,
+        disabled: true,
       }
     }
   },
@@ -543,7 +554,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -569,7 +580,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -595,7 +606,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -910,7 +921,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -943,7 +954,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -970,12 +981,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '操作',
     field: 'action',
     isDetail: false,
-    isForm: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))