Merge branch 'ysx-组织修改-20210817'

app/Http/Services/DepartmentService.php

@@ -84,8 +84,8 @@ class DepartmentService
             return $departmentModel->where('department_id', $departmentId)->first()->toArray();
             return $departmentModel->where('department_id', $departmentId)->first()->toArray();
         } else {
         } else {
             $department = $departmentModel->where('department_id', $departmentId)->first();
             $department = $departmentModel->where('department_id', $departmentId)->first();
-            //如果当前的部门id已经是联营采购部门Id
-            if ($departmentId == config('field.LiangYingDepartmentId')) {
+            //如果当前的部门id已经是联营采购部门Id(二级,目前有联营一部和联营二部)
+            if (in_array($departmentId, config('field.LiangYingDepartmentIds'))) {
                 return $department->toArray();
                 return $department->toArray();
             } else {
             } else {
                 if (!empty($department)) {
                 if (!empty($department)) {

config/field.php

@@ -95,5 +95,6 @@ return [
     ],
     ],
 
 
     'ZiYingDepartmentId' => 51,
     'ZiYingDepartmentId' => 51,
-    'LiangYingDepartmentId' => 47,
+    //60是本地的数据
+    'LiangYingDepartmentIds' => [47, 60, 72]
 ];
 ];
\ No newline at end of file

resources/views/script/ApplySupplierShareScript.blade.php

@@ -44,8 +44,11 @@
         //点击校验按钮
         //点击校验按钮
         $('#check_apply_supplier_share').click(function () {
         $('#check_apply_supplier_share').click(function () {
             let supplierName = $('#supplier_name').val();
             let supplierName = $('#supplier_name').val();
-            let url = '/api/supplier_share_apply/CheckApplySupplierShare?supplier_name=' + supplierName;
-            let res = ajax(url);
+            let url = '/api/supplier_share_apply/CheckApplySupplierShare';
+            let data = {
+                supplier_name: supplierName
+            }
+            let res = ajax(url,data);
             if (res.err_code === 0) {
             if (res.err_code === 0) {
                 layer.msg(res.err_msg, {icon: 6});
                 layer.msg(res.err_msg, {icon: 6});
                 //设置对应的supplier_id,后端暂时放到res.count这个字段吧...
                 //设置对应的supplier_id,后端暂时放到res.count这个字段吧...

resources/views/web/BatchAllocatePurchaseUser.blade.php

@@ -4,7 +4,7 @@
     }
     }
 </style>
 </style>
 <div class="layui-card">
 <div class="layui-card">
-    <div class="layui-card-header" style="height: 150px">
+    <div class="layui-card-header" style="height: 170px">
         <blockquote class="layui-elem-quote layui-text">
         <blockquote class="layui-elem-quote layui-text">
             <b>渠道开发员设置</b>
             <b>渠道开发员设置</b>
         </blockquote>
         </blockquote>
@@ -18,7 +18,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="layui-form-item">
             <div class="layui-form-item">
-                <div align="center" style="margin-top: 20px;text-align: right">
+                <div align="center" style="margin-top: 10px;text-align: right">
                     <button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit
                     <button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit
                             lay-filter="auditSupplier">确认
                             lay-filter="auditSupplier">确认
                     </button>
                     </button>