|
@@ -10,8 +10,6 @@
|
|
|
v-bind="validateInfos.organize"
|
|
|
id="SaleOrderForm-organize"
|
|
|
name="organize"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-select v-model:value="formData.organize" :disabled="formData.id!==''">
|
|
|
<a-select-option value="上海">上海</a-select-option>
|
|
@@ -30,8 +28,6 @@
|
|
|
v-bind="validateInfos.billDate"
|
|
|
id="SaleOrderForm-billDate"
|
|
|
name="billDate"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-date-picker
|
|
|
placeholder="请选择单据日期(bill date)"
|
|
@@ -63,14 +59,19 @@
|
|
|
v-bind="validateInfos.customerName"
|
|
|
id="SaleOrderForm-customerName"
|
|
|
name="customerName"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input v-model:value="formData.customerName" placeholder="请选择" allow-clear disabled />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="中间人(intermediator)" v-bind="validateInfos.intermediator" id="SaleOrderForm-intermediator" name="intermediator">
|
|
|
+ <a-form-item label="客户联系人(inquiry platform)" v-bind="validateInfos.inquiryPlatform" id="SaleInquiryFormForm-inquiryPlatform" name="inquiryPlatform">
|
|
|
+ <a-select v-model:value="formData.liaisonId" labelInValue @change="onChangeLiaison" allowClear>
|
|
|
+ <a-select-option v-for="item in linkOption" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="12">
|
|
|
+ <a-form-item label="中间人(intermediator)" v-bind="validateInfos.intermediator" id="SaleOrderForm-intermediator" name="intermediator" >
|
|
|
<a-input v-model:value="formData.intermediatorName" placeholder="请选择" allow-clear disabled />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -80,8 +81,6 @@
|
|
|
v-bind="validateInfos.priority"
|
|
|
id="SaleOrderForm-priority"
|
|
|
name="priority"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority" disabled />
|
|
|
</a-form-item>
|
|
@@ -111,14 +110,12 @@
|
|
|
v-bind="validateInfos.model"
|
|
|
id="SaleOrderForm-model"
|
|
|
name="model"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JDictSelectTag v-model:value="formData.model" placeholder="请选择" dictCode="model_typer" disabled />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="SaleOrderForm-maker" name="maker">
|
|
|
+ <a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="SaleOrderForm-maker" name="maker" >
|
|
|
<a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)" allow-clear disabled />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -128,8 +125,6 @@
|
|
|
v-bind="validateInfos.currency"
|
|
|
id="SaleOrderForm-currency"
|
|
|
name="currency"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" disabled />
|
|
|
</a-form-item>
|
|
@@ -140,7 +135,7 @@
|
|
|
</a-form-item>
|
|
|
</a-col> -->
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerms" id="SaleOrderForm-deliveryTerms" name="deliveryTerms">
|
|
|
+ <a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerms" id="SaleOrderForm-deliveryTerms" name="deliveryTerms" >
|
|
|
<JDictSelectTag v-model:value="formData.deliveryTerms" placeholder="请选择" dictCode="delivery_terms" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -150,15 +145,13 @@
|
|
|
v-bind="validateInfos.paymentTerms"
|
|
|
id="SaleOrderForm-paymentTerms"
|
|
|
name="paymentTerms"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" disabled />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="SaleOrderForm-deliveryTime" name="deliveryTime">
|
|
|
+ <a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="SaleOrderForm-deliveryTime" name="deliveryTime" >
|
|
|
<a-date-picker
|
|
|
placeholder="请选择交期(delivery time)"
|
|
|
v-model:value="formData.deliveryTime"
|
|
@@ -176,8 +169,6 @@
|
|
|
v-bind="validateInfos.delivery"
|
|
|
id="SaleOrderForm-delivery"
|
|
|
name="delivery"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
|
|
|
</a-form-item>
|
|
@@ -198,8 +189,6 @@
|
|
|
v-bind="validateInfos.invoiceHeader"
|
|
|
id="SaleOrderForm-invoiceHeader"
|
|
|
name="invoiceHeader"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input v-model:value="formData.invoiceHeader" placeholder="请输入" AutoComplete="off" />
|
|
|
</a-form-item>
|
|
@@ -225,8 +214,6 @@
|
|
|
v-bind="validateInfos.warrantyPeriod"
|
|
|
id="SaleOrderForm-warrantyPeriod"
|
|
|
name="warrantyPeriod"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input
|
|
|
v-model:value="formData.warrantyPeriod"
|
|
@@ -237,7 +224,7 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
- <a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport">
|
|
|
+ <a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport" >
|
|
|
<JDictSelectTag v-model:value="formData.isExport" placeholder="请选择" dictCode="yes_or_no" AutoComplete="off" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -247,8 +234,6 @@
|
|
|
v-bind="validateInfos.saleDepartment"
|
|
|
id="SaleOrderForm-saleDepartment"
|
|
|
name="saleDepartment"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input v-model:value="formData.saleDepartmentName" placeholder="请输入" allow-clear disabled />
|
|
|
</a-form-item>
|
|
@@ -274,8 +259,6 @@
|
|
|
v-bind="validateInfos.salesman"
|
|
|
id="SaleOrderForm-salesman"
|
|
|
name="salesman"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input v-model:value="formData.salesmanName" placeholder="请输入业务员(salesman)" allow-clear disabled />
|
|
|
</a-form-item>
|
|
@@ -296,8 +279,6 @@
|
|
|
v-bind="validateInfos.doubleDiscount"
|
|
|
id="SaleOrderForm-doubleDiscount"
|
|
|
name="doubleDiscount"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input
|
|
|
v-model:value="formData.doubleDiscount"
|
|
@@ -325,8 +306,6 @@
|
|
|
v-bind="validateInfos.advanceRatio"
|
|
|
id="SaleOrderForm-advanceRatio"
|
|
|
name="advanceRatio"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<a-input v-model:value="formData.advanceRatio" placeholder="请输入" allow-clear AutoComplete="off" />
|
|
|
</a-form-item>
|
|
@@ -342,8 +321,6 @@
|
|
|
v-bind="validateInfos.agreementTerms"
|
|
|
id="SaleOrderForm-agreementTerms"
|
|
|
name="agreementTerms"
|
|
|
- :labelCol="formItemLayout.labelCol1"
|
|
|
- :wrapperCol="formItemLayout.wrapperCol1"
|
|
|
>
|
|
|
<JSelectMultiple v-model:value="formData.agreementTerms" placeholder="" dictCode="base_agreement_terms,name,name" page="false" showSearch/>
|
|
|
</a-form-item>
|
|
@@ -426,6 +403,7 @@
|
|
|
queryVersonHistoryById,
|
|
|
querysaleVersonFormShipListByMainId,
|
|
|
querySaleVersonProductListByMainId,
|
|
|
+ LinkOption
|
|
|
} from '../SaleOrderyForm.api';
|
|
|
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
|
|
|
import { saleOrderShipColumns, saleOrderProductColumns } from '../SaleOrderForm.data';
|
|
@@ -472,6 +450,7 @@
|
|
|
const userStore = useUserStore();
|
|
|
const loading = ref(false);
|
|
|
const formRef = ref();
|
|
|
+ var linkOption = ref([]);
|
|
|
const SaleOrderFormShipFormShipTableRef = ref();
|
|
|
const SelectPrpductModalRef = ref();
|
|
|
const SelectContractModalRef = ref();
|
|
@@ -535,6 +514,8 @@
|
|
|
exchangeRate: '',
|
|
|
submit: undefined,
|
|
|
agreementTerms: '',
|
|
|
+ liaisonId:'',
|
|
|
+ liaisonInfo:''
|
|
|
});
|
|
|
|
|
|
//表单验证
|
|
@@ -546,7 +527,7 @@
|
|
|
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
|
|
|
const dbData = {};
|
|
|
const formItemLayout = {
|
|
|
- labelCol: { xs: { span: 24 }, sm: { span: 5 } },
|
|
|
+ labelCol: { xs: { span: 24 }, sm: { span: 6 } },
|
|
|
wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
|
|
|
labelCol1: { xs: { span: 24 }, sm: { span: 6 } },
|
|
|
wrapperCol1: { xs: { span: 24 }, sm: { span: 16 } },
|
|
@@ -573,6 +554,7 @@
|
|
|
formData.salesmanName = userStore.getUserInfo.realname;
|
|
|
formData.saleDepartment = userStore.getUserInfo.orgCode;
|
|
|
formData.saleDepartmentName = userStore.getUserInfo.orgName;
|
|
|
+ linkOption.value=[]
|
|
|
}
|
|
|
async function copy(data, id) {
|
|
|
//主表数据
|
|
@@ -593,6 +575,7 @@
|
|
|
})
|
|
|
SaleOrderFormShipFormProductTable.dataSource = [...data];
|
|
|
notAllowEdit.value= false
|
|
|
+ getLinkOptionsArr(formData.customer)
|
|
|
}
|
|
|
// 判断有没有参照的子表
|
|
|
function isSelect() {
|
|
@@ -629,6 +612,7 @@
|
|
|
const SaleOrderFormShipFormProductDataList = await querySaleOrderFormProductListByMainId(row['id']);
|
|
|
SaleOrderFormShipFormProductTable.dataSource = [...SaleOrderFormShipFormProductDataList];
|
|
|
notAllowEdit.value = true;
|
|
|
+ getLinkOptionsArr(formData.customer)
|
|
|
}
|
|
|
|
|
|
async function queryMainData(id) {
|
|
@@ -788,6 +772,7 @@
|
|
|
var params = { id: formData.customer };
|
|
|
var obj = await CustomerOption(params);
|
|
|
formData.invoiceAddress = obj.records[0].invoiceAddress;
|
|
|
+ getLinkOptionsArr(formData.customer)
|
|
|
}
|
|
|
}
|
|
|
function changeDiscount() {
|
|
@@ -848,6 +833,7 @@
|
|
|
var params = { id: formData.customer };
|
|
|
var obj = await CustomerOption(params);
|
|
|
formData.invoiceAddress = obj.records[0].invoiceAddress;
|
|
|
+ getLinkOptionsArr(formData.customer)
|
|
|
}
|
|
|
}
|
|
|
function getShipList(id, status) {
|
|
@@ -865,6 +851,7 @@
|
|
|
formData.projectName = data[0].code;
|
|
|
formData.customer = data[0].customerId;
|
|
|
formData.customerName = data[0].customerId_dictText;
|
|
|
+ getLinkOptionsArr(formData.customer)
|
|
|
}
|
|
|
function changeMainDeliveryTime(prop) {
|
|
|
if (SaleOrderFormShipFormProductTable.dataSource.length > 0) {
|
|
@@ -914,6 +901,20 @@
|
|
|
formData.convertedAmount = Number(formData.convertedAmount).toFixed(2);
|
|
|
}
|
|
|
}
|
|
|
+ async function getLinkOptionsArr(customerId){
|
|
|
+ var obj = await LinkOption({id:customerId})
|
|
|
+ linkOption.value = obj
|
|
|
+ }
|
|
|
+ function onChangeLiaison(data){
|
|
|
+ if(data&&data!==undefined){
|
|
|
+ formData.liaisonId = data.key
|
|
|
+ formData.liaisonInfo = data.label[0].children
|
|
|
+ }else{
|
|
|
+ formData.liaisonId = ''
|
|
|
+ formData.liaisonInfo = ''
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
/**
|
|
|
* 值改变事件触发-树控件回调
|
|
|
* @param key
|
|
@@ -964,6 +965,9 @@
|
|
|
changeValues,
|
|
|
changeDiscount,
|
|
|
CustomerOption,
|
|
|
+ linkOption,
|
|
|
+ getLinkOptionsArr,
|
|
|
+ onChangeLiaison
|
|
|
};
|
|
|
},
|
|
|
});
|