zhanglinxin 1 year ago
parent
commit
8493454877

+ 1 - 2
application/api/controller/Approve.php

@@ -123,7 +123,6 @@ class Approve extends Base
         $id = input('approve_id');
         $module = input('module');
         $reason = input('reason');
-        $state = input('state',1);
         $desc = input('desc','');
         $start_time = input('start_time');
         $end_time = input('end_time');
@@ -133,7 +132,7 @@ class Approve extends Base
         $is_who = input('is_who');
         $remark = input('remark');
         $peer_user = input('peer_user');
-        $params = compact("id", "module", "reason", "state", "desc", "start_time", "end_time", "document", "images", "type", "is_who", "remark", "peer_user");
+        $params = compact("id", "module", "reason", "desc", "start_time", "end_time", "document", "images", "type", "is_who", "remark", "peer_user");
         Db::startTrans();
         try {
             ApproveService::make($id,$params, $this->user,'edit');

+ 1 - 2
application/api/controller/Approveinfo.php

@@ -48,7 +48,6 @@ class Approveinfo extends Base
         $id = input('id');
         $module = input('module');
         $reason = input('reason');
-        $state = input('state');
         $desc = input('desc');
         $start_time = input('start_time');
         $end_time = input('end_time');
@@ -60,7 +59,7 @@ class Approveinfo extends Base
         $peer_user = input('peer_user');
         $approve_user = input('approve_user');
         $copy_user = input('copy_user');
-        $params = compact("id", "module", "reason", "state", "desc", "start_time", "end_time", "document", "images", "type", "is_who", "remark", "peer_user", "approve_user", "copy_user");
+        $params = compact("id", "module", "reason", "desc", "start_time", "end_time", "document", "images", "type", "is_who", "remark", "peer_user", "approve_user", "copy_user");
         Db::startTrans();
         try {
             ApproveInfoService::create($id, $module, $params, $this->user);

+ 36 - 0
application/common/constant/OfferConstant.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace app\common\constant;
+
+/**
+ * 呈批常量类
+ */
+class OfferConstant
+{
+
+    // 呈批类型:1=采购类呈批,2=非采购类呈批
+    const OFFER_TYPE_1 = '1';
+    const OFFER_TYPE_2 = '2';
+
+    public static function get_type_list()
+    {
+        return [
+            self::OFFER_TYPE_1 => '采购类呈批',
+            self::OFFER_TYPE_2 => '非采购类呈批',
+        ];
+    }
+
+    // 缓急程度:1=普通,2=紧急,3=特急
+    const OFFER_DEGREE_1 = '1';
+    const OFFER_DEGREE_2 = '2';
+    const OFFER_DEGREE_3 = '3';
+
+    public static function get_degree_list()
+    {
+        return [
+            self::OFFER_DEGREE_1 => '普通',
+            self::OFFER_DEGREE_2 => '紧急',
+            self::OFFER_DEGREE_3 => '特急',
+        ];
+    }
+}

+ 1 - 1
application/common/service/ApproveInfoService.php

@@ -62,7 +62,7 @@ class ApproveInfoService
             'order_no' => $order_no,
             'apply_date' => date("Y-m-d"),
             'reason' => $params['reason'],
-            'state' => $params['state'],
+            'type' => $params['type'],
             'desc' => $params['desc'],
             'start_time' => $params['start_time'],
             'end_time' => $params['end_time'],

+ 1 - 1
application/common/service/ApproveService.php

@@ -239,7 +239,7 @@ class ApproveService
 
         $data = [
             'reason' => $params['reason'],
-            'state' => $params['state'],
+            'type' => $params['type'],
             'desc' => $params['desc'],
             'start_time' => $params['start_time'],
             'end_time' => $params['end_time'],