Merge remote-tracking branch 'origin/master'

uis/views/customer/again_dispatch.html

@@ -104,7 +104,6 @@
         var id = layui.view.getParameterByName('id');
 
         var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata));
-        form.val("component-form-element", editdata);
 
         admin.req({
             url: '/customer/get_user/',
@@ -116,7 +115,7 @@
                     var name = data_user[i].lable;
                     user_node.append("<option value='" + pid + "'>" + name + "</option>");
                 }
-                form.render()
+                form.val("component-form-element", editdata);
             }
         });