diff --git a/src/views/base/store/category/index.vue b/src/views/base/store/category/index.vue index 8a086a3..dff2afe 100644 --- a/src/views/base/store/category/index.vue +++ b/src/views/base/store/category/index.vue @@ -79,7 +79,7 @@ /> diff --git a/src/views/store/shopAudit/shopAudit.vue b/src/views/store/shopAudit/shopAudit.vue index 89c8ad6..55c5fa2 100644 --- a/src/views/store/shopAudit/shopAudit.vue +++ b/src/views/store/shopAudit/shopAudit.vue @@ -161,10 +161,10 @@ export default { prop: 'account_holder_name', label: '公司名称', }, - { - prop: 'biz_category', - label: '经营品类', - }, + // { + // prop: 'biz_category', + // label: '经营品类', + // }, { prop: 'entity_type', label: '入驻主体类型', @@ -181,17 +181,29 @@ export default { prop: 'approval_status', label: '审批状态', }, + { + prop: 'has_ec_signed', + label: '合同签署状态', + }, + { + prop: 'has_apply_mer', + label: '商家进件状态', + }, { prop: 'store_status', label: '店铺创建状态', }, { prop: 'has_apply_split', - label: '是否创建分账', + label: '申请分账业务状态', }, { - prop: 'has_ec_signed', - label: '合同签署状态', + prop: 'has_apply_receiver', + label: '申请创建分账接收方', + }, + { + prop: 'has_bind_receiver', + label: '绑定分账接收方', }, ], tableData: [ @@ -218,20 +230,40 @@ export default { const found = this.approvalStatus.find(group => group.key == item.approval_status); item.approval_status = found ? found.value : 'Unknown Status'; } + + if (item.has_ec_signed) {; + item.has_ec_signed = item.has_ec_signed == 1 ? '已签署' : '未签署' + } + + if(item.has_apply_mer){ + item.has_apply_mer = item.has_apply_mer == 1 ? '成功' : '未进件' + } + + if(item.store_status){ item.store_status = this.storeStatus[item.store_status - 1] + } if(item.has_apply_split){ - item.has_apply_split = item.has_apply_split == 1 ? '是' : '否' + item.has_apply_split = item.has_apply_split == 1 ? '已申请' : '未申请' } - if (item.has_ec_signed) {; - item.has_ec_signed = item.has_ec_signed == 1 ? '是' : '否' + if(item.has_apply_receiver){ + item.has_apply_receiver = item.has_apply_receiver == 1 ? '已申请' : '未申请' } + + if(item.has_bind_receiver){ + item.has_bind_receiver = item.has_bind_receiver == 1 ? '已绑定' : '未绑定' + } + + + if (item.entity_type) { item.entity_type = this.entityType[item.entity_type - 1] } + + }) } @@ -254,38 +286,61 @@ export default { }, handerColor({ row, column, rowIndex, columnIndex }) { if (row) { - if (row.approval_status == '已通过' && columnIndex == 10) { + if (row.approval_status == '已通过' && columnIndex == 9) { return 'status-pass' } - if (['拉卡拉审核未通过','未通过'].includes(row.approval_status) && columnIndex == 10) { + if (['拉卡拉审核未通过','未通过'].includes(row.approval_status) && columnIndex == 9) { return 'status-not-pass' } - if (['待审核','未申请过','已提交拉卡拉审核'].includes(row.approval_status) && columnIndex == 10) { + if (['待审核','未申请过','已提交拉卡拉审核'].includes(row.approval_status) && columnIndex == 9) { return 'status-check-pass' } - if (row.store_status == '已创建' && columnIndex == 11) { + if (row.has_ec_signed == '已签署' && columnIndex == 10) { + + return 'status-pass' + } + if (row.has_ec_signed == '未签署' && columnIndex == 10) { + + return 'status-not-pass' + } + + if (row.has_apply_mer == '成功' && columnIndex == 11) { return 'status-pass' } - if (row.store_status == '未创建' && columnIndex == 11) { + if (row.has_apply_mer == '未进件' && columnIndex == 11) { return 'status-not-pass' } - - if (row.has_apply_split == '是' && columnIndex == 12) { + if (row.store_status == '已创建' && columnIndex == 12) { return 'status-pass' } - if (row.has_apply_split == '否' && columnIndex == 12) { + if (row.store_status == '未创建' && columnIndex == 12) { return 'status-not-pass' } - if (row.has_ec_signed == '是' && columnIndex == 13) { + if (row.has_apply_split == '已申请' && columnIndex == 13) { return 'status-pass' } - if (row.has_ec_signed == '否' && columnIndex == 13) { + if (row.has_apply_split == '未申请' && columnIndex == 13) { return 'status-not-pass' } - + + if (row.has_apply_receiver == '已申请' && columnIndex == 14) { + return 'status-pass' + } + if (row.has_apply_receiver == '未申请' && columnIndex == 14) { + return 'status-not-pass' + } + + + if (row.has_bind_receiver == '已绑定' && columnIndex == 15) { + return 'status-pass' + } + if (row.has_bind_receiver == '未绑定' && columnIndex == 15) { + return 'status-not-pass' + } + } }, closeDialog() { diff --git a/src/views/store/shopAudit/shopAuditDetails.vue b/src/views/store/shopAudit/shopAuditDetails.vue index c91fdce..993dc71 100644 --- a/src/views/store/shopAudit/shopAuditDetails.vue +++ b/src/views/store/shopAudit/shopAuditDetails.vue @@ -18,7 +18,7 @@ class="item-input" v-model="form.store_id" clearable - disabled + readonly />
@@ -28,7 +28,7 @@ style="width: 300px" v-model="form.store_name" clearable - disabled + readonly />
@@ -38,7 +38,7 @@ class="item-input" v-model="form.biz_category" clearable - disabled + readonly /> @@ -49,7 +49,7 @@ class="item-input" v-model="form.contact_name" clearable - disabled + readonly />
@@ -58,7 +58,7 @@ class="item-input" v-model="form.login_mobile" clearable - disabled + readonly />
@@ -70,7 +70,7 @@ class="item-input" v-model="form.province_nmae" clearable - disabled + readonly />
@@ -79,7 +79,7 @@ class="item-input" v-model="form.city_name" clearable - disabled + readonly />
@@ -88,7 +88,7 @@ class="item-input" v-model="form.county_name" clearable - disabled + readonly />
@@ -99,7 +99,7 @@ class="item-input" v-model="form.store_longitude" clearable - disabled + readonly />
@@ -108,7 +108,7 @@ class="item-input" v-model="form.store_latitude" clearable - disabled + readonly />
@@ -120,7 +120,7 @@ v-model="form.store_address" style="width: 600px" clearable - disabled + readonly /> @@ -148,15 +148,15 @@ > -
分账/结算  信息
+
到账/结算  信息
-
分账比例
+
到账比例
@@ -167,48 +167,37 @@ class="item-input" v-model="form.settlement_method" clearable - disabled + readonly >
-
证件信息
+
入驻类型
-
主体类型
+
入驻类型
-
+
证件信息
+
+
姓名
- +
-
-
-
-
身份证地址
-
-
-
公司名
@@ -216,7 +205,7 @@ class="item-input" v-model="form.biz_license_company" clearable - disabled + readonly >
@@ -228,7 +217,31 @@ v-model="form.biz_license_number" style="width: 600px" clearable - disabled + readonly + > +
+
+
+
+
营业执照开始有效日期
+ +
+
+
+
+
营业执照结束有效日期
+
@@ -244,10 +257,6 @@ :preview-src-list="srcList3" lazy > -
- -
-
经营范围
@@ -267,7 +276,7 @@ class="item-input" v-model="licenseType[form.license_type - 1]" clearable - disabled + readonly > @@ -279,7 +288,7 @@ v-model="form.license_number" style="width: 600px" clearable - disabled + readonly > @@ -298,31 +307,73 @@
-
法人姓名
+
法人姓名
+
+
-
法人手机号
+
法人手机号
+
+
-
法人身份证号码
+
法人身份证号码
+
+
+
+
+
法人身份证地址
+ +
+
+
+
+
法人身份证开始有效日期
+ +
+
+
+
+
法人身份证结束有效日期
+
@@ -356,13 +407,61 @@
-
个人入驻时的身份证号码
+
姓名
+ +
+
+
+
+
个人入驻时的身份证号码
+
+
+
+
+
个人入驻时的身份证地址
+ +
+
+
+
+
身份证开始有效日期
+ +
+
+
+
+
身份证结束有效日期
+
@@ -401,7 +500,7 @@ class="item-input" v-model="form.bank_name" clearable - disabled + readonly >
@@ -423,7 +522,7 @@ v-model="form.account_holder_name" style="width: 400px" clearable - disabled + readonly > @@ -435,7 +534,7 @@ v-model="form.account_number" style="width: 400px" clearable - disabled + readonly > @@ -445,10 +544,10 @@
合同编号
@@ -460,12 +559,23 @@ v-model="form.contract_download_url" style="width: 400px" clearable - disabled + readonly > + {{ downloading ? '下载中...' : '下载合同' }}
审核信息
-
+ + + + + + + + + + +
审批时的备注信息
@@ -696,6 +806,7 @@ import { GetCategoryList } from '@/api/base/store/category' import city from './cityData.js' import config from './formConfig' import { color } from 'echarts' +import { copy } from 'clipboard' export default { props: { show: { @@ -764,7 +875,6 @@ export default { has_bind_receiver:''// 是否是否绑定分账接收方,1-是;2-否; }, entityType: ['企业', '个人'], - // approvalStatus: ['已通过', '未通过', '待审核','未申请过','已提交拉卡拉审核','拉卡拉审核未通过'], approvalStatus:[ { key:1, @@ -844,6 +954,7 @@ export default { srcList6: [], srcList7: [], srcList8: [], + downloading: false } }, computed: { @@ -856,6 +967,59 @@ export default { return 'color:red' } }, + // 计算 active 值的逻辑 + calculateActiveStep() { + + let form = this.form + + // 7. 入驻完成(所有条件都满足) + if (form.approval_status === 1 && + form.has_ec_signed === 1 && + form.has_apply_mer === 1 && + form.store_status === 1 && + form.has_apply_split === 1 && + form.has_bind_receiver === 1) { + return 6; // 所有步骤完成 + } + + // 6. 分账接收方绑定结果 + if (form.has_apply_split === 1) { + if (form.has_bind_receiver === 1) return 6; // 成功 + if (form.approval_status === 21 && form.has_bind_receiver === 2) return 6; // 失败 + return 5; // 进行中 + } + + // 5. 分账业务申请结果 + if (form.store_status === 1) { + if (form.has_apply_split === 1) return 5; // 成功 + if (form.approval_status === 21 && form.has_apply_split === 2) return 5; // 失败 + return 4; // 进行中 + } + + // 4. 店铺创建结果 + if (form.has_apply_mer === 1) { + if (form.store_status === 1) return 4; // 成功 + if (form.approval_status === 2 && form.store_status === 2) return 4; // 失败 + return 3; // 进行中 + } + + // 3. 商家进件审核结果 + if (form.has_ec_signed === 1) { + if (form.has_apply_mer === 1) return 3; // 成功 + if (form.approval_status === 21 && form.has_apply_mer === 2) return 3; // 失败 + return 2; // 进行中 + } + + // 2. 合同签署结果 + if (form.approval_status === 5 && form.has_ec_signed === 2 && form.lkl_ec_result_url) { + return 1; // 合同签署待办 + } + if (form.has_ec_signed === 1) return 2; // 成功 + if (form.approval_status === 21 && form.has_ec_signed === 2) return 2; // 失败 + + // 1. 审核状态(默认第一步) + return 0; + }, }, watch: { show: { @@ -887,6 +1051,22 @@ export default { } } + if(this.form.entity_type == 1){ + this.title = `店铺审核详情 ( 企业入驻 )` + }else{ + this.title = `店铺审核详情 ( 个人入驻 )` + } + + if(this.form.individual_id_period_end == '9999-12-31' || + this.form.legal_person_id_period_end == '9999-12-31' || + this.form.biz_license_period_end == '9999-12-31' + ) + { + this.form.legal_person_id_period_end = '长期' + this.form.individual_id_period_end = '长期' + this.form.biz_license_period_end = '长期' + } + if(this.form.store_area){ let areaArr = this.form.store_area.split('/'); if(areaArr[0]){ @@ -942,6 +1122,28 @@ export default { this.showLoading = false await this.getCategoryList(); }, + downloadFile(){ + this.downloading = true + const link = document.createElement('a') + link.href = this.form.contract_download_url + link.download = this.getFileNameFromUrl(this.form.contract_download_url) + document.body.appendChild(link) + link.click() + document.body.removeChild(link) + + this.downloading = false + + this.$message({ + message: '下载完成,请注意浏览器右上角下载', + type: 'success', + }) + + }, + // 从URL中提取文件名 + getFileNameFromUrl(url) { + const parts = url.split('/') + return parts[parts.length - 1] || 'contract.pdf' + }, async getCategoryList(){ let res = await GetCategoryList(); @@ -1177,6 +1379,7 @@ export default { message: '分账成功', }) } + this.getMerchDetail(); }, async createShop(){ let res = await createShop({mchMobile:this.form.login_mobile}) @@ -1186,6 +1389,7 @@ export default { message: '店铺创建成功', }) } + this.getMerchDetail(); } }, } @@ -1278,5 +1482,9 @@ export default { .btn-hetong:hover { content: '需要通过审核才可以点击此按钮'; } + + .audit-steps{ + margin: 100px auto; + } } \ No newline at end of file