Merge remote-tracking branch 'origin/master'

# Conflicts:
#	uis/views/agent/index.html
#	uis/views/customer/edit.html

uis/views/agent/edit.html

@@ -38,16 +38,9 @@
                             </div>
                         </div>
                         <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>联系人：</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>电话：</label>
                             <div class="layui-input-block">
-                                <input type="text" name="relation_user" lay-verify="required" placeholder="请输入联系人"
-                                       autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                        <div>
-                            <label class="layui-form-label"><font color='red' size="4">*</font>联系电话：</label>
-                            <div class="layui-input-block">
-                                <input type="text" name="tel" class="layui-input" placeholder="请输入联系电话"
+                                <input type="text" name="tel" class="layui-input" placeholder="请输入电话"
                                        autocomplete="off" lay-verify="required"/>
                             </div>
                         </div>
@@ -65,19 +58,6 @@
                                        autocomplete="off" class="layui-input" lay-verify="required">
                             </div>
                         </div>
-                        <div>
-                            <label class="layui-form-label">是否在用：</label>
-                            <div class="layui-input-block">
-                                <input type="checkbox" name="enable" lay-skin="switch" lay-text="是|否" checked=""
-                                       value="1">
-                            </div>
-                        </div>
-                        <div>
-                            <label class="layui-form-label">备注：</label>
-                            <div class="layui-input-block">
-                                <textarea type="text" name="notes" class="layui-textarea" placeholder="请输入备注"/></textarea>
-                            </div>
-                        </div>
 
                         <button id="id_save" class="layui-btn" lay-submit lay-filter="component-form-element"
                                 style="display: none">保存
@@ -110,11 +90,6 @@
         //form.render(null, 'component-form-element');
 
         form.on('submit(component-form-element)', function (data) {
-            if(data.field.enable === "1"){
-                data.field.enable = true
-            }else{
-                data.field.enable = false
-            }
             if (id) {
                 var url = '/agent/agent/' + id + '/';
                 var type = 'post';

uis/views/agent/index.html

@@ -122,16 +122,11 @@
             , url: '/agent/agent/'
             , cols: [[
                 {field: 'name', title: '名称', width: 150}
-                , {field: 'relation_user', title: "联系人", width: 100}
-                , {field: 'tel', title: '联系电话', width: 150}
+                , {field: 'tel', title: '电话', width: 150}
                 , {field: 'area', title: '区域', width: 200}
                 , {field: 'address', title: '地址', width: 200}
-                , {field: 'bank', title: '开户行', width: 100}
-                , {field: 'account', title: '信用代码', width: 200}
-                , {field: 'enable_text', title: '是否在用', width: 100}
-                , {field: 'notes', title: '备注', width: 200}
-                , {field: 'create_user_text', title: '创建人', width: 100}
-                , {field: 'create_time', title: '创建时间', width: 150}
+                , {field: 'create_user', title: '添加人', width: 100}
+                , {field: 'create_time', title: '添加时间', width: 150}
                 , {width: 150, align: 'center', fixed: 'right', toolbar: '#customer-operate-bar'}
             ]]
             , page: true
@@ -182,7 +177,7 @@
                 layer.confirm('确定要删除吗？', function (index) {
                     layer.close(index);
                     admin.req({
-                        url: '/tenant/customer/' + data.id + '/'
+                        url: '/agent/agent/' + data.id + '/'
                         , type: 'delete'
                         , done: function (res) {
                             table.reload('customer_datagrid', {});
@@ -195,7 +190,7 @@
                     type: 2,
                     title: '修改',
                     shadeClose: false,
-                    area: ['45%', '65%'],
+                    area: ['40%', '50%'],
                     btn: ['保存', '取消'],
                     yes: function (index, dom) {
                         layui.onSubmitChild = function (data) {
@@ -225,7 +220,7 @@
             layer.open({
                 type: 2,
                 title: '添加',
-                area: ['45%', '65%'],
+                area: ['40%', '50%'],
                 btn: ['保存', '取消'],
                 yes: function (index, dom) {
                     layui.onSubmitChild = function (data) {

uis/views/customer/edit.html

@@ -161,10 +161,10 @@
 
         form.on('submit(component-form-element)', function (data) {
             if (id) {
-                var url = '/customer/reportcustomer/' + id + '/';
+                var url = '/customer/report_customer/' + id + '/';
                 var type = 'put';
             } else {
-                url = '/customer/reportcustomer/';
+                url = '/customer/report_customer/';
                 type = 'post'
             }
             var submitData = data.field;

uis/views/customer/index.html

@@ -121,7 +121,7 @@
 
         table.render({
             elem: '#customer_datagrid'
-            , url: '/customer/reportcustomer/'
+            , url: '/customer/report_customer/'
             , cols: [[
                 {field: 'name', title: '姓名', width: 200}
                 , {field: 'gender_text', title: "性别", width: 70}
@@ -190,6 +190,10 @@
                     });
                 });
             } else if (obj.event === 'customer_edit') {
+                if(data.report_status !== 0){
+                    layer.msg("只有待审核才允许修改");
+                    return
+                }
                 table.editdata = data;
                 layer.open({
                     type: 2,