zth
/
VueISF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复问题

Browse Source
master
sunzehua 1 month ago
parent 6cfc7ee6c5
commit cbf358e615
10 changed files with 165 additions and 85 deletions
Show Stats Download Patch File Download Diff File

84
package-lock.json generated
Unescape Escape View File

@ -1916,49 +1916,6 @@
"webpack-merge": "^5.7.3", "webpack-merge": "^5.7.3",
"webpack-virtual-modules": "^0.4.2", "webpack-virtual-modules": "^0.4.2",
"whatwg-fetch": "^3.6.2" "whatwg-fetch": "^3.6.2"
},
"dependencies": {
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.10.0",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
}
},
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.0",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
}
} }
}, },
"@vue/cli-shared-utils": { "@vue/cli-shared-utils": {
@ -2104,6 +2061,47 @@
} }
} }
}, },
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
},
"json5": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
}
}
},
"@vue/web-component-wrapper": { "@vue/web-component-wrapper": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",

30
src/views/ISF/Edit.vue
Unescape Escape View File

@ -1,9 +1,9 @@
<template> <template>
<div class="main"> <div class="main">
<div class="head"> <div class="head">
<el-button type="primary" @click="FunSave('Send')">发送</el-button> <el-button type="primary" :disabled="sendFlag" @click="FunSave('Send')">发送</el-button>
<el-button type="primary" plain @click="FunSave">保存草稿</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunSave">保存草稿</el-button>
<el-button type="primary" plain @click="FunCopy()">复制</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunCopy()">复制</el-button>
</div> </div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="提单信息" name="1"> <el-collapse-item title="提单信息" name="1">
@ -363,7 +363,7 @@
placeholder="请选择ID类型" placeholder="请选择ID类型"
> >
<el-option <el-option
v-for="item in idTypeCodeData" v-for="item in idTypeCodeDataJK"
:key="item.code" :key="item.code"
:label="item.value" :label="item.value"
:value="item.code" :value="item.code"
@ -1801,7 +1801,22 @@ export default {
// value: "SSN", // value: "SSN",
// }, // },
], ],
idTypeCodeDataJK: [
{
code: "EI",
value: "IRS NO.",
},
{
code: "ANI",
value: "CBP Assigend NO.",
},
{
code: "SSN",
value: "SSN",
},
],
CountryData_original: [], CountryData_original: [],
sendFlag:false,
CountryData: [], CountryData: [],
dialogFormVisible: false, dialogFormVisible: false,
ModuleData: { ModuleData: {
@ -2114,14 +2129,19 @@ export default {
}); });
} }
if (FunType == "Send") { if (FunType == "Send") {
this.sendFlag = true;
Send({ ids: res.data.data, msgType: "1" }).then((res) => { Send({ ids: res.data.data, msgType: "1" }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message({ this.$message({
message: "发送成功", message: "发送成功",
type: "success", type: "success",
}); });
} else {
this.sendFlag = false
} }
}); }).catch(()=>{
this.sendFlag = false
})
} else { } else {
// Del(); // Del();
} }

12
src/views/ISF/Edit10.vue
Unescape Escape View File

@ -1,9 +1,9 @@
<template> <template>
<div class="main"> <div class="main">
<div class="head"> <div class="head">
<el-button type="primary" @click="FunSave('Send')">发送</el-button> <el-button type="primary" :disabled="sendFlag" @click="FunSave('Send')">发送</el-button>
<el-button type="primary" plain @click="FunSave">保存草稿</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunSave">保存草稿</el-button>
<el-button type="primary" plain @click="FunCopy()">复制</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunCopy()">复制</el-button>
</div> </div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="提单信息" name="1"> <el-collapse-item title="提单信息" name="1">
@ -344,6 +344,7 @@ export default {
price: "*", price: "*",
FunUpDataC: "", FunUpDataC: "",
activeNames: ["1", "2", "3", "4"], activeNames: ["1", "2", "3", "4"],
sendFlag:false,
dialogVisible: false, dialogVisible: false,
BondCheckboxType: true, BondCheckboxType: true,
form: { form: {
@ -832,13 +833,18 @@ export default {
this.form.deliveryHarbourName = item.value; this.form.deliveryHarbourName = item.value;
}, },
FunUpData(res) { FunUpData(res) {
this.sendFlag = true;
Send({ ids: res.data.data, msgType: "1" }).then((res) => { Send({ ids: res.data.data, msgType: "1" }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message({ this.$message({
message: "发送成功", message: "发送成功",
type: "success", type: "success",
}); });
} else {
this.sendFlag = false
} }
}).catch(() => {
this.sendFlag = false
}); });
}, },
// 保存草稿 // 保存草稿

