|
@@ -550,7 +550,7 @@ import customerDialog from "@/components/customer-dialog/main";
|
|
|
import priceLibrary from "@/components/price-Library/main";
|
|
|
import propertyDialog from "@/components/property-dialog/main";
|
|
|
import {
|
|
|
- dateFormat
|
|
|
+ dateFormat, NdayDate
|
|
|
} from "@/util/date";
|
|
|
import financialAccount from "@/components/finance/financialAccount";
|
|
|
import billApplication from "@/components/bill/billApplication";
|
|
@@ -606,9 +606,21 @@ export default {
|
|
|
batchNo: '',
|
|
|
form: {
|
|
|
orderStatus: "录入",
|
|
|
- cargoType: "普货",
|
|
|
+ // cargoType: "普货",
|
|
|
businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
|
|
|
- currency: "USD"
|
|
|
+ currency: "USD",
|
|
|
+ dateValidity:NdayDate(7), // 有效日期 当天+7天
|
|
|
+ transport:'BY SEA', // 运输方式
|
|
|
+ transportDescription:'BY SEA', // 运输方式描述
|
|
|
+ dateClause:'30 DAYS', // 日期条款
|
|
|
+ priceTerms:'FOB', // 价格条款
|
|
|
+ paymentType:'预付50%,尾款发货前付清', // 收款方式
|
|
|
+ boxPile: '20GP', // 箱型
|
|
|
+ signingMethod:'正本', // 签单方式
|
|
|
+ boxNumber:1, // 箱量
|
|
|
+ buyerId:'1705056126778851330', // 采购员 王亚文
|
|
|
+ documenterId:'1597944227923324930', // 跟单员 张雪梅
|
|
|
+ portOfLoad:'QINGDAO, CHINA', // 起运港
|
|
|
},
|
|
|
disabled: false,
|
|
|
dialogVisible: false,
|
|
@@ -640,11 +652,11 @@ export default {
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
- {
|
|
|
- label: "银行信息",
|
|
|
- prop: "banks",
|
|
|
- span: 6,
|
|
|
- },
|
|
|
+ {
|
|
|
+ label: "销售订单号",
|
|
|
+ prop: "orderNo",
|
|
|
+ span: 6
|
|
|
+ },
|
|
|
{
|
|
|
label: "详情信息",
|
|
|
prop: "clientMessage",
|
|
@@ -653,18 +665,28 @@ export default {
|
|
|
span: 10
|
|
|
},
|
|
|
{
|
|
|
- label: "预交日期",
|
|
|
- prop: "plannedDeliveryDate",
|
|
|
+ label: "订单状态",
|
|
|
+ prop: "orderStatus",
|
|
|
span: 6,
|
|
|
- type: "date",
|
|
|
- format: "yyyy-MM-dd",
|
|
|
- valueFormat: "yyyy-MM-dd 00:00:00",
|
|
|
- offset: 2
|
|
|
- }, {
|
|
|
- label: "销售订单号",
|
|
|
- prop: "orderNo",
|
|
|
- span: 6
|
|
|
- }, {
|
|
|
+ offset: 2,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_status",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictValue"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "订单日期",
|
|
|
+ prop: "businesDate",
|
|
|
+ span: 6,
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: "",
|
|
|
+ trigger: "blur"
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "联系人",
|
|
|
prop: "corpAttn",
|
|
|
span: 5
|
|
@@ -672,7 +694,16 @@ export default {
|
|
|
label: "电话",
|
|
|
prop: "corpTel",
|
|
|
span: 5
|
|
|
- }, {
|
|
|
+ },{
|
|
|
+ label: "预交日期",
|
|
|
+ prop: "plannedDeliveryDate",
|
|
|
+ span: 6,
|
|
|
+ type: "date",
|
|
|
+ format: "yyyy-MM-dd",
|
|
|
+ valueFormat: "yyyy-MM-dd 00:00:00",
|
|
|
+ offset: 2
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "有效日期",
|
|
|
prop: "dateValidity",
|
|
|
span: 6,
|
|
@@ -680,7 +711,7 @@ export default {
|
|
|
format: "yyyy-MM-dd",
|
|
|
valueFormat: "yyyy-MM-dd 00:00:00",
|
|
|
// row: true,
|
|
|
- offset: 2,
|
|
|
+ // offset: 2,
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
@@ -688,16 +719,7 @@ export default {
|
|
|
trigger: "blur"
|
|
|
}
|
|
|
]
|
|
|
- }, {
|
|
|
- label: "订单日期",
|
|
|
- prop: "businesDate",
|
|
|
- span: 6,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- }, {
|
|
|
+ }, {
|
|
|
label: "起运港",
|
|
|
prop: "portOfLoad",
|
|
|
span: 6,
|
|
@@ -729,61 +751,50 @@ export default {
|
|
|
label: "name",
|
|
|
value: "name"
|
|
|
}
|
|
|
- }, {
|
|
|
- label: "运输方式",
|
|
|
- prop: "transport",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "银行信息",
|
|
|
+ prop: "banks",
|
|
|
+ span: 6,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "币别",
|
|
|
+ prop: "currency",
|
|
|
+ span: 6,
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: "",
|
|
|
+ trigger: "blur"
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "价格条款",
|
|
|
+ prop: "priceTerms",
|
|
|
span: 6,
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
|
|
|
- dicData:[],
|
|
|
- props: {
|
|
|
- label: "dictValue",
|
|
|
- value: "dictValue"
|
|
|
- },
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
|
message: "",
|
|
|
trigger: "blur"
|
|
|
}
|
|
|
- ],
|
|
|
- change:((e)=>{
|
|
|
- // if (e.value == '') return
|
|
|
- // console.log(e,731)
|
|
|
- // e.column.dicData.forEach(item => {
|
|
|
- // if (e.value == item.dictValue) {
|
|
|
- // this.form.transport = item.dictValue
|
|
|
- // this.form.transportDescription = item.remark;
|
|
|
- // }
|
|
|
- // });
|
|
|
- })
|
|
|
- },{
|
|
|
- label: "运输方式描述",
|
|
|
- prop: "transportDescription",
|
|
|
- span: 6,
|
|
|
- },{
|
|
|
- label: "船名",
|
|
|
- prop: "shipName",
|
|
|
- span: 6,
|
|
|
- disabled: true
|
|
|
- },{
|
|
|
- label: "航次",
|
|
|
- prop: "voyage",
|
|
|
- span: 6,
|
|
|
- disabled: true
|
|
|
- }, {
|
|
|
- label: '需产地证',
|
|
|
- prop: 'certificateOriginRequired',
|
|
|
- type: 'select',
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "条款说明",
|
|
|
+ prop: "priceTermsDescription",
|
|
|
+ type: "textarea",
|
|
|
+ minRows: 1,
|
|
|
+ span: 12,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "汇率",
|
|
|
+ prop: "exchangeRate",
|
|
|
span: 6,
|
|
|
- dicData: [{
|
|
|
- label: "是",
|
|
|
- value: "1"
|
|
|
- }, {
|
|
|
- label: "否",
|
|
|
- value: "0"
|
|
|
- }],
|
|
|
- value: "1"
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: "",
|
|
|
+ trigger: "blur"
|
|
|
+ }]
|
|
|
},
|
|
|
{
|
|
|
label: "日期条款",
|
|
@@ -805,25 +816,15 @@ export default {
|
|
|
span: 12,
|
|
|
},
|
|
|
{
|
|
|
- label: "签单方式",
|
|
|
- prop: "signingMethod",
|
|
|
+ label: "货物类型",
|
|
|
+ prop: "cargoType",
|
|
|
span: 6,
|
|
|
type: "select",
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=signing_method",
|
|
|
+ dicData: [],
|
|
|
props: {
|
|
|
label: "dictValue",
|
|
|
value: "dictValue"
|
|
|
},
|
|
|
- rules: [{
|
|
|
- required: false,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "价格条款",
|
|
|
- prop: "priceTerms",
|
|
|
- span: 6,
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
@@ -833,25 +834,51 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: "条款说明",
|
|
|
- prop: "priceTermsDescription",
|
|
|
- type: "textarea",
|
|
|
- minRows: 1,
|
|
|
+ label: "运输方式",
|
|
|
+ prop: "transport",
|
|
|
+ span: 6,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
|
|
|
+ dicData:[],
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictValue"
|
|
|
+ },
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ change:((e)=>{
|
|
|
+ // if (e.value == '') return
|
|
|
+ // console.log(e,731)
|
|
|
+ // e.column.dicData.forEach(item => {
|
|
|
+ // if (e.value == item.dictValue) {
|
|
|
+ // this.form.transport = item.dictValue
|
|
|
+ // this.form.transportDescription = item.remark;
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ })
|
|
|
+ },{
|
|
|
+ label: "运输方式描述",
|
|
|
+ prop: "transportDescription",
|
|
|
span: 12,
|
|
|
},
|
|
|
{
|
|
|
- label: "三方检验",
|
|
|
- prop: "tripartiteInspection",
|
|
|
- span: 6,
|
|
|
+ label: "箱型",
|
|
|
+ prop: "boxPile",
|
|
|
type: "select",
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=tripartite_inspection",
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
|
|
|
props: {
|
|
|
label: "dictValue",
|
|
|
value: "dictValue"
|
|
|
},
|
|
|
+ span: 6,
|
|
|
rules: [
|
|
|
{
|
|
|
- required: false,
|
|
|
+ required: true,
|
|
|
message: "",
|
|
|
trigger: "blur"
|
|
|
}
|
|
@@ -883,15 +910,9 @@ export default {
|
|
|
span: 12,
|
|
|
},
|
|
|
{
|
|
|
- label: "货物类型",
|
|
|
- prop: "cargoType",
|
|
|
+ label: "箱量",
|
|
|
+ prop: "boxNumber",
|
|
|
span: 6,
|
|
|
- type: "select",
|
|
|
- dicData: [],
|
|
|
- props: {
|
|
|
- label: "dictValue",
|
|
|
- value: "dictValue"
|
|
|
- },
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
@@ -901,46 +922,40 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: "产品毛利",
|
|
|
- prop: "grossProfit",
|
|
|
- span: 6,
|
|
|
- disabled: true
|
|
|
- },
|
|
|
- {
|
|
|
- label: "产品利率",
|
|
|
- prop: "grossProfitRate",
|
|
|
- span: 6,
|
|
|
- append: "%",
|
|
|
- disabled: true
|
|
|
- }, {
|
|
|
- label: "汇率",
|
|
|
- prop: "exchangeRate",
|
|
|
- span: 6,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },{
|
|
|
- label: "订单状态",
|
|
|
- prop: "orderStatus",
|
|
|
+ label: "采购员",
|
|
|
+ prop: "buyerId",
|
|
|
span: 6,
|
|
|
+ overHidden: true,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
type: "select",
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_status",
|
|
|
+ dicUrl: "/api/blade-user/page?size=20¤t=1&realName={{key}}",
|
|
|
props: {
|
|
|
- label: "dictValue",
|
|
|
- value: "dictValue"
|
|
|
- }
|
|
|
+ label: "realName",
|
|
|
+ value: "id",
|
|
|
+ res: 'data.records'
|
|
|
+ },
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
}, {
|
|
|
- label: "箱型",
|
|
|
- prop: "boxPile",
|
|
|
+ label: "跟单员",
|
|
|
+ prop: "documenterId",
|
|
|
+ span: 6,
|
|
|
+ overHidden: true,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
type: "select",
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
|
|
|
+ dicUrl: "/api/blade-user/page?size=20¤t=1&realName={{key}}",
|
|
|
props: {
|
|
|
- label: "dictValue",
|
|
|
- value: "dictValue"
|
|
|
+ label: "realName",
|
|
|
+ value: "id",
|
|
|
+ res: 'data.records'
|
|
|
},
|
|
|
- span: 6,
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
@@ -948,31 +963,72 @@ export default {
|
|
|
trigger: "blur"
|
|
|
}
|
|
|
]
|
|
|
- }, {
|
|
|
- label: "箱量",
|
|
|
- prop: "boxNumber",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "三方检验",
|
|
|
+ prop: "tripartiteInspection",
|
|
|
span: 6,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=tripartite_inspection",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictValue"
|
|
|
+ },
|
|
|
rules: [
|
|
|
{
|
|
|
- required: true,
|
|
|
+ required: false,
|
|
|
message: "",
|
|
|
trigger: "blur"
|
|
|
}
|
|
|
]
|
|
|
- }, {
|
|
|
- label: "起订量",
|
|
|
- prop: "minOrder",
|
|
|
- span: 6
|
|
|
- }, {
|
|
|
- label: "币别",
|
|
|
- prop: "currency",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '需产地证',
|
|
|
+ prop: 'certificateOriginRequired',
|
|
|
+ type: 'select',
|
|
|
+ span: 6,
|
|
|
+ dicData: [{
|
|
|
+ label: "是",
|
|
|
+ value: "1"
|
|
|
+ }, {
|
|
|
+ label: "否",
|
|
|
+ value: "0"
|
|
|
+ }],
|
|
|
+ value: "1"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "船名",
|
|
|
+ prop: "shipName",
|
|
|
+ span: 6,
|
|
|
+ disabled: true
|
|
|
+ },{
|
|
|
+ label: "航次",
|
|
|
+ prop: "voyage",
|
|
|
+ span: 6,
|
|
|
+ disabled: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "提单号",
|
|
|
+ prop: "billLadingNo",
|
|
|
+ span: 6,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "签单方式",
|
|
|
+ prop: "signingMethod",
|
|
|
span: 6,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=signing_method",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictValue"
|
|
|
+ },
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
+ required: false,
|
|
|
message: "",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
- }, {
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "预计海运费",
|
|
|
prop: "predictOceanFreight",
|
|
|
span: 6
|
|
@@ -987,65 +1043,40 @@ export default {
|
|
|
span: 6,
|
|
|
// offset: 0,
|
|
|
// row: true
|
|
|
- }, {
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "起订量",
|
|
|
+ prop: "minOrder",
|
|
|
+ span: 6
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "账户",
|
|
|
+ prop: "corpsBank",
|
|
|
+ span: 6,
|
|
|
+ disabled: true,
|
|
|
+ // row: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "产品利率",
|
|
|
+ prop: "grossProfitRate",
|
|
|
+ span: 6,
|
|
|
+ append: "%",
|
|
|
+ disabled: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "产品毛利",
|
|
|
+ prop: "grossProfit",
|
|
|
+ span: 6,
|
|
|
+ disabled: true
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "单票毛利",
|
|
|
prop: "singleTicketMargin",
|
|
|
span: 6,
|
|
|
disabled: true,
|
|
|
row: true
|
|
|
- }, {
|
|
|
- label: "采购员",
|
|
|
- prop: "buyerId",
|
|
|
- span: 6,
|
|
|
- overHidden: true,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-user/page?size=20¤t=1&realName={{key}}",
|
|
|
- props: {
|
|
|
- label: "realName",
|
|
|
- value: "id",
|
|
|
- res: 'data.records'
|
|
|
- },
|
|
|
- rules: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }
|
|
|
- ]
|
|
|
- }, {
|
|
|
- label: "跟单员",
|
|
|
- prop: "documenterId",
|
|
|
- span: 6,
|
|
|
- overHidden: true,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-user/page?size=20¤t=1&realName={{key}}",
|
|
|
- props: {
|
|
|
- label: "realName",
|
|
|
- value: "id",
|
|
|
- res: 'data.records'
|
|
|
},
|
|
|
- rules: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }
|
|
|
- ]
|
|
|
- }, {
|
|
|
- label: "提单号",
|
|
|
- prop: "billLadingNo",
|
|
|
- span: 6,
|
|
|
- }, {
|
|
|
- label: "账户",
|
|
|
- prop: "corpsBank",
|
|
|
- span: 6,
|
|
|
- disabled: true,
|
|
|
- row: true
|
|
|
- },
|
|
|
+
|
|
|
{
|
|
|
label: "备注",
|
|
|
prop: "orderRemark",
|