Merge remote-tracking branch 'origin/master'

uis/views/employee/edit.html

@@ -241,7 +241,7 @@
                 });
                 agents_node.html(optionsHtml);
                 form.render();
-            }
+            };
         });
         //选择代理商
         form.on('select(onAgentChange)', async function (data) {

uis/views/order/detail.html

@@ -91,6 +91,7 @@
             , formSelects = layui.formSelects
             , form = layui.form;
 
+        var order_id = layui.view.getParameterByName('order_id');
         editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
         var data = editdata;
         var getTpl = demo.innerHTML
@@ -100,7 +101,7 @@
         });
         table.render({
             elem: '#customer_datagrid'
-            , url: '/api/process.json'
+            , url: 'order/get_details/?order_id='
             , cols: [[
                 {field: 'time', title: '时间', width: 150}
                 , {field: 'process', title: "进度", width: 120}

uis/views/order/index.html

@@ -179,7 +179,7 @@
                 btn1: function (index, layero) {
                     layer.close(index);//关闭当前按钮
                 },
-                content: 'detail.html'
+                content: 'detail.html?order_id=' + data.id
             });
             }else if(obj.event === "order_update"){
                 // 更新进度