master
张同海 1 year ago
parent 29f3dca50f
commit a4720fc21d

Binary file not shown.

@ -182,6 +182,18 @@ const DeleteTemplate = (params) => {
},
});
};
// 查询指定业务类型的计费规则
const GetPrice = (params) => {
return request({
data: {
url: "/api/Isf/GetPrice?bstype=26",
method: "get",
params,
headers: { Authorization: localStorage.getItem("token") },
},
});
};
export {
Load,
Del,
@ -200,4 +212,5 @@ export {
GetCodeCity,
ExportPDF,
DeleteTemplate,
GetPrice,
};

@ -3,7 +3,7 @@ import { Message } from "element-ui";
export default ({ data }) => {
let baseURL = "";
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"; //正式
} else {
baseURL = process.env.VUE_APP_AXIOS_BASEURL;

@ -53,6 +53,33 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@blur="BlurSelect"
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
@ -85,36 +112,25 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@blur="BlurSelect"
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
<el-form-item label="船东提单号" prop="shipMasterBillNo">
<el-input
v-model="form.shipMasterBillNo"
placeholder="请输入船东提单号"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-item>
<el-collapse-item title="进口公司信息" name="2">
<div class="BondBox">
<p>BOND选择</p>
<el-radio v-model="form.bondOwnCode" label="1">BOND</el-radio>
<el-radio v-model="form.bondOwnCode" label="2">BOND</el-radio>
<span
>注意若使用我司bond发送会产生bond使用费人民币{{ price }}</span
>
</div>
<ISFJK
:FormData="form.companyListBackup"
type="IM"
@ -126,6 +142,7 @@
:Country="CountryData"
:PropsProvincData="ProvincDataIM"
:ModuleList="ModuleList2IM"
:BondType="form.bondOwnCode"
/>
<ISFJK
:FormData="form.companyListBackup"
@ -138,6 +155,7 @@
:Country="CountryData"
:PropsProvincData="ProvincDataBY"
:ModuleList="ModuleList2BY"
:BondType="form.bondOwnCode"
/>
<ISFJK
:FormData="form.companyListBackup"
@ -150,6 +168,7 @@
:Country="CountryData"
:PropsProvincData="ProvincDataCN"
:ModuleList="ModuleList2CN"
:BondType="form.bondOwnCode"
/>
<ISFJK
:FormData="form.companyListBackup"
@ -162,6 +181,7 @@
:Country="CountryData"
:PropsProvincData="ProvincDataST"
:ModuleList="ModuleList2ST"
:BondType="form.bondOwnCode"
/>
</el-collapse-item>
<el-collapse-item title="出口公司信息" name="3">
@ -268,6 +288,33 @@
</div>
</el-dialog>
<CompanyIdDialog ref="CompanyIdDialog" />
<el-dialog
title="发送确认"
:visible.sync="dialogVisible"
width="960px"
:before-close="
() => {
dialogVisible = false;
}
"
>
<span>
您正在使用大简云的BOND来发送ISF需额外付大简云BOND服务费{{
price
}}/
</span>
<div :style="{ marginTop: '20px' }">
<el-checkbox v-model="BondCheckboxType"> </el-checkbox>
<span>
本人承诺以上所填写信息均真实有效且确保发送时间为装船前24小时否则因虚假申报或晚申报导致的一切后果如被目的港退回罚款<br />
一律由我司自行承担与平台无关
</span>
</div>
<span slot="footer" class="dialog-footer" v-if="BondCheckboxType">
<el-button type="primary" @click="dialogVisibleOK"></el-button>
</span>
</el-dialog>
</div>
</template>
<script>
@ -284,6 +331,7 @@ import {
GetTemplate,
GetCodeProvince,
GetCodeCity,
GetPrice,
} from "@/api/views/AmsIndex";
import { companyListBackup } from "./js/Data";
import CompanyIdDialog from "./components/CompanyIdDialog.vue";
@ -293,7 +341,11 @@ export default {
components: { CompanyIdDialog, ISFJK },
data() {
return {
price: "*",
FunUpDataC: "",
activeNames: ["1", "2", "3", "4"],
dialogVisible: false,
BondCheckboxType: true,
form: {
dischargeHarbourCode: "", //
deliveryHarbourCode: "", //
@ -303,6 +355,7 @@ export default {
shipmentTypeCode: "01", //
companyListBackup: companyListBackup(),
companyList: [],
bondOwnCode: "1",
},
CargosList: [{ hstCode: "" }],
rules: {
@ -313,6 +366,7 @@ export default {
inFoType: [{ required: true, message: "请选择申报类型" }],
blTypeCode: [{ required: true, message: "请选择提单类型" }],
mblno: [{ required: true, message: "请填写AMS B/L NO" }],
shipMasterBillNo: [{ required: true, message: "请填写船东提单号" }],
shipmentTypeCode: [{ required: true, message: "请选择船运货物类型" }],
},
rules1: {
@ -441,6 +495,7 @@ export default {
ListData: {
immediate: true,
handler(newData) {
console.log(newData);
if (this.$store.state.editableTabsValue != 0) {
if (!newData.gid) {
Object.assign(this.$data.form, this.$options.data().form);
@ -513,6 +568,18 @@ export default {
}
},
GetData() {
GetPrice().then((res) => {
if (res.data.code == 200) {
this.price = res.data.result.price;
} else {
this.$message({
message: "查询ISF计费规则失败",
type: "warning",
showClose: true,
duration: 0,
});
}
});
GetCountry().then((res) => {
this.CountryData_original = res.data.result;
this.CountryData_original.forEach((item) => {
@ -764,6 +831,16 @@ export default {
this.form.deliveryHarbourCode = item.code;
this.form.deliveryHarbourName = item.value;
},
FunUpData(res) {
Send({ ids: res.data.data, msgType: "1" }).then((res) => {
if (res.data.code == 200) {
this.$message({
message: "发送成功",
type: "success",
});
}
});
},
// 稿
FunSave(FunType) {
let refFormtype = true;
@ -835,14 +912,12 @@ export default {
}
});
if (refFormtype) {
Send({ ids: res.data.data, msgType: "1" }).then((res) => {
if (res.data.code == 200) {
this.$message({
message: "发送成功",
type: "success",
});
if (form.bondOwnCode == "2") {
this.dialogVisible = true;
this.FunUpDataC = res;
} else {
this.FunUpData(res);
}
});
} else {
this.$message({
message: "请填写必填内容!",
@ -866,6 +941,11 @@ export default {
type: "success",
});
}
} else {
this.$message({
message: res.data.message,
type: "success",
});
}
});
} else {
@ -878,7 +958,10 @@ export default {
}
}
},
dialogVisibleOK() {
this.dialogVisible = false;
this.FunUpData(this.FunUpDataC);
},
//
FunCopy() {
let DelArr = ["gid", "isDel", "pid", "hid", "hblNo"];
@ -1006,4 +1089,18 @@ export default {
cursor: pointer;
color: #a8a8a8;
}
.BondBox {
display: flex;
align-items: center;
margin: 16px 0 -32px 32px;
p {
font-size: 20px;
font-weight: bold;
margin-right: 16px;
margin-top: -5px;
}
span {
color: red;
}
}
</style>

@ -53,6 +53,33 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -86,30 +113,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
<el-form-item label="船东提单号" prop="shipMasterBillNo">
<el-input
v-model="form.shipMasterBillNo"
placeholder="请输入船东提单号"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -721,6 +729,7 @@ export default {
inFoType: [{ required: true, message: "请选择申报类型" }],
blTypeCode: [{ required: true, message: "请选择提单类型" }],
mblno: [{ required: true, message: "请填写AMS B/L NO" }],
shipMasterBillNo: [{ required: true, message: "请填写船东提单号" }],
shipmentTypeCode: [{ required: true, message: "请选择船运货物类型" }],
},
rules1: {

@ -98,7 +98,9 @@
<el-form-item
label="公司ID"
prop="companyId"
:rules="[
:rules="
BondType == '1'
? [
{ required: true, message: '请填写 ID' },
{
validator: (rule, value, callback) => {
@ -106,7 +108,9 @@
},
trigger: ['blur', 'change'],
},
]"
]
: []
"
>
<i class="el-icon-question" @click="FnOpenDialog"></i>
<el-input
@ -292,6 +296,7 @@ export default {
"Country",
"PropsProvincData",
"ModuleList",
"BondType",
],
computed: {
form: {

@ -198,6 +198,33 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
@ -231,30 +258,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
<el-form-item label="船东提单号" prop="shipMasterBillNo">
<el-input
v-model="form.shipMasterBillNo"
placeholder="请输入船东提单号"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -268,6 +276,16 @@
:rules="rules1"
:disabled="form.EditType == '查看'"
>
<div class="BondBox">
<p>BOND选择</p>
<el-radio v-model="form.bondOwnCode" label="1">BOND</el-radio>
<el-radio v-model="form.bondOwnCode" label="2">BOND</el-radio>
<span
>注意若使用我司bond发送会产生bond使用费人民币{{
price
}}</span
>
</div>
<!-- 进口商信息 (IM) -->
<el-col :span="23">
<div class="mini_title">
@ -319,7 +337,9 @@
<el-form-item
label="公司ID"
prop="companyId"
:rules="[
:rules="
form.bondOwnCode == '1'
? [
{ required: true, message: '请填写 ID' },
{
validator: (rule, value, callback) => {
@ -327,7 +347,9 @@
},
trigger: ['blur', 'change'],
},
]"
]
: ''
"
>
<i class="el-icon-question" @click="FnOpenDialog"></i>
<el-input
@ -572,7 +594,9 @@
<el-form-item
label="公司ID"
prop="companyId"
:rules="[
:rules="
form.bondOwnCode == '1'
? [
{ required: true, message: '请填写 ID' },
{
validator: (rule, value, callback) => {
@ -580,7 +604,9 @@
},
trigger: ['blur', 'change'],
},
]"
]
: ''
"
>
<i class="el-icon-question" @click="FnOpenDialog"></i>
<el-input
@ -825,7 +851,9 @@
<el-form-item
label="公司ID"
prop="companyId"
:rules="[
:rules="
form.bondOwnCode == '1'
? [
{ required: true, message: '请填写 ID' },
{
validator: (rule, value, callback) => {
@ -833,7 +861,9 @@
},
trigger: ['blur', 'change'],
},
]"
]
: ''
"
>
<i class="el-icon-question" @click="FnOpenDialog"></i>
<el-input
@ -1078,7 +1108,9 @@
<el-form-item
label="公司ID"
prop="companyId"
:rules="[
:rules="
form.bondOwnCode == '1'
? [
{ required: true, message: '请填写 ID' },
{
validator: (rule, value, callback) => {
@ -1086,7 +1118,9 @@
},
trigger: ['blur', 'change'],
},
]"
]
: ''
"
>
<i class="el-icon-question" @click="FnOpenDialog"></i>
<el-input
@ -2020,6 +2054,33 @@
</div>
</el-dialog>
<CompanyIdDialog ref="CompanyIdDialog" />
<el-dialog
title="发送确认"
:visible.sync="dialogVisible"
width="960px"
:before-close="
() => {
dialogVisible = false;
}
"
>
<span>
您正在使用大简云的BOND来发送ISF需额外付大简云BOND服务费{{
price
}}/
</span>
<div :style="{ marginTop: '20px' }">
<el-checkbox v-model="BondCheckboxType"> </el-checkbox>
<span>
本人承诺以上所填写信息均真实有效且确保发送时间为装船前24小时否则因虚假申报或晚申报导致的一切后果如被目的港退回罚款<br />
一律由我司自行承担与平台无关
</span>
</div>
<span slot="footer" class="dialog-footer" v-if="BondCheckboxType">
<el-button type="primary" @click="dialogVisibleOK"></el-button>
</span>
</el-dialog>
</div>
</template>
<script>
@ -2035,6 +2096,7 @@ import {
SaveTemplate,
GetTemplate,
GetCodeCity,
GetPrice,
ExportPDF,
GetCodeProvince,
} from "@/api/views/AmsIndex";
@ -2047,7 +2109,12 @@ export default {
data() {
return {
moment,
price: "*",
FunUpDataC: "",
FormC: {},
activeNames: ["0", "1", "2", "3", "4"],
dialogVisible: false,
BondCheckboxType: true,
form: {
dischargeHarbourCode: "", //
deliveryHarbourCode: "", //
@ -2057,6 +2124,7 @@ export default {
shipmentTypeCode: "", //
companyListBackup: companyListBackup(),
companyList: [],
bondOwnCode: "1",
},
CargosList: [{ hstCode: "" }],
rules: {
@ -2067,6 +2135,7 @@ export default {
inFoType: [{ required: true, message: "请选择申报类型" }],
blTypeCode: [{ required: true, message: "请选择提单类型" }],
mblno: [{ required: true, message: "请填写AMS B/L NO" }],
shipMasterBillNo: [{ required: true, message: "请填写船东提单号" }],
shipmentTypeCode: [{ required: true, message: "请选择船运货物类型" }],
},
rules1: {
@ -2282,6 +2351,18 @@ export default {
}
},
GetData() {
GetPrice().then((res) => {
if (res.data.code == 200) {
this.price = res.data.result.price;
} else {
this.$message({
message: "查询ISF计费规则失败",
type: "warning",
showClose: true,
duration: 0,
});
}
});
GetCountry().then((res) => {
this.CountryData_original = res.data.result;
this.CountryData_original.forEach((item) => {
@ -2608,6 +2689,24 @@ export default {
});
}
},
FunUpData(res, form) {
console.log(res, form);
console.log({
ids: res.data.data,
msgType: form.EditType == "复制" ? "1" : "2",
});
Send({
ids: res.data.data,
msgType: form.EditType == "复制" ? "1" : "2",
}).then((res) => {
if (res.data.code == 200) {
this.$message({
message: "发送成功",
type: "success",
});
}
});
},
// 稿
FunSave(FunType) {
if (this.form.EditType == "查看") {
@ -2668,17 +2767,13 @@ export default {
}
});
if (refFormtype) {
Send({
ids: res.data.data,
msgType: form.EditType == "复制" ? "1" : "2",
}).then((res) => {
if (res.data.code == 200) {
this.$message({
message: "发送成功",
type: "success",
});
if (form.bondOwnCode == "2") {
this.dialogVisible = true;
this.FunUpDataC = res;
this.FormC = form;
} else {
this.FunUpData(res, form);
}
});
} else {
this.$message({
message: "请填写必填内容!",
@ -2715,6 +2810,10 @@ export default {
}
}
},
dialogVisibleOK() {
this.dialogVisible = false;
this.FunUpData(this.FunUpDataC, this.FormC);
},
//
FunDel() {
Send({ ids: this.form.gid, msgType: "3" }).then((res) => {
@ -2853,4 +2952,18 @@ export default {
cursor: pointer;
color: #a8a8a8;
}
.BondBox {
display: flex;
align-items: center;
margin: 0px 0 0px 32px;
p {
font-size: 20px;
font-weight: bold;
margin-right: 16px;
margin-top: -5px;
}
span {
color: red;
}
}
</style>

@ -198,6 +198,33 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -232,30 +259,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="船运货物类型" prop="shipmentTypeCode">
<!-- <el-input v-model="form.name"></el-input> -->
<el-select
clearable
v-model="form.shipmentTypeCode"
filterable
@change="
(e) =>
SelectChange(
e,
this.shipmentTypeCodeData,
'shipmentTypeName'
)
"
placeholder="请选择船运货物类型"
>
<el-option
v-for="item in shipmentTypeCodeData"
:key="item.code"
:label="item.value"
:value="item.code"
>
</el-option>
</el-select>
<el-form-item label="船东提单号" prop="shipMasterBillNo">
<el-input
v-model="form.shipMasterBillNo"
placeholder="请输入船东提单号"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -874,6 +882,7 @@ export default {
inFoType: [{ required: true, message: "请选择申报类型" }],
blTypeCode: [{ required: true, message: "请选择提单类型" }],
mblno: [{ required: true, message: "请填写AMS B/L NO" }],
shipMasterBillNo: [{ required: true, message: "请填写船东提单号" }],
shipmentTypeCode: [{ required: true, message: "请选择船运货物类型" }],
},
rules1: {

@ -14,14 +14,14 @@ module.exports = defineConfig({
proxy: {
// 跨域处理
"/api": {
target: "http://60.209.125.238:35107/api", //目标接口域名
target: "http://60.209.125.238:30817/api", //目标接口域名
changeOrigin: true, //是否跨域
pathRewrite: {
"^/api": "", //重写接口
},
},
"/ams/Ams": {
target: "http://60.209.125.238:35105", //目标接口域名
target: "http://60.209.125.238:30817", //目标接口域名
changeOrigin: true, //是否跨域
pathRewrite: {
"^/ams/Ams": "", //重写接口

Loading…
Cancel
Save