调整

public/js/change_order.js

@@ -565,17 +565,21 @@
                                 data: $('#checkOrderForm').serialize(),
                                 dataType: 'json',
                                 success: function (resp) {
-                                    if(resp.errcode === 0){
+                                    if(resp.errcode == 0){
                                         layer.msg(resp.errmsg || '操作成功');
                                         setTimeout(function(){
                                             // location.reload();
                                             location.href = url;
                                         }, 1000);
-                                    } else {
-                                        layer.alert(resp.errmsg || '网络异常', function() {
-                                            location.reload();
-                                        });
-                                    }
+
+                                        return false;
+                                    } 
+
+                                    layer.alert(resp.errmsg);
+                                    return false;
+                                    // layer.alert(resp.errmsg || '网络异常', function() {
+                                    //     location.reload();
+                                    // });
                                 },
 
                                 error: function (res) {
@@ -583,7 +587,7 @@
                                 }
                             })
 
-                            // layer.msg('审核提交中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
+                            layer.msg('审核提交中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
                         },
                         btn2: function(index, layero){
                             layer.close(index);

public/js/standardBrand.js

@@ -9,13 +9,13 @@ layui.use(['table', 'form'], function() {
             ,url: '/api/getStandardBrandList' //数据接口
             ,method:'post'
             ,cellMinWidth: 80 //全局定义常规单元格的最小宽度
-            ,page: true //开启分页
+            ,page: false //开启分页
             ,cols: [[ //表头
                 {type:'radio', width: 80}
                 ,{field: 'erp_brand_name', title: '品牌名称', width: 596}
             ]]
-            ,limit: 10
-            ,limits: [10, 20, 50,]
+            // ,limit: 10
+            // ,limits: [10, 20, 50,]
         });
     }
 

resources/views/addOffline/js.blade.php

@@ -10,4 +10,4 @@
 <script src="/js/common.js"></script>
 <script src="/js/add_order.js?v=<?= time() ?>"></script>
 <script src="/js/plugins/DatePicker/WdatePicker.js"></script>
-<script src="/js/standardBrand.js"></script>
+<script src="/js/standardBrand.js?v=<?= time() ?>"></script>

resources/views/changeOrder/js.blade.php

@@ -12,4 +12,4 @@
 <script src="/js/common.js"></script>
 <script src="/js/change_order.js?v=<?= time() ?>"></script>
 <script src="/js/goods.js?v=<?= time() ?>"></script>
-<script src="/js/standardBrand.js"></script>
+<script src="/js/standardBrand.js?v=<?= time() ?>"></script>

resources/views/common/selectBrand.blade.php

@@ -6,10 +6,6 @@
 	#select-brand-pop .label-prompt{ padding: 6px !important; }
 </style>
 
-<!-- <div class="shop-table">
-	<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true"></i>
-</div> -->
-
 <div id="select-brand-pop" class="select-content">
 	<form class="layui-form layui-box" method="post">
 		<div class="layui-input-inline">
@@ -21,38 +17,4 @@
 	</form>
 
 	<table id="brandList" lay-filter="brandList"></table>
-</div>
-
-<script>
-	// layui.use(['table', 'form'], function() {
-	// 	var table = layui.table;
-	// 	var form = layui.form;
-
- //        table.render({
- //            id: 'list'
- //            ,elem: '#brandList'
- //            ,url: '/api/getStandardBrandList' //数据接口
- //            ,method:'post'
- //            ,cellMinWidth: 80 //全局定义常规单元格的最小宽度
- //            ,page: true //开启分页
- //            ,cols: [[ //表头
- //                {type:'radio', width: 80}
- //                ,{field: 'erp_brand_name', title: '品牌名称', width: 596}
- //            ]]
- //            ,limit: 10
- //            ,limits: [10, 20, 50,]
- //        });
-
-	//     form.on('submit(load)', function(data) {         
-	//         //执行重载
-	//         table.reload('list', {
-	//             page: {
-	//                 curr: 1
-	//             }
-	//             ,where: data.field
-	//         });    
-
-	//         return false;
-	//     });
-	// })
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file