master
zth 1 year ago
parent 44479fd3d2
commit abd84f5f26

@ -3,8 +3,8 @@ import axios from "axios";
export default ({ data }) => { export default ({ data }) => {
let baseURL = ""; let baseURL = "";
if (data.url == "/user/login") { if (data.url == "/user/login") {
// baseURL = "http://60.209.125.238:35101"; //测试 baseURL = "http://60.209.125.238:40501"; //测试
baseURL = "http://djy-identity.myshipping.net"; //正式 // baseURL = "http://djy-identity.myshipping.net"; //正式
} else { } else {
baseURL = process.env.VUE_APP_AXIOS_BASEURL; baseURL = process.env.VUE_APP_AXIOS_BASEURL;
} }

@ -420,7 +420,7 @@
<img src="../assets/img/LunChuan.png" alt="" /> <img src="../assets/img/LunChuan.png" alt="" />
</div> </div>
<div class="ImgBar"></div> <div class="ImgBar"></div>
<div class="ImgBox2"> <div class="ImgBox2" v-if="item3.por_name">
<p></p> <p></p>
</div> </div>
<div class="ImgBar"></div> <div class="ImgBar"></div>
@ -463,19 +463,20 @@
<el-table <el-table
:data="item3.surcharge" :data="item3.surcharge"
style="width: 100%" style="width: 100%"
:height="300"
:header-cell-style="{ :header-cell-style="{
background: '#F5F7FA', background: '#F5F7FA',
color: '#2E2E2E', color: '#2E2E2E',
}" }"
max-height="800"
row-class-name="tableRowClassName"
> >
<el-table-column <el-table-column
prop="category" prop="category"
label="费用类型" label="费用类型"
width="120" width="170"
> >
</el-table-column> </el-table-column>
<el-table-column prop="name" label="费用名称" width="150"> <el-table-column prop="name" label="费用名称" width="250">
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="计费单位"> <el-table-column prop="unit" label="计费单位">
</el-table-column> </el-table-column>
@ -633,11 +634,12 @@
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="36%" width="36%"
:before-close="handleClose" :before-close="handleClose"
class="MskDialog"
> >
<div class="CsDialogBox"> <div class="CsDialogBox">
<div class="DialogBox1"> <div class="DialogBox1">
<div class="left"> <div class="left">
<p></p> <p></p>
<p>{{ dialogdata.pol_name_pod_name.pol_name }}</p> <p>{{ dialogdata.pol_name_pod_name.pol_name }}</p>
</div> </div>
<!-- <i class="el-icon-right center"></i> --> <!-- <i class="el-icon-right center"></i> -->
@ -648,7 +650,11 @@
</div> </div>
</div> </div>
<div> <div>
<el-table :data="dialogtableData" style="width: 100%"> <el-table
:data="dialogtableData"
style="width: 100%"
header-cell-class-name="MskDialogTable"
>
<el-table-column prop="vessel_voyage" label="航名/航次"> <el-table-column prop="vessel_voyage" label="航名/航次">
</el-table-column> </el-table-column>
<el-table-column prop="departure_date" label="开船日期"> <el-table-column prop="departure_date" label="开船日期">
@ -673,7 +679,7 @@
<el-form <el-form
ref="dialogform3" ref="dialogform3"
:model="dialogform3" :model="dialogform3"
label-width="80px" label-width="120px"
class="DialogBox3" class="DialogBox3"
> >
<el-form-item label="品名类别"> <el-form-item label="品名类别">
@ -700,7 +706,11 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="重量"> <el-form-item label="重量">
<el-input v-model="dialogform3.weight" size="mini"></el-input> <el-input
v-model="dialogform3.weight"
size="mini"
:style="{ width: '37%' }"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="箱型&箱量"> <el-form-item label="箱型&箱量">
<span class="box_web_name" :style="{ width: '50%' }">{{ <span class="box_web_name" :style="{ width: '50%' }">{{
@ -709,7 +719,7 @@
<el-input-number <el-input-number
v-model="dialogform3.box_num" v-model="dialogform3.box_num"
size="mini" size="mini"
:style="{ width: '50%', marginLeft: '20px' }" :style="{ width: '30%', marginLeft: '20px' }"
controls-position="right" controls-position="right"
:min="1" :min="1"
></el-input-number> ></el-input-number>
@ -730,6 +740,46 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否美线">
<el-switch
v-model="dialogform3.is_american_route"
active-text="是"
inactive-text="否"
>
</el-switch>
</el-form-item>
<el-form-item
label="是否代理"
v-show="dialogform3.is_american_route == true"
>
<el-switch
v-model="dialogform3.is_agent"
active-text="是"
inactive-text="否"
>
</el-switch>
</el-form-item>
<el-form-item
label="是否无船承运人"
v-show="dialogform3.is_american_route == true"
>
<el-switch
v-model="dialogform3.is_nvocc"
active-text="是"
inactive-text="否"
>
</el-switch>
</el-form-item>
<el-form-item
label="无船承运人编号"
v-show="dialogform3.is_american_route == true"
>
<el-input
v-model="dialogform3.nvocc_licence_number"
size="mini"
:style="{ width: '37%' }"
></el-input>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div> <div>
@ -795,7 +845,7 @@
<p> <p>
<span <span
>ALL IN: >ALL IN:
<span>{{ <span class="CSBT">{{
dialogdata.total_freight_total_currency dialogdata.total_freight_total_currency
.total_freight_total_currency .total_freight_total_currency
}}</span></span }}</span></span
@ -827,8 +877,9 @@
type="primary" type="primary"
:loading="Savedialogloading" :loading="Savedialogloading"
@click="FnSavedialog" @click="FnSavedialog"
>提交订舱</el-button
> >
提交订舱
</el-button>
<!-- <el-button @click="dialogVisible = false"> </el-button> <!-- <el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="dialogVisible = false" <el-button type="primary" @click="dialogVisible = false"
> </el-button > </el-button
@ -933,6 +984,9 @@ export default {
weight: 18000, weight: 18000,
box_num: 1, box_num: 1,
box_web_name: "", box_web_name: "",
is_american_route: false,
is_agent: false,
is_nvocc: false,
}, },
dialogform4: { dialogform4: {
radio: "1", radio: "1",
@ -1243,6 +1297,10 @@ export default {
box_num: this.dialogform3.box_num, box_num: this.dialogform3.box_num,
product_name: this.dialogform3.product_name, product_name: this.dialogform3.product_name,
detention_type: this.dialogform3.detention_type || 0, detention_type: this.dialogform3.detention_type || 0,
is_american_route: this.dialogform3.is_american_route,
is_agent: this.dialogform3.is_agent,
is_nvocc: this.dialogform3.is_nvocc,
nvocc_licence_number: this.dialogform3.nvocc_licence_number,
contract_code: contract_code:
this.dialogform4.radio == "1" ? "" : this.dialogform4.contract_code, this.dialogform4.radio == "1" ? "" : this.dialogform4.contract_code,
start_time: this.dialogtableData[0].departure_date, start_time: this.dialogtableData[0].departure_date,
@ -1250,7 +1308,21 @@ export default {
transportation_code: this.search_data.transportation, transportation_code: this.search_data.transportation,
acceptable_price: this.acceptable_price, acceptable_price: this.acceptable_price,
}; };
console.log(data); // console.log(data);
if (
data.is_american_route &&
data.is_nvocc &&
data.nvocc_licence_number == undefined
) {
this.$message({
message: "请填写无船承运人编号!",
type: "warning",
});
this.Savedialogloading = false;
return;
}
// console.log("");
let JGData = []; let JGData = [];
for (let index = 0; index < this.ApiNum; index++) { for (let index = 0; index < this.ApiNum; index++) {
let Fn = (index) => { let Fn = (index) => {
@ -1279,69 +1351,53 @@ export default {
this.ApiNum = 1; this.ApiNum = 1;
} }
}; };
setTimeout(() => { // setTimeout(() => {
BookingExecute(data) BookingExecute(data)
.then((res) => { .then((res) => {
// this.Savedialogloading = false; if (res.data.code == 200) {
// this.dialogVisible = false; JGData.push({
// this.ApiNum = 1; message: `${res.data.data}`,
if (res.data.code == 200) { type: "success",
// this.$message({ });
// message: `${res.data.data}`, } else {
// type: "success",
// });
JGData.push({
message: `${res.data.data}`,
type: "success",
});
} else {
JGData.push({
message: `${res.data.msg}`,
type: "warning",
});
// this.$message({
// message: `${res.data.msg}`,
// type: "warning",
// });
}
this.dialogdata = {
pol_name_pod_name: {},
total_freight_total_currency: {},
};
this.acceptable_price = "";
this.dialogtableData = [
{
vessel_voyage: "",
departure_date: "",
arrival_date: "",
end_time: "",
},
];
this.dialogform3 = {
product_name: "Cocoa powder, foodstuff",
weight: 18000,
box_num: 1,
box_web_name: "",
};
this.dialogform4 = {
radio: "1",
contract_code: "",
};
Fn(index);
})
.catch((err) => {
// this.Savedialogloading = false;
JGData.push({ JGData.push({
message: "请求错误,请稍后重试!", message: `${res.data.msg}`,
type: "warning", type: "warning",
}); });
Fn(index); }
// this.$message({ this.dialogdata = {
// message: "", pol_name_pod_name: {},
// type: "warning", total_freight_total_currency: {},
// }); };
this.acceptable_price = "";
this.dialogtableData = [
{
vessel_voyage: "",
departure_date: "",
arrival_date: "",
end_time: "",
},
];
this.dialogform3 = {
product_name: "Cocoa powder, foodstuff",
weight: 18000,
box_num: 1,
box_web_name: "",
};
this.dialogform4 = {
radio: "1",
contract_code: "",
};
Fn(index);
})
.catch((err) => {
JGData.push({
message: "请求错误,请稍后重试!",
type: "warning",
}); });
}, index * 1000); Fn(index);
});
// }, index * 1000);
} }
}, },
handleClose(done) { handleClose(done) {
@ -1764,6 +1820,20 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss">
.el-table .tableRowClassName {
font-size: 12px;
td {
padding: 5px 0;
}
}
.MskDialog > .el-dialog {
margin-top: 2vh !important;
}
.MskDialogTable {
padding: 3px 0 !important;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.CsDialogBox { .CsDialogBox {
border-top: 1px solid #e7e7e7; border-top: 1px solid #e7e7e7;
@ -1818,6 +1888,11 @@ export default {
span { span {
color: #cc0f40; color: #cc0f40;
} }
.CSBT {
width: 168px;
display: inline-block;
text-align: left;
}
} }
} }
} }
@ -1959,6 +2034,7 @@ export default {
} }
.TableSecond { .TableSecond {
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -1967,7 +2043,8 @@ export default {
// height: 105px; // height: 105px;
// } // }
.TableSecondImg { .TableSecondImg {
height: 100px; min-height: 100px;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@ -2016,6 +2093,11 @@ export default {
.TableSecondText { .TableSecondText {
text-align: left; text-align: left;
display: flex;
flex-direction: column;
justify-content: space-between;
min-height: 100px;
height: 100%;
&:first-child { &:first-child {
width: 95px; width: 95px;
flex: inherit; flex: inherit;
@ -2027,12 +2109,13 @@ export default {
padding-left: 14px; padding-left: 14px;
} }
p { p {
height: 38px; // height: 38px;
line-height: 38px; // line-height: 38px;
font-size: 14px; font-size: 14px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
padding: 5px 0 0 0;
} }
&.RightTableSecondText { &.RightTableSecondText {
p { p {

@ -14,7 +14,7 @@ module.exports = defineConfig({
proxy: { proxy: {
// 跨域处理 // 跨域处理
"/api": { "/api": {
target: "http://60.209.125.238:35300", //测试接口域名 target: "http://60.209.125.238:33434", //测试接口域名
// target: "http://118.190.106.151:3434", //正式接口域名 // target: "http://118.190.106.151:3434", //正式接口域名
changeOrigin: true, //是否跨域 changeOrigin: true, //是否跨域
pathRewrite: { pathRewrite: {

Loading…
Cancel
Save