提交

application/api/controller/Approveinfo.php

@@ -29,6 +29,7 @@ class Approveinfo extends Base
      * @Apidoc\Param("way", type="string", require=true, desc="方式:create=申请,update=重新发起,edit=审批人修改")
      * @Apidoc\Param("id", type="integer", require=true, desc="ID way=cretae 不传值或传0,way=update 传值申请信息接口的id,way=edit 传值审批详情接口的approve_id")
      * @Apidoc\Param("module", type="integer", require=true, desc="模块类型:1=申购申请,2=呈批申请,3=入库申请,4=领用申请,5=出差申请,6=请假申请,7=用车申请,8=维修申请,9=合同呈批,10=收文批阅,11=学校文件")
+     * @Apidoc\Param("apply_user_id", type="string", require=false, desc="发起人 module=5,module=6,module=7")
      * @Apidoc\Param("reason", type="string", require=false, desc="module=1申购事由,module=2申请标题,module=4物品用途,module=5出差事由,module=6请假原因,module=7出发地点,module=8维修地点,module=9合同编号,module=10文件名称,module=11文件名称")
      * @Apidoc\Param("type", type="integer", require=false, desc="module=1采购类型,module=2呈批类型,module=5出差类型,module=6请假类型,module=8维修类型,module=9合同类型")
      * @Apidoc\Param("desc", type="string", require=false, desc="module=2缓急程度,module=8具体内容,module=9缓急程度,module=10来文单位名称,module=11缓急程度")
@@ -41,7 +42,7 @@ class Approveinfo extends Base
      * @Apidoc\Param("pay_type", type="integer", require=false, desc="module=1支付方式")
      * @Apidoc\Param("word_size", type="integer", require=false, desc="module=2发文字号")
      * @Apidoc\Param("number", type="integer", require=false, desc="module=2印制份数,module=9印制份数")
-     * @Apidoc\Param("apply_id", type="integer", require=false, desc="module=3采购审批单ID")
+     * @Apidoc\Param("apply_id", type="integer", require=false, desc="module=3采购审批单ID 没有传0")
      * @Apidoc\Param("is_who", type="integer", require=false, desc="module=5是否跨关内关外:0=否,1=是 type=1")
      * @Apidoc\Param("start_am", type="string", require=false, desc="module=6开始时间段（上午或下午）")
      * @Apidoc\Param("end_am", type="string", require=false, desc="module=6结束时间段（上午或下午）")
