|
@@ -20,7 +20,7 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName" id="SaleOrderForm-supplierName" name="supplierName">
|
|
|
+ <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="SaleOrderForm-supplierName" name="supplierName">
|
|
|
<JSelectInput v-model:value="formData.supplier" placeholder="请选择" allow-clear :options="supplierOption" @change="changeSupplier"></JSelectInput>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -151,6 +151,9 @@
|
|
|
var supplierOption = ref([]);
|
|
|
//表单验证
|
|
|
const validatorRules = reactive({
|
|
|
+ supplier: [
|
|
|
+ { required: true, message: '请选择供应商(select supplier)' }
|
|
|
+ ],
|
|
|
});
|
|
|
const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
|
|
|
const dbData = {};
|
|
@@ -213,11 +216,13 @@
|
|
|
|
|
|
async function getFormData() {
|
|
|
try {
|
|
|
+ debugger
|
|
|
// 触发表单验证
|
|
|
await validate();
|
|
|
} catch ({ errorFields }) {
|
|
|
if (errorFields) {
|
|
|
const firstField = errorFields[0];
|
|
|
+ debugger
|
|
|
if (firstField) {
|
|
|
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
|
|
|
}
|
|
@@ -230,12 +235,17 @@
|
|
|
async function submitForm() {
|
|
|
const mainData = await getFormData();
|
|
|
const subData = await getSubFormAndTableData();
|
|
|
- const values = Object.assign({}, dbData, mainData, subData);
|
|
|
- console.log('表单提交数据', values)
|
|
|
- const isUpdate = values.id ? true : false
|
|
|
- await saveOrUpdate(values, isUpdate);
|
|
|
- //关闭弹窗
|
|
|
- emit('success');
|
|
|
+ if(!subData.purShippingFeeNoticeList||subData.purShippingFeeNoticeList.lenght==0){
|
|
|
+ message.error('请添加发货通知单!');
|
|
|
+ }else{
|
|
|
+ const values = Object.assign({}, dbData, mainData, subData);
|
|
|
+ console.log('表单提交数据', values)
|
|
|
+ const isUpdate = values.id ? true : false
|
|
|
+ await saveOrUpdate(values, isUpdate);
|
|
|
+ //关闭弹窗
|
|
|
+ emit('success');
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
function setFieldsValue(values) {
|