Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jiaxing.zhou
d1dcf14c 1 parent e4926d05

feat(customerConfig): 添加加密方式字段并设置默认值 

- 在客户配置对话框中添加加密方式选择框
- 实现加密方式的默认值设置功能
- 更新权限管理，加载新的字典项
Inline Side-by-side
Showing 2 changed files with 76 additions and 22 deletions
......@@ -8,7 +8,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/relogin']
router.beforeEach((to, from, next) => {
if (to.path == '/relogin') {
next()
} else {
......@@ -24,7 +24,7 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then((res) => {
// if (res.success) {
store.dispatch('GenerateRoutes').then(accessRoutes => {
store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT','TEMPLATE_TYPE','PACKAGE_TYPE_CODE', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY','COUNTRY_REGION_CODE', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS']);
store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT','TEMPLATE_TYPE','PACKAGE_TYPE_CODE', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY','COUNTRY_REGION_CODE', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS','METHOD_OF_SIGNATURE']);
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
......
......@@ -76,12 +76,6 @@
maxlength="4"
placeholder=""
>
<!-- <el-option
v-for="(item, index) in dict.orderRequester"
:key="index"
:label="item.name"
:value="item.value"
></el-option> -->
<el-option
v-for="(item, index) in $store.getters.dict.ORDER_DECLARATION_PARTY"
:key="index"
......@@ -91,7 +85,26 @@
</el-select>
</Formitem>
</el-col>
<!-- 加密方式 -->
<el-col :span="8">
<Formitem label="加密方式" prop="methodOfSignature" type="edit">
<el-select
type="text"
id="inputInner-edit-methodOfSignature"
v-model="formData.methodOfSignature"
clearable
maxlength="4"
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.METHOD_OF_SIGNATURE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
</el-row>
<div v-if="formData.orderRequester=='2'">
<div class="checkTitle">
......@@ -220,7 +233,7 @@
class="el-icon-user-solid"
icon-class="exl"
style="font-size: 18px; color: #de002e"
/>
/>
<Tooltip
:content="formData.qingdaoFile ? formData.qingdaoFile.name : formData.qingdaoCertificatePath.split('/').pop()"
:refName="formData.qingdaoFile ? formData.qingdaoFile.name : formData.qingdaoCertificatePath.split('/').pop()"
......@@ -414,6 +427,7 @@ export default {
ecomEntEmail: "",
ecomEntName: "",
orderRequester: "",
methodOfSignature: this.getDefaultMethodOfSignature(), // 设置默认值
certificateSerialNumber: "",
certificateIndexNumber: "",
qingdaoKey: "",
......@@ -421,6 +435,7 @@ export default {
qingdaoDanyiUserDxpid:"",
qingdaoUserId: "",
qdCheck: false,
methodOfSignatureCheck: false,
bjCheck: false,
checkboxState:"",//后端要求 北京 和青岛 用这种方式传 第一个是青岛 第二个是北京
file: null,
......@@ -440,7 +455,7 @@ export default {
trigger: "blur",
message: "电商企业名称不能为空！",
},
],
orderRequester: [
{
......@@ -449,6 +464,13 @@ export default {
message: "订单申报方不能为空！",
},
],
methodOfSignature: [
{
required: true,
trigger: "change",
message: "加密方式不能为空！",
},
],
// declarationUnit18: [
// {
// required: true,
......@@ -515,8 +537,39 @@ export default {
}
}
},
type(newVal) {
if (newVal === "add") {
this.setDefaultMethodOfSignature(); // 确保默认值被设置
}
},
},
created() {
// 确保字典数据已加载
if (this.$store.getters.dict.METHOD_OF_SIGNATURE.length > 0) {
this.setDefaultMethodOfSignature();
} else {
// 监听字典数据变化
this.$store.watch(
(state) => state.dict.METHOD_OF_SIGNATURE,
(newVal) => {
if (newVal.length > 0) {
this.setDefaultMethodOfSignature();
}
}
);
}
},
methods: {
getDefaultMethodOfSignature() {
const methodOfSignatureDict = this.$store.getters.dict.METHOD_OF_SIGNATURE;
if (methodOfSignatureDict.length > 0) {
return methodOfSignatureDict[0].itemValue;
}
return "";
},
setDefaultMethodOfSignature() {
this.formData.methodOfSignature = this.getDefaultMethodOfSignature();
},
changeQDCheckBox(){
this.$forceUpdate()
if(!this.formData.qdCheck){
......@@ -557,7 +610,7 @@ export default {
fileUpload({ file }) {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.readAsDataURL(file);
reader.onload = (e) => {
console.log(e);
let obj = {
......@@ -566,12 +619,12 @@ export default {
};
this.formData.file = obj;
};
},
qingdaoFileUpload({ file }) {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.readAsDataURL(file);
reader.onload = (e) => {
console.log(e);
let obj = {
......@@ -580,7 +633,7 @@ export default {
};
this.formData.qingdaoFile = obj;
};
},
fileChange(val) {},
qingdaoFileChange(val) {},
......@@ -695,13 +748,13 @@ export default {
if (res.code === "200") {
if (this.formData.file) {
this.uploadCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.file.file,this.formData.file.name));
}
}
if (this.formData.qingdaoFile) {
this.uploadQingdaoCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.qingdaoFile.file,this.formData.qingdaoFile.name));
}
}
this.msgSuccess("客户添加成功！");
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
......@@ -713,7 +766,7 @@ export default {
});
},
uploadCertificate(ecomEntCode, file) {
uploadCertificate(ecomEntCode, file)
.then((uploadRes) => {
if (uploadRes.code === "200") {
......@@ -731,7 +784,7 @@ export default {
},
uploadQingdaoCertificate(ecomEntCode, file) {
uploadQingdaoCertificate(ecomEntCode, file)
.then((uploadRes) => {
if (uploadRes.code === "200") {
......@@ -762,7 +815,7 @@ export default {
}
this.msgSuccess("客户修改成功！");
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
......@@ -785,7 +838,7 @@ export default {
this.formData.qdCheck=checkboxStateBooleans[0];
this.formData.bjCheck=checkboxStateBooleans[1];
}
},
close() {
this.formData = {
......@@ -797,6 +850,7 @@ export default {
ecomEntEmail: "",
ecomEntName: "",
orderRequester: "",
methodOfSignature: this.getDefaultMethodOfSignature(), // 重置默认值
certificateSerialNumber: "",
certificateIndexNumber: "",
qingdaoKey: "",
......