Merge remote-tracking branch 'origin/master'

uis/views/report_check/index.html

@@ -158,6 +158,7 @@
             return false
         });
 
+
         $('#report_check_divide').on('click', function () {
             var checkStatus = table.checkStatus('report_check_datagrid');
             if(checkStatus.data.length === 0){
@@ -168,16 +169,17 @@
             layer.open({
                 type: 2,
                 title: '分配客户',
-                area: ['35%', '40%'],
+                area: ['400px', '300px'],
                 btn: ['保存', '取消'],
                 yes: function (index, dom) {
                     layui.onSubmitChild = function (data) {
+                        let customer = '华北';
                         layer.close(index);
                         if(!data){
                             layer.open({
                             type: 1,
                             title: '操作',
-                            area: ['25%', '20%'],
+                            area: ['300px', '220px'],
                             btn: ['标记为撞单客户', '重新分配'],
                             yes: function (index, dom) {
                                 layui.onSubmitChild = function (data) {
@@ -187,7 +189,7 @@
                             btn2: function (index, layero) {
                                 layer.close(index);
                             },
-                            content: '<p style="text-align: center; padding-top: 10px">和“某店”客户撞单，请选择后续操作。<p>'
+                            content: '<p style="text-align: center; padding: 15px 0">和' + customer + '客户撞单，请选择后续操作。<p>'
                         });
                         }
                         table.reload('report_check_datagrid', {});