16
src/views/ISF/Edit10_old.vue
Unescape Escape View File

@ -191,7 +191,7 @@
placeholder="请选择ID类型" placeholder="请选择ID类型"
> >
<el-option <el-option
v-for="item in idTypeCodeData" v-for="item in idTypeCodeDataJK"
:key="item.code" :key="item.code"
:label="item.value" :label="item.value"
:value="item.code" :value="item.code"
@ -2026,6 +2026,20 @@ export default {
// value: "SSN", // value: "SSN",
// }, // },
], ],
idTypeCodeDataJK: [
{
code: "EI",
value: "IRS NO.",
},
{
code: "ANI",
value: "CBP Assigend NO.",
},
{
code: "SSN",
value: "SSN",
},
],
CountryData_original: [], CountryData_original: [],
CountryData: [], CountryData: [],
dialogFormVisible: false, dialogFormVisible: false,

25
src/views/ISF/Edit5.vue
Unescape Escape View File

@ -1,9 +1,9 @@
<template> <template>
<div class="main"> <div class="main">
<div class="head"> <div class="head">
<el-button type="primary" @click="FunSave('Send')">发送</el-button> <el-button type="primary" :disabled="sendFlag" @click="FunSave('Send')">发送</el-button>
<el-button type="primary" plain @click="FunSave">保存草稿</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunSave">保存草稿</el-button>
<el-button type="primary" plain @click="FunCopy()">复制</el-button> <el-button type="primary" :disabled="sendFlag" plain @click="FunCopy()">复制</el-button>
</div> </div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="提单信息" name="1"> <el-collapse-item title="提单信息" name="1">
@ -710,6 +710,7 @@ export default {
data() { data() {
return { return {
activeNames: ["1", "2", "3", "4"], activeNames: ["1", "2", "3", "4"],
sendFlag:false,
form: { form: {
dischargeHarbourCode: "", //外国卸货港 dischargeHarbourCode: "", //外国卸货港
deliveryHarbourCode: "", //交货地 deliveryHarbourCode: "", //交货地
@ -1125,6 +1126,13 @@ export default {
this[`ProvincData${item2}`] = res.data.result; this[`ProvincData${item2}`] = res.data.result;
}); });
} }
if (this.form.companyListBackup[item2].provinceCode) {
GetCodeCity({
provinceCode: this.form.companyListBackup[item2].provinceCode,
}).then((res) => {
this.CityData = res.data.result;
});
}
}); });
// }); // });
}, },
@ -1246,16 +1254,19 @@ export default {
} }
}); });
if (refFormtype) { if (refFormtype) {
Send({ ids: res.data.data, msgType: "1" }).then( this.sendFlag = true;
(res) => { Send({ ids: res.data.data, msgType: "1" }).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message({ this.$message({
message: "发送成功", message: "发送成功",
type: "success", type: "success",
}); });
} else {
this.sendFlag = false;
} }
} }).catch(() => {
); this.sendFlag = false;
});
} else { } else {
this.$message({ this.$message({
message: "请填写必填内容！", message: "请填写必填内容！",

10
src/views/ISF/components/CompanyIdDialog.vue
Unescape Escape View File

@ -41,11 +41,11 @@ export default {
// name: "CCCCCCCCCCC", // name: "CCCCCCCCCCC",
// address: "11", // address: "11",
// }, // },
// { {
// date: "SSN", date: "SSN",
// name: "NNN-NN-NNNN", name: "NNN-NN-NNNN",
// address: "11", address: "11",
// }, },
], ],
}; };
}, },

