diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 087a3d5be..353664dfa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -73,7 +73,7 @@
@onChange="onChangeForm"
>
- 选择收货单明细
+ 选择收货单明细
@@ -81,8 +81,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{
@@ -659,6 +672,43 @@ const handleAddTable = () => {
// }
// })
}
+// 选择收货单明细
+const chooseReceiptList = ()=>{
+ // searchTableRef.value.open(
+ // ('供应商信息',
+ // // _searchTableAllSchemas,
+ // // _searchTablePage, // 接口
+ // // formField,
+ // // searchField,
+ // true,//是否多选
+ // // type,
+ // // row,
+ // _searchCondition
+ // )
+ // )
+
+ searchTableRef.value.open(
+ "收货单明细",
+ Itembasic.allSchemas,
+ ItembasicApi.getItembasicPage,
+ "hahaha",
+ "hahaha",
+ false,
+ 'tableForm',
+ null,
+ [{
+ key: 'available',
+ value: 'TRUE',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ }],
+ undefined,
+ false,
+ null
+ )
+
+}
const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
console.log(val)
tableData.value = [...tableData.value, ...val]
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
index 26d19b63d..6f80ef1ce 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -209,7 +209,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
},
{
label: '供应商1',
- field: 'supplierCode1',
+ field: 'supplierCode',
sort: 'custom',
table: {
width: 150
@@ -448,9 +448,9 @@ export const PurchasereturnRequestMainRules = reactive({
dueTime: [
{ required: true, message: '请选择截止时间', trigger: 'blur' }
],
- purchaseReceiptRecordNumber: [
- { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
- ],
+ // purchaseReceiptRecordNumber: [
+ // { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+ // ],
carrierCode: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },
],