申请审核

app/Http/Controllers/Api/SupplierApiController.php

@@ -186,8 +186,8 @@ class SupplierApiController extends Controller
         if (!$result) {
         if (!$result) {
             $this->response(-1, '修改失败');
             $this->response(-1, '修改失败');
         }
         }
-        //如果是申请审核,还要去修改审核状态,如果是忽略更新审核的话,也没必要走下面的步骤
-        if ($isAudit && !checkPerm('IgnoreUpdateAudit')) {
+        //如果是申请审核,还要去修改审核状态,
+        if ($isAudit) {
             $supplierService = new SupplierService();
             $supplierService = new SupplierService();
             $auditData[] = [
             $auditData[] = [
                 'supplier_id' => $supplierId,
                 'supplier_id' => $supplierId,

app/Http/Services/SupplierService.php

@@ -70,7 +70,6 @@ class SupplierService
                 'return_phone'
                 'return_phone'
             ]);
             ]);
             $shippingAddress = array_get($channel, 'shipping_address');
             $shippingAddress = array_get($channel, 'shipping_address');
-            $attachment = $channel['attachment'];
             unset($channel['return_phone'], $channel['return_address'],
             unset($channel['return_phone'], $channel['return_address'],
                 $channel['return_consignee']);
                 $channel['return_consignee']);
             unset($channel['shipping_address'], $channel['cn_delivery_time_period'],
             unset($channel['shipping_address'], $channel['cn_delivery_time_period'],
@@ -181,11 +180,8 @@ class SupplierService
                 $supplierAddressService->saveShippingAddress($supplierId, $shippingAddress);
                 $supplierAddressService->saveShippingAddress($supplierId, $shippingAddress);
 
 
             } else {
             } else {
-
                 /**这里的是更新供应商的操作**/
                 /**这里的是更新供应商的操作**/
-
                 $supplierId = $this->newSupplierId = $channel['supplier_id'];
                 $supplierId = $this->newSupplierId = $channel['supplier_id'];
-                $supplier = SupplierChannelModel::where('supplier_id', $supplierId)->first()->toArray();
                 //要做进一步判断,部分字段修改不需要审核
                 //要做进一步判断,部分字段修改不需要审核
                 $auditService = new SupplierAuditService();
                 $auditService = new SupplierAuditService();
                 $needAudit = $auditService->checkNeedAudit($supplierId, $channel);
                 $needAudit = $auditService->checkNeedAudit($supplierId, $channel);

resources/views/script/SupplierListScript.blade.php

@@ -455,7 +455,7 @@
                     }
                     }
                 });
                 });
                 if (!canApplyInReview) {
                 if (!canApplyInReview) {
-                    layer.msg('选择的供应商里,存在 审核中/待复审 状态的供应商,无法申请审核', {icon: 5})
+                    layer.msg('选择的供应商里,存在 审核中/待复审 状态的供应商,无法分配采购员', {icon: 5})
                 } else {
                 } else {
                     let supplierIds = Array.from(data, ({supplier_id}) => supplier_id);
                     let supplierIds = Array.from(data, ({supplier_id}) => supplier_id);
                     if (supplierIds.length > 20) {
                     if (supplierIds.length > 20) {