master
yuan 7 years ago
parent cae8827a21
commit c9246bf5f3

@ -173,9 +173,10 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
commonDialog.alert({title: 'Message', content: '请前去完善合规资料,再进行提交!', type: 'info'});
return;
}
if($scope.partner.business_structure == null ||$scope.partner.logo_url == null || $scope.partner.description == null || (($scope.partner.store_photo == null || $scope.partner.company_photo == null) && $scope.currentUser.client.company_website == null)){
if($scope.partner.business_structure == null ||$scope.partner.logo_url == null || $scope.partner.description == null ||($scope.partner.partner_type == 'website' && $scope.partner.company_website == null) || ($scope.partner.partner_type == 'photo'&&($scope.partner.store_photo == null || $scope.partner.company_photo == null))){
commonDialog.alert({title: 'Message', content: '请前去完善商户资料,再进行提交!', type: 'info'});
return;
}
if(($scope.partner.business_structure == "Company" && $scope.partner.acn == null) || ($scope.partner.business_structure != "Company" && $scope.partner.abn == null)){
commonDialog.alert({title: 'Message', content: '请前去完善商户资料,再进行提交!', type: 'info'});

@ -11,15 +11,12 @@
<div class="content">
<div class="box box-warning" ng-if="partner.source == 4&&partner.approve_result !=1">
<div class="box-header with-border">
<h3 class="box-title"> <span ng-if="partner.approve_result==5"
style="color: red">(Refused
<small class=""
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
<h3 class="box-title">
【Audit progress】-
<b ng-if="partner.source==4">
<span ng-if="partner.approve_result==2">Awaiting submission of compliance materials 等待提交合规材料</span>
<span ng-if="partner.approve_result==3">Waiting for compliance 等待合规审核</span>
<span ng-if="partner.approve_result==5">Refused 被打回</span>
<span ng-if="partner.approve_result==5">Refused 被打回 &nbsp;<small class="text-danger">{{partner.refuse_remark}}</small></span>
</b>
</h3>
<div class="btn-group pull-right" role="group" aria-label="..." ng-hide="partner.approve_result ==3 || partner.approve_result == 1">
@ -367,7 +364,7 @@
name="partner_type">
<option value="">Please Choose</option>
<option value="photo">Photo</option>
<option value="companyWebsite">Website</option>
<option value="website">Website</option>
</select>
<p class="small text-info">If the partner is a offline shop then a photo of
shop

Loading…
Cancel
Save