|
|
@@ -774,7 +774,7 @@ class Returns extends Start_Controller {
|
|
|
$str = '';
|
|
|
$received_str = '';
|
|
|
foreach($value as $k => $v){
|
|
|
- $received_str .= $v['received'].";";
|
|
|
+ $received_str .= $v['received']." ;";
|
|
|
$status = $this->_getStatus($v['whcd']);
|
|
|
for($i = 0;$i < $v['cp_num'];$i++){
|
|
|
$str .= $status."~".$v['whcd_bc']."|";
|
|
|
@@ -794,6 +794,7 @@ class Returns extends Start_Controller {
|
|
|
'degreetext' => $info['degreetext'],
|
|
|
'received' => $received_str,
|
|
|
'xh' => $xh_str,
|
|
|
+ 'edittime'=>time(),
|
|
|
],$info['id']);
|
|
|
$count_i++;
|
|
|
|
|
|
@@ -810,20 +811,37 @@ class Returns extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
private function _getStatus($v){
|
|
|
- if('(人发)可用' == $v){
|
|
|
+ // if('(人发)可用' == $v){
|
|
|
+ // return 1;
|
|
|
+ // }elseif('(化纤)可用' == $v){
|
|
|
+ // return 6;
|
|
|
+ // }elseif('(化纤)待确认' == $v){
|
|
|
+ // return 7;
|
|
|
+ // }elseif('(人发)精打理' == $v){
|
|
|
+ // return 2;
|
|
|
+ // }elseif('(人发)不可用' == $v){
|
|
|
+ // return 3;
|
|
|
+ // }elseif('(化纤)不可用' == $v){
|
|
|
+ // return 5;
|
|
|
+ // }else{
|
|
|
+ // return 4;
|
|
|
+ // }
|
|
|
+
|
|
|
+
|
|
|
+ if((strpos($v,'人发')!== false)&&(strpos($v,'可用')!== false)&&(strpos($v,'不可用')=== false)){
|
|
|
return 1;
|
|
|
- }elseif('(化纤)可用' == $v){
|
|
|
+ }elseif((strpos($v,'化纤')!== false)&&(strpos($v,'可用')!== false)&&(strpos($v,'不可用')===false)){
|
|
|
return 6;
|
|
|
- }elseif('(化纤)待确认' == $v){
|
|
|
+ }elseif((strpos($v,'化纤')!== false)&&(strpos($v,'待确认')!== false)){
|
|
|
return 7;
|
|
|
- }elseif('人发)精打理' == $v){
|
|
|
+ }elseif((strpos($v,'人发')!== false)&&(strpos($v,'精打理')!== false)){
|
|
|
return 2;
|
|
|
- }elseif('(人发)不可用' == $v){
|
|
|
+ }elseif((strpos($v,'人发')!== false)&&(strpos($v,'不可用')!== false)){
|
|
|
return 3;
|
|
|
- }elseif('(化纤)不可用' == $v){
|
|
|
+ }elseif((strpos($v,'化纤')!== false)&&(strpos($v,'不可用')!== false)){
|
|
|
return 5;
|
|
|
}else{
|
|
|
return 4;
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
}
|