Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

public/assets/js/order/index.js

@@ -57,7 +57,15 @@ layui.use(['form', 'table', 'laydate'], function () {
           {field: 'remarks', title: translation.remarks, width: 120},
           {field: 'remarks', title: translation.remarks, width: 120},
           {
           {
             field: 'type_cn', title: translation.type_cn, width: 120, templet(d) {
             field: 'type_cn', title: translation.type_cn, width: 120, templet(d) {
-              return '<span>' + d.type_cn + '</span><div class="hide-input"><select class="input-style return_type" lay-ignore=""><option>' + translation.all + '</option><option value="1">' + translation.refund_of_returned_goods + '</option><option value="2">' + translation.refund_only + '</option></select></div>'
+              var html = '';
+              if (d.type_cn == translation.refund_of_returned_goods) {
+                html = '<select class="input-style return_type" lay-ignore=""><option value="1" selected>' + translation.refund_of_returned_goods + '</option><option value="2">' + translation.refund_only + '</option></select>';
+              } else if (d.type_cn == translation.refund_only) {
+                html = '<select class="input-style return_type" lay-ignore=""><option value="1">' + translation.refund_of_returned_goods + '</option><option value="2" selected>' + translation.refund_only + '</option></select>';
+              } else {
+                html = '<select class="input-style return_type" lay-ignore=""><option value="1">' + translation.refund_of_returned_goods + '</option><option value="2">' + translation.refund_only + '</option></select>';
+              }
+              return '<span>' + d.type_cn + '</span><div class="hide-input">' + html + '</div>'
             }
             }
           },
           },
           {
           {