diff --git a/src/api/base/store/category.js b/src/api/base/store/category.js index 9a8f969..e6d74ca 100644 --- a/src/api/base/store/category.js +++ b/src/api/base/store/category.js @@ -32,3 +32,11 @@ export function GetStoreClassify(data) { data, }) } + +export function GetCategoryList(data) { + return request({ + url: URL.shop.base.store.category.categoryList, + method: 'post', + data, + }) +} diff --git a/src/config/net.config.js b/src/config/net.config.js index 6fe9e00..c47399f 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -710,6 +710,7 @@ let url = { doEdit: api_url + '/admin/shop/shop-base-store-category/edit', GetStoreClassify: api_url + '/admin/shop/shop-base-store-category/getStoreClassify', + categoryList: api_url + '/mobile/shop/shop-base-store-category/list', }, }, market: { diff --git a/src/views/settings/config/appVersion.vue b/src/views/settings/config/appVersion.vue index fc82487..c62a4e5 100644 --- a/src/views/settings/config/appVersion.vue +++ b/src/views/settings/config/appVersion.vue @@ -332,7 +332,7 @@ export default { pageNum: 1, pageSize: 20, }, - selectId: 1, + selectId: 100, appName: null, options: [ { diff --git a/src/views/store/shopAudit/formConfig.js b/src/views/store/shopAudit/formConfig.js index 4f0b9f9..b076961 100644 --- a/src/views/store/shopAudit/formConfig.js +++ b/src/views/store/shopAudit/formConfig.js @@ -57,10 +57,10 @@ const certificate = [ key: 'license_image', label: '许可证图片', }, - { - key: 'legal_person_mobile', - label: '法人手机号', - }, + // { + // key: 'legal_person_mobile', + // label: '法人手机号', + // }, { key: 'legalPersonOCR', label: '法人身份证OCR识别', @@ -169,6 +169,10 @@ const enterpriseCheckBoxList = [ key: 'legal_person_mobile', label: '法人手机号', }, + { + key: 'biz_license_content', + label: '经营范围', + }, { key: 'legal_person_id_number', label: '法人身份证号码', diff --git a/src/views/store/shopAudit/shopAudit.vue b/src/views/store/shopAudit/shopAudit.vue index 9c7c5fb..89c8ad6 100644 --- a/src/views/store/shopAudit/shopAudit.vue +++ b/src/views/store/shopAudit/shopAudit.vue @@ -187,12 +187,12 @@ export default { }, { prop: 'has_apply_split', - label: '是否分账', + label: '是否创建分账', + }, + { + prop: 'has_ec_signed', + label: '合同签署状态', }, - // { - // prop: 'signed_status', - // label: '合同签署状态', - // }, ], tableData: [ { @@ -226,12 +226,8 @@ export default { item.has_apply_split = item.has_apply_split == 1 ? '是' : '否' } - if (item.signed_status != null) { - this.signedStatus.forEach((group) => { - if (group.index == item.signed_status) { - item.signed_status = group.value - } - }) + if (item.has_ec_signed) {; + item.has_ec_signed = item.has_ec_signed == 1 ? '是' : '否' } if (item.entity_type) { item.entity_type = this.entityType[item.entity_type - 1] @@ -282,6 +278,14 @@ export default { if (row.has_apply_split == '否' && columnIndex == 12) { return 'status-not-pass' } + + if (row.has_ec_signed == '是' && columnIndex == 13) { + return 'status-pass' + } + if (row.has_ec_signed == '否' && columnIndex == 13) { + return 'status-not-pass' + } + } }, closeDialog() { diff --git a/src/views/store/shopAudit/shopAuditDetails.vue b/src/views/store/shopAudit/shopAuditDetails.vue index c400d90..31decf7 100644 --- a/src/views/store/shopAudit/shopAuditDetails.vue +++ b/src/views/store/shopAudit/shopAuditDetails.vue @@ -36,7 +36,7 @@
经营品类
@@ -185,6 +185,29 @@ > +
+
+
姓名
+ +
+
+
+
+
身份证地址
+ +
+
@@ -223,6 +246,20 @@ >
+
+
+
经营范围
+ +
+
许可证类型
@@ -367,7 +404,7 @@ disabled >
-
+
@@ -552,15 +589,15 @@ class="btn" style="width: 150px;" type="success" - @click="getMerchApproval(1)" - v-if="![1].includes(form.approval_status)" + @click="getMerchApproval(5)" + v-if="![1,5].includes(form.approval_status)" > 提交拉卡拉审核 驳回审核 @@ -598,6 +635,7 @@ import { createShop, createSubAccount } from '@/api/shopAudit/shopAudit' +import { GetCategoryList } from '@/api/base/store/category' import city from './cityData.js' import config from './formConfig' export default { @@ -635,6 +673,7 @@ export default { environment_image: '', biz_license_number: '', biz_license_image: '', + biz_license_content:'', license_type: 1, license_number: '', license_image: '', @@ -666,7 +705,6 @@ export default { has_apply_receiver:'',// 是否申请创建分账接收方,1-是;2-否;, has_bind_receiver:''// 是否是否绑定分账接收方,1-是;2-否; }, - bizCategoryList: ['医疗用品', '生活用品'], entityType: ['企业', '个人'], // approvalStatus: ['已通过', '未通过', '待审核','未申请过','已提交拉卡拉审核','拉卡拉审核未通过'], approvalStatus:[ @@ -765,6 +803,7 @@ export default { if (newVal) { this.showDialog = true this.getMerchDetail() + } else { this.showDialog = false } @@ -840,6 +879,36 @@ export default { this.srcList8.push(res.data.individual_id_images2) } this.showLoading = false + await this.getCategoryList(); + }, + async getCategoryList(){ + let res = await GetCategoryList(); + + if(res && res.status == 200){ + + let name = this.findCategoryName(res.data,this.form.biz_category); + if(name){ + this.form.biz_category = name + } + } + }, + findCategoryName(categories, targetId) { + for (const category of categories) { + // 如果当前分类匹配,直接返回名称 + if (category.store_category_id === targetId) { + return category.store_category_name; + } + + // 如果有子分类,递归查找 + if (category.children && category.children.length > 0) { + const foundInChildren = findCategoryName(category.children, targetId); + if (foundInChildren) { + return foundInChildren; + } + } + } + + return null; // 没找到 }, async getMerchApproval(status) { if (status == 2 && this.checkboxList.length == 0) { @@ -868,7 +937,7 @@ export default { let parems = { id: this.id, approvalStatus: status, - approvalRemark: this.form.approvalRemark, + approvalRemark: this.form.approval_remark, approvalInvalidCol: this.checkboxList.filter(item => !['businessLicenseOCR', 'legalPersonOCR','personOCR','bankOCR'].includes(item)), } @@ -884,6 +953,11 @@ export default { // if (this.status == 2) { // this.close() // } + }else{ + this.$message({ + type: 'error', + message: res.msg, + }) } }) .catch(() => { @@ -937,19 +1011,62 @@ export default { // 企业身份证驳回 if(e.includes('legalPersonOCR')){ - this.checkboxList = ['legal_person_id_number','legal_person_id_images','legal_person_id_images2',...this.checkboxList ] + + let arr = [ + 'legal_person_id_number', + 'legal_person_id_images', + 'legal_person_id_images2', + 'legal_person_id_addr', + 'legal_person_id_period_begin', + 'legal_person_id_period_end' + ] + + this.checkboxList = [...arr,...this.checkboxList ] } // 个人身份证驳回 if(e.includes('personOCR')){ - this.checkboxList = ['individual_id_number','individual_id_images','individual_id_images2',...this.checkboxList] + + let arr = [ + 'individual_id_number', + 'individual_id_name', + 'individual_id_addr', + 'individual_id_images', + 'individual_id_images2', + 'individual_id_period_begin', + 'individual_id_period_end' + ] + + this.checkboxList = [...arr,...this.checkboxList] } //银行卡驳回 if(e.includes('bankOCR')){ - this.checkboxList = ['bankcard_item','account_holder_name','account_number','branch_name',...this.checkboxList] + + let arr = [ + 'bankcard_item', + 'account_holder_name', + 'account_number', + 'bank_name' + ] + + this.checkboxList = [...arr,...this.checkboxList] } // 企业营业执照驳回 if(e.includes('businessLicenseOCR')){ - this.checkboxList = ['biz_license_image','biz_license_company','legal_person_name','biz_license_number','',...this.checkboxList] + + let arr = [ + 'biz_license_image', + 'biz_license_company', + 'legal_person_name', + 'biz_license_content', + 'biz_license_number', + 'legal_person_mobile' + ] + + this.checkboxList = [...arr,...this.checkboxList] + } + + if(e.includes("mapAddress")){ + this.checkboxList = ['store_address',...this.checkboxList]; } },