@@ -94,10 +95,11 @@ class Approveinfo extends Base
      */
     public function create()
     {
-        // {"way":"create","id": "","module": "1","reason": "测试","type": "1","desc": "","start_time": "","end_time": "","document": "","images": "","remark": "","total_amount": "1000","pay_type": "1","word_size": "","number": "","is_who": "","start_am": "","end_am": "","time": "","reach_address": "","end_address": "","scope": "","legal_opinion": "","founder": "","serial_number": "","apply_date": "","degree": "","department": "","department_sign": "","approve_user": "1925696723824730358","copy_user": "","apply_goods": [{"id": "1","goods_category_first": "1","goods_category_id": "3","goods_no": "100001","goods_name": "医疗口罩一次性","goods_brand": "一次性口罩","goods_stock": [{"id": "1","name": "均码,白色","price": "1","stock": "110"},{"id": "2","name": "均码,蓝色","price": "1","stock": "100"},{"id": "19","name": "均码,红色","price": "1","stock": "120"}]},{"id": "2","goods_category_first": "1","goods_category_id": "3","goods_no": "100002","goods_name": "84消毒液","goods_brand": "安其生","goods_stock": [{"id": "3","name": "380ml,低浓度","price": "1","stock": "110"},{"id": "4","name": "380ml,高浓度","price": "1","stock": "100"}]},{"id": "","goods_category_first": "1","goods_category_id": "3","goods_no": "100003","goods_name": "一次性手套丁腈橡胶","goods_brand": "万力","goods_stock": [{"name": "白色","price": "0.2","stock": "110"},{"name": "蓝色","price": "0.2","stock": "100"}]}],"peer_user": [{"is_who": "","user_id": "","name": "","desc": ""}]}
+        // {"way":"create","id": "","module": "1","apply_user_id":"","reason": "测试","type": "1","desc": "","start_time": "","end_time": "","document": "","images": "","remark": "","total_amount": "1000","pay_type": "1","word_size": "","apply_id":"0","number": "","is_who": "","start_am": "","end_am": "","time": "","reach_address": "","end_address": "","scope": "","legal_opinion": "","founder": "","serial_number": "","apply_date": "","degree": "","department": "","department_sign": "","approve_user": "1925696723824730358","copy_user": "","apply_goods": [{"id": "1","goods_category_first": "1","goods_category_id": "3","goods_no": "100001","goods_name": "医疗口罩一次性","goods_brand": "一次性口罩","goods_stock": [{"id": "1","name": "均码,白色","price": "1","stock": "110"},{"id": "2","name": "均码,蓝色","price": "1","stock": "100"},{"id": "19","name": "均码,红色","price": "1","stock": "120"}]},{"id": "2","goods_category_first": "1","goods_category_id": "3","goods_no": "100002","goods_name": "84消毒液","goods_brand": "安其生","goods_stock": [{"id": "3","name": "380ml,低浓度","price": "1","stock": "110"},{"id": "4","name": "380ml,高浓度","price": "1","stock": "100"}]},{"id": "","goods_category_first": "1","goods_category_id": "3","goods_no": "100003","goods_name": "一次性手套丁腈橡胶","goods_brand": "万力","goods_stock": [{"name": "白色","price": "0.2","stock": "110"},{"name": "蓝色","price": "0.2","stock": "100"}]}],"peer_user": [{"is_who": "","user_id": "","name": "","desc": ""}]}
         $way = input('way');
         $id = input('id',0);
         $module = input('module');
+        $apply_user_id = input('apply_user_id','');
         $reason = input('reason');
         $type = input('type');
         $desc = input('desc');
@@ -130,7 +132,7 @@ class Approveinfo extends Base
         $apply_goods = input('apply_goods');
         $stock_goods = input('stock_goods');
         $peer_user = input('peer_user');
-        $params = compact("way","id", "module", "reason", "type", "desc", "start_time", "end_time", "document", "images", "remark", "total_amount", "pay_type", "word_size", "apply_id","number", "is_who", "start_am", "end_am", "time", "reach_address", "end_address", "scope", "legal_opinion", "founder", "serial_number", "apply_date", "degree", "department", "department_sign", "approve_user", "copy_user", "apply_goods", "stock_goods","peer_user");
+        $params = compact("way","id", "module", "apply_user_id","reason", "type", "desc", "start_time", "end_time", "document", "images", "remark", "total_amount", "pay_type", "word_size", "apply_id","number", "is_who", "start_am", "end_am", "time", "reach_address", "end_address", "scope", "legal_opinion", "founder", "serial_number", "apply_date", "degree", "department", "department_sign", "approve_user", "copy_user", "apply_goods", "stock_goods","peer_user");
         $user = $this->user;
         if($way == CommonConstant::edit){
             ApproveService::make($id, $params, $user, CommonConstant::edit);

application/common/service/ApproveInfoService.php

@@ -33,6 +33,8 @@ class ApproveInfoService
     public static function create($id, $module, $params, $user)
     {
         $userid = $user['userid'];
+        $apply_user_id = $params['apply_user_id'] ? $params['apply_user_id']: 0;
+
         // 编辑
         if ($id > 0) {
             $info = ApproveInfo::field('user_id,is_deleted', true)
@@ -60,7 +62,8 @@ class ApproveInfoService
         $data = [
             'module' => $module,
             'user_id' => $userid,
-            'department' => $user['department'],
+            'apply_user_id' => $apply_user_id,
+            'department' => $user['department'], // TODO 发起人的部门
             'status' => CommonConstant::STATUS_2,
             'approve_num' => $approve_num,
             'cur_num' => 0,