fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit 00a94258059ebbe3e7f7f887331c7368c99f796f 2 parents b1e8cfa1 433d64e3

Merge branch 'grey'

Inline Side-by-side
Showing 2 changed files with 14 additions and 10 deletions
@@ -597,11 +597,6 @@ $(document).on("click", "#reject-btn", function() { @@ -597,11 +597,6 @@ $(document).on("click", "#reject-btn", function() {
597 len = selectedArr.length, 597 len = selectedArr.length,
598 data = g.options.parms(); 598 data = g.options.parms();
599 599
600 - var reason = $('#bohui').val();  
601 - if (reason === '' || $.trim(reason) === '') {  
602 - common.util.__tip('请填写驳回原因', 'warning');  
603 - return;  
604 - }  
605 var filter=$(".wqt_all").prop("checked"); 600 var filter=$(".wqt_all").prop("checked");
606 601
607 $.each(data, function(key, value) { 602 $.each(data, function(key, value) {
@@ -620,6 +615,13 @@ $(document).on("click", "#reject-btn", function() { @@ -620,6 +615,13 @@ $(document).on("click", "#reject-btn", function() {
620 }); 615 });
621 } 616 }
622 var result=function(){ 617 var result=function(){
  618 + var reason = $('#bohui').val();
  619 + if (reason === '' || $.trim(reason) === '') {
  620 + //common.util.__tip('请填写驳回原因', 'warning');
  621 + return '请填写驳回原因';
  622 + }
  623 +
  624 +
623 if(filter){ 625 if(filter){
624 return { 626 return {
625 targetStatus: 3, 627 targetStatus: 3,
@@ -602,11 +602,6 @@ webpackJsonp([29],{ @@ -602,11 +602,6 @@ webpackJsonp([29],{
602 len = selectedArr.length, 602 len = selectedArr.length,
603 data = g.options.parms(); 603 data = g.options.parms();
604 604
605 - var reason = $('#bohui').val();  
606 - if (reason === '' || $.trim(reason) === '') {  
607 - common.util.__tip('请填写驳回原因', 'warning');  
608 - return;  
609 - }  
610 var filter=$(".wqt_all").prop("checked"); 605 var filter=$(".wqt_all").prop("checked");
611 606
612 $.each(data, function(key, value) { 607 $.each(data, function(key, value) {
@@ -625,6 +620,13 @@ webpackJsonp([29],{ @@ -625,6 +620,13 @@ webpackJsonp([29],{
625 }); 620 });
626 } 621 }
627 var result=function(){ 622 var result=function(){
  623 + var reason = $('#bohui').val();
  624 + if (reason === '' || $.trim(reason) === '') {
  625 + //common.util.__tip('请填写驳回原因', 'warning');
  626 + return '请填写驳回原因';
  627 + }
  628 +
  629 +
628 if(filter){ 630 if(filter){
629 return { 631 return {
630 targetStatus: 3, 632 targetStatus: 3,