diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 0308e6729..8fc36f93f 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -231,10 +231,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => }) } if(formField == 'supplierCode'){ - isShowButton.value = true + // isShowButton.value = true setV['supplierCode'] = val[0]['code'] - setV['purchaseReceiptRecordNumber'] = '' - tableData.value = [] + // setV['purchaseReceiptRecordNumber'] = '' + // tableData.value = [] } formRef.setValues(setV) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 91d87f30a..195f8df31 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -7,8 +7,6 @@ import { PurchasereceiptRecordDetail, PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' -import * as BalanceApi from '@/api/wms/balance' -import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data"; import * as SupplierApi from "@/api/wms/supplier"; @@ -47,6 +45,25 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form:{ + componentProps:{ + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 + } + } + }, { label: '采购收货记录单号', field: 'purchaseReceiptRecordNumber', @@ -67,6 +84,11 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true }] } } @@ -89,25 +111,6 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - form:{ - componentProps:{ - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 - } - } - }, { label: '承运商', field: 'carrierCode', @@ -443,6 +446,9 @@ export const PurchasereturnRequestMainRules = reactive({ supplierCode: [ { required: true, message: '请输入供应商代码', trigger: 'blur' } ], + purchaseReceiptRecordNumber: [ + { required: true, message: '请输入采购收货记录单号', trigger: 'blur' } + ], carrierCode: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, ],