12
src/views/ISF/components/ISFJK.vue
Unescape Escape View File

@ -329,14 +329,10 @@ export default {
code: "ANI", code: "ANI",
value: "CBP Assigend NO.", value: "CBP Assigend NO.",
}, },
// { {
// code: "CBP Encrypted NO.", code: "SSN",
// value: "CBP Encrypted NO.", value: "SSN",
// }, },
// {
// code: "SSN",
// value: "SSN",
// },
], ],
CountryData_original: [], CountryData_original: [],
rules1: { rules1: {

17
src/views/send/Edit.vue
Unescape Escape View File

@ -433,7 +433,7 @@
placeholder="请选择ID类型" placeholder="请选择ID类型"
> >
<el-option <el-option
v-for="item in idTypeCodeData" v-for="item in idTypeCodeDataJK"
:key="item.code" :key="item.code"
:label="item.value" :label="item.value"
:value="item.code" :value="item.code"
@ -1899,7 +1899,20 @@ export default {
// value: "SSN", // value: "SSN",
// }, // },
], ],
idTypeCodeDataJK: [
{
code: "EI",
value: "IRS NO.",
},
{
code: "ANI",
value: "CBP Assigend NO.",
},
{
code: "SSN",
value: "SSN",
},
],
ModuleList1ST: "", ModuleList1ST: "",
ModuleList1BKP: "", ModuleList1BKP: "",
ModuleList2IM: "", ModuleList2IM: "",

37
src/views/send/Edit10.vue
Unescape Escape View File

@ -324,7 +324,7 @@
placeholder="请选择ID类型" placeholder="请选择ID类型"
> >
<el-option <el-option
v-for="item in idTypeCodeData" v-for="item in idTypeCodeDataJK"
:key="item.code" :key="item.code"
:label="item.value" :label="item.value"
:value="item.code" :value="item.code"
@ -2223,14 +2223,20 @@ export default {
code: "ANI", code: "ANI",
value: "CBP Assigend NO.", value: "CBP Assigend NO.",
}, },
// { ],
// code: "CBP Encrypted NO.", idTypeCodeDataJK: [
// value: "CBP Encrypted NO.", {
// }, code: "EI",
// { value: "IRS NO.",
// code: "SSN", },
// value: "SSN", {
// }, code: "ANI",
value: "CBP Assigend NO.",
},
{
code: "SSN",
value: "SSN",
},
], ],
ModuleList2IM: "", ModuleList2IM: "",
ModuleList2ST: "", ModuleList2ST: "",
@ -2564,6 +2570,13 @@ export default {
this[`ProvincData${item2}`] = res.data.result; this[`ProvincData${item2}`] = res.data.result;
}); });
} }
if (this.form.companyListBackup[item2].provinceCode) {
GetCodeCity({
provinceCode: this.form.companyListBackup[item2].provinceCode,
}).then((res) => {
this.CityData = res.data.result;
});
}
}); });
// }); // });
}, },
@ -2723,12 +2736,14 @@ export default {
form.hstCode = `${form.hstCode},${item.hstCode}`; form.hstCode = `${form.hstCode},${item.hstCode}`;
} }
}); });
const arr = []
Object.keys(this.form.companyListBackup).forEach((key) => { Object.keys(this.form.companyListBackup).forEach((key) => {
this.form.companyList.push({ arr.push({
...this.form.companyListBackup[key], ...this.form.companyListBackup[key],
companyType: key, companyType: key,
}); })
}); });
this.form.companyList = arr
if (this.form.gid == "CopyData") { if (this.form.gid == "CopyData") {
delete this.form.gid; delete this.form.gid;
} }

7
src/views/send/Edit5.vue
Unescape Escape View File

@ -1270,6 +1270,13 @@ export default {
this[`ProvincData${item2}`] = res.data.result; this[`ProvincData${item2}`] = res.data.result;
}); });
} }
if (this.form.companyListBackup[item2].provinceCode) {
GetCodeCity({
provinceCode: this.form.companyListBackup[item2].provinceCode,
}).then((res) => {
this.CityData = res.data.result;
});
}
}); });
// }); // });
}, },

Write Preview
Loading…
Cancel
Save