提交

application/api/controller/Approveflow.php

@@ -36,6 +36,7 @@ class Approveflow extends Base
      *     @Apidoc\Returned("headimg", type="string", desc="头像"),
      *     @Apidoc\Returned("name", type="string", desc="姓名"),
      * )
+     * @Apidoc\Returned("is_copy", type="integer", desc="是否允许用户自己添加抄送人 0=否,1=是")
      */
     public function get_data()
     {

application/api/controller/Common.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\constant\CommonConstant;
+use app\common\constant\EvectionConstant;
+use app\common\service\ApproveService;
+use hg\apidoc\annotation as Apidoc;
+use think\Db;
+use think\Exception;
+
+/**
+ * @Apidoc\Title("公用")
+ * @Apidoc\Group("api")
+ * @Apidoc\Sort("0")
+ */
+class Common extends Base
+{
+    public function initialize()
+    {
+        parent::initialize();
+    }
+
+    /**
+     * 模块列表
+     *
+     * @Apidoc\Method("POST")
+     */
+    public function get_module_list()
+    {
+        $this->success('模块列表', get_one_two_array(CommonConstant::get_module_list(), 'id', 'name'));
+    }
+
+    /**
+     * 出差类型列表
+     *
+     * @Apidoc\Method("POST")
+     */
+    public function get_evection_list()
+    {
+        $this->success('出差类型列表', get_one_two_array(EvectionConstant::get_type_list(), 'id', 'name'));
+    }
+
+}

application/common.php

@@ -194,3 +194,23 @@ function get_order_sn($user_id)
     $id = str_pad($user_id, (24 - strlen($order_sn)), '0', STR_PAD_BOTH);
     return $order_sn . $id;
 }
+
+/**
+ * 一维数组转为二维数组
+ *
+ * @param array $arr
+ * @param string $str1
+ * @param string $str2
+ * @return array
+ */
+function get_one_two_array($arr, $str1, $str2)
+{
+    $item = [];
+    foreach ($arr as $k => $v) {
+        $item[] = [
+            $str1 => $k,
+            $str2 => $v,
+        ];
+    }
+    return $item;
+}

application/common/constant/CommonConstant.php

@@ -48,14 +48,14 @@ class CommonConstant
     public static function get_module_list()
     {
         return [
-            self::MODULE_1 => '申购',
-            self::MODULE_2 => '呈批',
-            self::MODULE_3 => '入库',
-            self::MODULE_4 => '领用',
-            self::MODULE_5 => '出差',
-            self::MODULE_6 => '请假',
-            self::MODULE_7 => '用车',
-            self::MODULE_8 => '维修',
+            self::MODULE_1 => '申购申请',
+            self::MODULE_2 => '呈批申请',
+            self::MODULE_3 => '入库申请',
+            self::MODULE_4 => '领用申请',
+            self::MODULE_5 => '出差申请',
+            self::MODULE_6 => '请假申请',
+            self::MODULE_7 => '用车申请',
+            self::MODULE_8 => '维修申请',
             self::MODULE_9 => '合同呈批',
             self::MODULE_10 => '收文批阅',
             self::MODULE_11 => '学校文件',
@@ -144,7 +144,6 @@ class CommonConstant
         ];
     }
 
-
     // 审核状态:1=待审批,2=审批中,3=审批同意,4=审批驳回,5=审批撤销
     const STATUS_1 = 1;
     const STATUS_2 = 2;

application/common/constant/EvectionConstant.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\constant;
+
+/**
+ * 出差常量类
+ */
+class EvectionConstant
+{
+
+    // 出差类型:1=市内,2=市外
+    const EVECTION_TYPE_1 = '1';
+    const EVECTION_TYPE_2 = '2';
+
+    public static function get_type_list()
+    {
+        return [
+            self::EVECTION_TYPE_1 => '市内出差',
+            self::EVECTION_TYPE_2 => '市外出差',
+        ];
+    }
+}

application/common/service/ApproveFlowService.php

@@ -38,6 +38,7 @@ class ApproveFlowService
         // 抄送
         $name = 'is_copy_' . $module;
         $is_copy = sysconf($name); // 是否允许用户自己添加抄送人 0=否,1=是
+        $copy_user = [];
         if (!$is_copy) {
             $copy = ApproveFlow::get_where($module, CommonConstant::TYPE_2, CommonConstant::IS_SPECIAL_1, $userid)
                 ->field($field)
@@ -51,10 +52,8 @@ class ApproveFlowService
                 $copy_user_ids = $copy_info ? $copy_info['user_ids'] : [];
             }
             $copy_user = self::get_user_list($copy_user_ids);
-        } else {
-            $copy_user = [];
         }
-        return compact('approve_user', 'copy_user');
+        return compact('approve_user', 'copy_user', 'is_copy');
     }
 
     protected static function get_user_list($user_ids)