diff --git a/src/assets/logo.png b/src/assets/logo.png
index 6554322..ddcf10f 100644
Binary files a/src/assets/logo.png and b/src/assets/logo.png differ
diff --git a/src/assets/logo2x.png b/src/assets/logo2x.png
new file mode 100644
index 0000000..74b8435
Binary files /dev/null and b/src/assets/logo2x.png differ
diff --git a/src/assets/logo3x.png b/src/assets/logo3x.png
new file mode 100644
index 0000000..d8f78b7
Binary files /dev/null and b/src/assets/logo3x.png differ
diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue
index 6302695..c03f53a 100644
--- a/src/components/Header/Header.vue
+++ b/src/components/Header/Header.vue
@@ -28,7 +28,7 @@ export default {
props:{},
data() {
return {
- logo: require('@/assets/logo_header01.png')
+ logo: require('@/assets/logo.png')
};
},
beforeCreate() {
@@ -65,7 +65,7 @@ export default {
padding: 0 30px;
.logo_wrap{
img{
- width: 60px;
+ // width: 60px;
height: 60px;
}
}
diff --git a/src/components/Header/onlyHeader.vue b/src/components/Header/onlyHeader.vue
index 09a699d..50bca7d 100644
--- a/src/components/Header/onlyHeader.vue
+++ b/src/components/Header/onlyHeader.vue
@@ -13,7 +13,7 @@ export default {
props:{},
data() {
return {
- logo: require('@/assets/logo_header01.png')
+ logo: require('@/assets/logo.png')
};
},
beforeCreate() {
@@ -50,7 +50,7 @@ export default {
padding: 0 30px;
.logo_wrap{
img{
- width: 60px;
+ // width: 60px;
height: 60px;
}
}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0ea31fe..6701286 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -183,9 +183,9 @@
}
},
computed: {
- donation() {
- return require('@/assets/logo.png')
- },
+ // donation() {
+ // return require('@/assets/logo.png')
+ // },
user() {
return this.$store.state.account.user
},
diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/show.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/show.vue
index fbcceef..7e21191 100644
--- a/src/views/fids/enterpriseManagement/enterpriseCertification/components/show.vue
+++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/show.vue
@@ -14,7 +14,8 @@
1. 基础用户通过填写资质信息。
2. 成功提交资质信息后，请耐心等待审核员进行审核。
- 3. 审核通过后，如若资质信息有变更，请及时进行修改。
+
+ 3. 审核通过后，如若资质信息有变更，请及时联系管理员。
4. 被驳回后，请详细核查驳回原因，更正后可继续提交审核。
diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue
index 3e9370b..4e3ebd3 100644
--- a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue
+++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step1.vue
@@ -63,7 +63,7 @@
-
+
-
+
-
+
= this.limitCount;
},
//联系人正面变更
@@ -713,16 +713,16 @@ export default {
},
//联系人反面照成功
handSuccessRearContactsId(file) {
- this.stepData1.contactCrtBackImgRid = file.data.idisResult
+ // this.stepData1.contactCrtBackImgRid = file.data.idisResult
this.stepData1.contactCrtBackImgUrl = file.data.url
this.contactCrtBackImgFile.push({name: file.data.filename, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step1.validateField('contactCrtBackImgRid')
+ this.$refs.step1.validateField('contactCrtBackImgUrl')
},
//联系人反面照删除
handleRemoveRearContactsId(file, fileList) {
- this.stepData1.contactCrtBackImgRid = ''
+ // this.stepData1.contactCrtBackImgRid = ''
this.contactCrtBackImgFile = fileList
- this.$refs.step1.validateField('contactCrtBackImgRid')
+ this.$refs.step1.validateField('contactCrtBackImgUrl')
this.hideContactsR = fileList.length >= this.limitCount;
},
//联系人反面变更
@@ -734,16 +734,16 @@ export default {
//法人相关
//法人正面照成功
handSuccessLegalId(file) {
- this.stepData1.legalCrtFrontImgRid = file.data.idisResult
+ // this.stepData1.legalCrtFrontImgRid = file.data.idisResult
this.stepData1.legalCrtFrontImgUrl = file.data.url
this.legalCrtFrontImgFile.push({name: file.data.filename, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step1.validateField('legalCrtFrontImgRid')
+ this.$refs.step1.validateField('legalCrtFrontImgUrl')
},
//法人正面照删除
handleRemoveLegalId(file, fileList) {
- this.stepData1.legalCrtFrontImgRid = ''
+ // this.stepData1.legalCrtFrontImgRid = ''
this.legalCrtFrontImgFile = fileList
- this.$refs.step1.validateField('legalCrtFrontImgRid')
+ this.$refs.step1.validateField('legalCrtFrontImgUrl')
this.hideUploadF = fileList.length >= this.limitCount;
},
//法人正面图片变更
@@ -752,16 +752,16 @@ export default {
},
//法人反面成功
handSuccessRearLegalID(file) {
- this.stepData1.legalCrtBackImgRid = file.data.idisResult
+ // this.stepData1.legalCrtBackImgRid = file.data.idisResult
this.stepData1.legalCrtBackImgUrl = file.data.url
this.legalCrtBackImgFile.push({name: file.data.filename, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step1.validateField('legalCrtBackImgRid')
+ this.$refs.step1.validateField('legalCrtBackImgUrl')
},
//法人反面删除
handleRemoveRearLegalID(file, fileList) {
- this.stepData1.legalCrtBackImgRid = ''
+ // this.stepData1.legalCrtBackImgRid = ''
this.legalCrtBackImgFile = fileList
- this.$refs.step1.validateField('legalCrtBackImgRid')
+ this.$refs.step1.validateField('legalCrtBackImgUrl')
this.hideUploadR = fileList.length >= this.limitCount;
},
//法人反面变更
@@ -778,18 +778,18 @@ export default {
},
//企业认证资料删除
handleRemoveCompany(file, fileList) {
- this.stepData1.orgCrtImgRid = ''
+ // this.stepData1.orgCrtImgRid = ''
this.orgCrtImgFile = fileList
- this.$refs.step1.validateField('orgCrtImgRid')
+ this.$refs.step1.validateField('orgCrtImgUrl')
this.hideUpCompany = fileList.length >= this.limitCount;
},
//企业认证资料成功
handSuccessCompany(file) {
- this.stepData1.orgCrtImgRid = file.data.idisResult
+ // this.stepData1.orgCrtImgRid = file.data.idisResult
this.stepData1.orgCrtImgUrl = file.data.url
this.orgCrtImgFile.push({name: file.data.filename, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step1.validateField('orgCrtImgRid')
+ this.$refs.step1.validateField('orgCrtImgUrl')
},
diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue
index 5a18399..8de93e1 100644
--- a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue
+++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step2.vue
@@ -135,7 +135,7 @@
-
+
-
+
= this.limitCount;
},
handleRemoveServSysBuild(file, fileList) {
- this.stepData2.servSysBuildContractFileRid = ''
+ // this.stepData2.servSysBuildContractFileRid = ''
this.stepData2.servSysBuildContractFileUrl = ''
this.stepData2.servSysBuildContractFileName = ''
this.servSysBuildFile = fileList
- this.$refs.step2.validateField('servSysBuildContractFileRid')
+ this.$refs.step2.validateField('servSysBuildContractFileUrl')
this.hideServSysBuild = fileList.length >= this.limitCount;
},
handlePictureCardPreviewServSysBuild(file) {
@@ -529,22 +529,22 @@ export default {
this.dialogVisible = true;
},
handSuccessServSysBuild(file) {
- this.stepData2.servSysBuildContractFileRid = file.data.idisResult
+ // this.stepData2.servSysBuildContractFileRid = file.data.idisResult
this.stepData2.servSysBuildContractFileUrl = file.data.url
this.stepData2.servSysBuildContractFileName = file.data.submittedFileName
this.servSysBuildFile.push({name: file.data.submittedFileName, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step2.validateField('servSysBuildContractFileRid')
+ this.$refs.step2.validateField('servSysBuildContractFileUrl')
},
//运营
handleChangeServSysOper(files, fileList) {
this.hideServSysOper = fileList.length >= this.limitCount;
},
handleRemoveServSysOper(file, fileList) {
- this.stepData2.servSysOperContractFileRid = ''
+ // this.stepData2.servSysOperContractFileRid = ''
this.stepData2.servSysOperContractFileUrl = ''
this.stepData2.servSysOperContractFileName = ''
this.servSysOperFile = fileList
- this.$refs.step2.validateField('servSysOperContractFileRid')
+ this.$refs.step2.validateField('servSysOperContractFileUrl')
this.hideServSysOper = fileList.length >= this.limitCount;
},
handlePictureCardPreviewServSysOper(file) {
@@ -552,11 +552,11 @@ export default {
this.dialogVisible = true;
},
handSuccessServSysOper(file) {
- this.stepData2.servSysOperContractFileRid = file.data.idisResult
+ // this.stepData2.servSysOperContractFileRid = file.data.idisResult
this.stepData2.servSysOperContractFileUrl = file.data.url
this.stepData2.servSysOperContractFileName = file.data.submittedFileName
this.servSysOperFile.push({name: file.data.submittedFileName, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step2.validateField('servSysOperContractFileRid')
+ this.$refs.step2.validateField('servSysOperContractFileUrl')
},
}
}
diff --git a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue
index d4d1276..9bc7044 100644
--- a/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue
+++ b/src/views/fids/enterpriseManagement/enterpriseCertification/components/step3.vue
@@ -16,7 +16,7 @@
-
+
-
+
{
- if(this.stepData3.dataHostingContractFileRid && !value)
+ if(this.stepData3.dataHostingContractFileUrl && !value)
{
return callback(new Error("请输入数据托管单位名称"));
} else {
@@ -173,7 +173,7 @@ export default {
}
};
const checkServHostingOrg = (rule, value, callback) => {
- if(this.stepData3.servHostingContractFileRid && !value)
+ if(this.stepData3.servHostingContractFileUrl && !value)
{
return callback(new Error("请输入数据托管单位名称"));
} else {
@@ -191,10 +191,10 @@ export default {
return {
stepData3: {
dataHostingOrg:"", //数据托管单位
- dataHostingContractFileRid:"", //数据托管合同
+ // dataHostingContractFileRid:"", //数据托管合同
dataHostingContractFileUrl:"", //数据托管合同--url
servHostingOrg:"", //服务托管单位
- servHostingContractFileRid:"", //服务托管合同
+ // servHostingContractFileRid:"", //服务托管合同
servHostingContractFileUrl:"", //服务托管合同--url
entInfoSerIndustries:[], //服务行业（可以添加多组）
// entInfoSerIndustries.industryCategory:"", //服务行业门类
@@ -221,7 +221,7 @@ export default {
{validator: checkDataHostingOrg, trigger: "blur"},
{min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur'}
],
- dataHostingContractFileRid:[
+ dataHostingContractFileUrl:[
{validator: checkDataHostRid, trigger: "blur"}
],
@@ -229,7 +229,7 @@ export default {
{validator: checkServHostingOrg, trigger: "blur"},
{min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur'}
],
- servHostingContractFileRid:[
+ servHostingContractFileUrl:[
{validator: checkServHostRid, trigger: "blur"}
]
},
@@ -400,20 +400,20 @@ export default {
},
//数据托管-删除
handleRemoveDataTrustee(file, fileList) {
- this.stepData3.dataHostingContractFileRid = ''
+ // this.stepData3.dataHostingContractFileRid = ''
this.stepData3.dataHostingContractFileUrl = ''
this.stepData3.dataHostingContractFileName = ''
this.dataTrusteeFile = fileList
- // this.$refs.step3.validateField('dataHostingContractFileRid')
+ // this.$refs.step3.validateField('dataHostingContractFileUrl')
this.hideDataTrustee = fileList.length >= this.limitCount;
},
//数据托管-成功
handSuccessDataTrustee(file) {
- this.stepData3.dataHostingContractFileRid = file.data.idisResult
+ // this.stepData3.dataHostingContractFileRid = file.data.idisResult
this.stepData3.dataHostingContractFileUrl = file.data.url
this.stepData3.dataHostingContractFileName = file.data.submittedFileName
this.dataTrusteeFile.push({name: file.data.submittedFileName, url: file.data.url, bizType: file.data.bizType})
- // this.$refs.step3.validateField('dataHostingContractFileRid')
+ // this.$refs.step3.validateField('dataHostingContractFileUrl')
},
//服务托管-变更
@@ -422,20 +422,20 @@ export default {
},
//服务托管-删除
handleRemoveServiceTrustee(file, fileList) {
- this.stepData3.servHostingContractFileRid = ''
+ // this.stepData3.servHostingContractFileRid = ''
this.stepData3.servHostingContractFileUrl = ''
this.stepData3.servHostingContractFileName = ''
this.serviceTrusteeFile = fileList
- this.$refs.step3.validateField('servHostingContractFileRid')
+ this.$refs.step3.validateField('servHostingContractFileUrl')
this.hideServiceTrustee = fileList.length >= this.limitCount;
},
//服务托管-成功
handSuccessServiceTrustee(file) {
- this.stepData3.servHostingContractFileRid = file.data.idisResult
+ // this.stepData3.servHostingContractFileRid = file.data.idisResult
this.stepData3.servHostingContractFileUrl = file.data.url
this.stepData3.servHostingContractFileName = file.data.submittedFileName
this.serviceTrusteeFile.push({name: file.data.submittedFileName, url: file.data.url, bizType: file.data.bizType})
- this.$refs.step3.validateField('servHostingContractFileRid')
+ this.$refs.step3.validateField('servHostingContractFileUrl')
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
diff --git a/src/views/fids/productManagement/addProduct/Index.vue b/src/views/fids/productManagement/addProduct/Index.vue
index 3f8c806..a3f8212 100644
--- a/src/views/fids/productManagement/addProduct/Index.vue
+++ b/src/views/fids/productManagement/addProduct/Index.vue
@@ -28,7 +28,7 @@
-
+
自定义数据项
+ (请填写至少3条数据项)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 增加
- 删除
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 增加
+ 删除
+
+
+
+ 请填写至少3条数据项
@@ -123,6 +123,13 @@ export default {
components: {Tinymce},
props: {},
data() {
+ const checkSerIndustrie = (rule, value, callback) => {
+ if (this.entInfoSerIndustries.length == 0) {
+ return callback(new Error("请选择服务行业"));
+ } else {
+ callback();
+ }
+ };
return {
fileListExcel: [], // excel文件列表
fileOtherData: {
@@ -131,7 +138,9 @@ export default {
sequence: 0,
url: ''
},
+ btnLoading:false,
dialogVisible: false,
+ isOKProductInfo:false,
dialogImageUrl: '',
action: UPLOAD,
addProductForm: {
@@ -154,6 +163,19 @@ export default {
commodityName: [
{required: true, message: "请输入产品名称", trigger: "blur"}
],
+ entInfoSerIndustries: [
+ // { message: "请选择服务行业", trigger: "blur"},
+ {required: true,validator: checkSerIndustrie, trigger: "change"},
+ ],
+ key: [
+ {required: true, message: "请输入数据项名称", trigger: "blur"}
+ ],
+ enKey: [
+ {required: true, message: "请输入数据项英文名称", trigger: "blur"}
+ ],
+ value: [
+ {required: true, message: "请输入数据项内容", trigger: "blur"}
+ ],
// files: [
// {required: true, message: '请上传图片材料', trigger: 'blur'},
// ]
@@ -276,6 +298,17 @@ export default {
},
//商品新增接口请求
addProduct() {
+ if(this.addProductForm.lists.length < 3) {
+ // this.$message({
+ // showClose: true,
+ // message: '请填写至少3条数据项',
+ // type: 'warning'
+ // });
+ this.isOKProductInfo = true
+ return
+ } else {
+ this.isOKProductInfo = false
+ }
if(this.entInfoSerIndustries.length > 0) {
this.addProductForm.industryCategory = this.entInfoSerIndustries[0]
this.addProductForm.industrySpecific = this.entInfoSerIndustries[1]
@@ -285,12 +318,14 @@ export default {
const prefix = this.$db.get('TENANT_PREFIX') || null
this.addProductForm.prefix = prefix
this.addProductForm.version = new Date().getTime()+''
+ this.btnLoading = true
saveCommodity(this.addProductForm).then(res => {
if (res.data.isSuccess) {
this.$message({
message: "新增成功",
type: "success"
});
+ this.btnLoading = false
this.$router.push("/productManagement/productCategoryManagement");
}
})
diff --git a/src/views/fids/productManagement/productCategoryManagement/Index.vue b/src/views/fids/productManagement/productCategoryManagement/Index.vue
index 8ee8730..c8a4080 100644
--- a/src/views/fids/productManagement/productCategoryManagement/Index.vue
+++ b/src/views/fids/productManagement/productCategoryManagement/Index.vue
@@ -37,6 +37,7 @@
+
diff --git a/src/views/register/register.vue b/src/views/register/register.vue
index 5df07fb..a2307ed 100644
--- a/src/views/register/register.vue
+++ b/src/views/register/register.vue
@@ -116,6 +116,7 @@
@click.native.prevent="handleRegister"
style="width:100%;margin-bottom:14px;"
type="primary"
+ :disabled="isDisabled"
>提交
@@ -215,6 +216,7 @@ export default {
};
return {
getCheckCodeLoading:false,
+ isDisabled:false,
dialogVisible: false,
count: '',
labelPosition: "top",
@@ -370,6 +372,7 @@ export default {
//注册接口请求
registerSubmit() {
//校验电子邮件验证码
+ this.isDisabled = true
register(this.registerForm).then(response => {
const res = response.data;
if (res.isSuccess) {
@@ -377,6 +380,7 @@ export default {
message: "注册成功,请前往邮箱查看您的企业ID及用户名和密码",
type: "success"
});
+ this.isDisabled = false
this.$router.push("/login");
}
diff --git a/src/views/searchList/searchList.vue b/src/views/searchList/searchList.vue
index bc59c90..a4526dd 100644
--- a/src/views/searchList/searchList.vue
+++ b/src/views/searchList/searchList.vue
@@ -123,7 +123,7 @@ export default {
this.errorResult = '无效标识！';
this.isError = true;
} else {
- this.dataAll = res.data
+ this.dataAll = res.data.data
this.isError = false;
}
} else {