diff --git a/src/api/wms/outstockOrder/types.ts b/src/api/wms/outstockOrder/types.ts
index d9ec1e1..216d4ff 100644
--- a/src/api/wms/outstockOrder/types.ts
+++ b/src/api/wms/outstockOrder/types.ts
@@ -67,7 +67,12 @@ export interface OutstockOrderVO {
/**
* 仓库名称
*/
- warehouseName: string;
+ warehouseName?: string;
+
+ /**
+ * 客户名称
+ */
+ customerName?: string;
}
@@ -138,7 +143,12 @@ export interface OutstockOrderForm extends BaseEntity {
/**
* 仓库名称
*/
- warehouseName: string;
+ warehouseName?: string;
+
+ /**
+ * 客户名称
+ */
+ customerName?: string;
/**
* 出库明细集合(一次性提交)
@@ -214,7 +224,12 @@ export interface OutstockOrderQuery extends PageQuery {
/**
* 仓库名称
*/
- warehouseName: string;
+ warehouseName?: string;
+
+ /**
+ * 客户名称
+ */
+ customerName?: string;
/**
* 日期范围参数
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 3850049..717801d 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -78,7 +78,7 @@
-
+
+
+
+
@@ -147,8 +150,8 @@
-
-
+
+
-
+
-->
+
+
+
-
+
(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+ wms_allocate_way,
+ is_high_value
+} = toRefs(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'is_high_value'));
interface User {
@@ -584,6 +591,13 @@ const updateDialog = ref(false)
const dialogTitle = ref('添加')
const dialogForm = ref({})
+
+// 表单验证规则
+const dialogFormRules = ref({
+ warehouseId: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+ outstockType: [{ required: true, message: '请选择出库类型', trigger: 'change' }],
+ orderNo: [{ required: true, message: '请输入订单编号', trigger: 'blur' }]
+})
const parentTableInfoForm = ref({})
const childrenTableInfoForm = ref({})
@@ -735,7 +749,12 @@ const selectionChange = (e) => {
const parentTableAdd = () => {
getBaseCustomerList();
dialogVisible.value = true
- dialogForm.value = {}
+ dialogForm.value = {
+ warehouseId: '',
+ outstockType: '',
+ orderNo: '',
+ customerId: ''
+ }
dialogtable.value = []
}
// 父表格修改