提交修改退货售后登记的问题

core/CoreApp/controllers/Returns.php

@@ -260,6 +260,10 @@ class Returns extends Start_Controller {
 				{
 				    $info_list[$key]['qr'] = '<span class="thqr" style="background-color:#ccc" data-id="'.$value['id'].'">已处理</span>';
 				}
+				if(empty($value['number'])){
+					$value['number'] = $info_list[$key]['number'] = '未填写';
+					
+				}
 				if($value['is_jiaji'] == 1){
 					$extra = json_decode($value['extra_cont'],true);
 					$jiaji_remark = "";
@@ -279,11 +283,13 @@ class Returns extends Start_Controller {
 					}
 					$str = trim($str,"<br/>");
 					if($value['jiaji_status'] == 1){
-						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:#95f;"><i onclick="editJiaji(this)" class="fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'" style="position: absolute;top: 0;right: 0px;"></i>'.$value['number']."</div>";
+						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:#95f;"><i onclick="event.stopPropagation();editJiaji(this)" class="fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'" style="position: absolute;top: 0;right: 0px;"></i>'."<h9 class='window' style='color:#95f' data-h='/returns/edit/".$value['id']."' data-t='退货-修改'>".$value['number']."</h9></div>";
 					}else{
-						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red"><i  onclick="editJiaji(this)"  class=" fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'"  style="position: absolute;top: 0;right: 0px;"></i>'.$value['number']."</div>";
+						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red"><i  onclick="event.stopPropagation();editJiaji(this)"  class=" fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'"  style="position: absolute;top: 0;right: 0px;"></i> '."<h9  class='window' style='color:red !important' data-h='/returns/edit/".$value['id']."' data-t='退货-修改'>".$value['number']."</h9></div>";
 					}
 					
+				}else{
+					$info_list[$key]['number'] = "<h9 class='window' data-h='/returns/edit/".$value['id']."' data-t='退货-修改'>".$value['number']."</h9>";
 				}
 				unset($info_list[$key]['is_jiaji']);
 				unset($info_list[$key]['extra_cont']);

template/erp/returns.html

@@ -113,7 +113,7 @@
 var dataurl = "/returns";
 var excel = "/returns/";
 var editurl = "/returns/edit/";
-var editdj = 1;
+// var editdj = 1;
 var editt = "退货 - 修改";
 
 $(function(){

template/erp/returns_add.html

@@ -22,10 +22,11 @@
 <li>
 <em>店铺：</em>
 <select name="shop" class="select class shopselect">
+<option value="0">不确定</option>
 {loop usershop() as $val}
 <option value="{$val['id']}">{$val['shopname']}</option>
 {/loop}
-<option value="0">不确定</option>
+
 </select>
 </li>
 

template/erp/returns_edit.html

@@ -21,10 +21,10 @@
 <li>
 <em>店铺：</em>
 <select name="shop" class="select class shopselect">
+<option value="0" {if $returns['shop'] == 0}selected="selected"{/if}>不确定</option>
 {loop usershop() as $val}
 <option value="{$val['id']}" {if $returns['shop'] == $val['id']}selected="selected"{/if}>{$val['shopname']}</option>
 {/loop}
-<option value="0" {if $returns['shop'] == 0}selected="selected"{/if}>不确定</option>
 </select>
 </li>
 

template/erp/returns_scanwaybill.html

@@ -354,15 +354,16 @@ function getInfo(){
 <li>
     <em>店铺：</em>
     <select name="shop" class="select class shopselect">
+        <option value="0" 
+        <% if(data.shop == 0) { %>  selected="selected" <% } %>
+        >不确定</option>
         <% for(let key in shoplist){ %>
         <option value="<%= key  %>" 
         <% if(data.shop == key) { %>  selected="selected" <% } %>
          > <%= shoplist[key] %>
         </option>
         <% } %>
-        <option value="0" 
-        <% if(data.shop == 0) { %>  selected="selected" <% } %>
-        >不确定</option>
+      
     </select>
 </li>
 <li>