提交

application/api/controller/Approveinfo.php

@@ -26,25 +26,29 @@ class Approveinfo extends Base
      * @Apidoc\Method("POST")
      * @Apidoc\Param("id", type="integer", require=false, desc="申请ID 重新发起必传")
      * @Apidoc\Param("module", type="integer", require=true, desc="模块类型:1=申购申请,2=呈批申请,3=入库申请,4=领用申请,5=出差申请,6=请假申请,7=用车申请,8=维修申请,9=合同呈批,10=收文批阅,11=学校文件")
-     * @Apidoc\Param("reason", type="string", require=false, desc="module=2申请标题,module=5出差事由,module=6请假原因,module=7出发地点,module=8维修地点,module=9合同编号,module=10文件名称,module=11文件名称")
-     * @Apidoc\Param("type", type="integer", require=false, desc="module=2呈批类型,module=5出差类型,module=6请假类型,module=8维修类型,module=9合同类型")
+     * @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缓急程度")
      * @Apidoc\Param("start_time", type="string", require=false, desc="module=5出差开始时间,module=7出发时间")
      * @Apidoc\Param("end_time", type="string", require=false, desc="module=5出差结束时间,module=7返回时间")
-     * @Apidoc\Param("document", type="string", require=false, desc="module=2,module=5,module=6,module=7,module=9,module=10,module=11 附件（多个用英文逗号隔开）")
-     * @Apidoc\Param("images", type="string", require=false, desc="module=5,module=6,module=7,module=8 图片（多个用英文逗号隔开）")
-     * @Apidoc\Param("remark", type="string", require=false, desc="module=2申请内容,module=5备注,module=6是否离"深",module=9备注说明,module=10内容摘要,module=11上会情况")
+     * @Apidoc\Param("document", type="string", require=false, desc="module=1,module=2,module=3,module=4,module=5,module=6,module=7,module=9,module=10,module=11 附件（多个用英文逗号隔开）")
+     * @Apidoc\Param("images", type="string", require=false, desc="module=1,module=3,module=5,module=6,module=7,module=8 图片（多个用英文逗号隔开）")
+     * @Apidoc\Param("remark", type="string", require=false, desc="module=2申请内容,module=3其它补充说明,module=4其它补充说明,module=5备注,module=6是否离"深",module=9备注说明,module=10内容摘要,module=11上会情况")
+     * @Apidoc\Param("total_amount", type="string", require=false, desc="module=1总金额")
+     * @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("is_who", type="integer", require=false, desc="module=5是否跨关内关外:0=否,1=是")
-     * @Apidoc\Param("time", type="integer", require=false, desc="module=6请假时长")
+     * @Apidoc\Param("start_am", type="string", require=false, desc="module=6开始时间段（上午或下午）")
+     * @Apidoc\Param("end_am", type="string", require=false, desc="module=6结束时间段（上午或下午）")
+     * @Apidoc\Param("time", type="string", require=false, desc="module=6请假时长")
      * @Apidoc\Param("reach_address", type="string", require=false, desc="module=7到达地点")
      * @Apidoc\Param("end_address", type="string", require=false, desc="module=7返回地点")
      * @Apidoc\Param("scope", type="string", require=false, desc="module=9发放范围")
      * @Apidoc\Param("legal_opinion", type="string", require=false, desc="module=9法务意见")
      * @Apidoc\Param("founder", type="string", require=false, desc="module=10创建人")
      * @Apidoc\Param("serial_number", type="string", require=false, desc="module=10收文序号,module=11文件号")
-     * @Apidoc\Param("apply_date", type="string", require=false, desc="module=10收文日期,module=11拟发文时间")
+     * @Apidoc\Param("apply_date", type="string", require=false, desc="module=1预计申购完成日期(日期),module=10收文日期(日期),module=11拟发文时间(日期)")
      * @Apidoc\Param("degree", type="string", require=false, desc="module=10缓急程度")
      * @Apidoc\Param("department", type="string", require=false, desc="module=11拟稿部门")
      * @Apidoc\Param("department_sign", type="string", require=false, desc="module=11落款")
@@ -69,9 +73,13 @@ class Approveinfo extends Base
         $document = input('document');
         $images = input('images');
         $remark = input('remark');
+        $total_amount = input('total_amount');
+        $pay_type = input('pay_type');
         $word_size = input('word_size');
         $number = input('number');
         $is_who = input('is_who');
+        $start_am = input('start_am');
+        $end_am = input('end_am');
         $time = input('time');
         $reach_address = input('reach_address');
         $end_address = input('end_address');
@@ -86,7 +94,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", "type", "desc", "start_time", "end_time", "document", "images", "remark", "word_size", "number", "is_who","time", "reach_address", "end_address", "scope", "legal_opinion", "founder", "serial_number", "apply_date", "degree", "department", "department_sign", "peer_user", "approve_user", "copy_user");
+        $params = compact("id", "module", "reason", "type", "desc", "start_time", "end_time", "document", "images", "remark", "total_amount","pay_type","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", "peer_user", "approve_user", "copy_user");
         Db::startTrans();
         try {
             ApproveInfoService::create($id, $module, $params, $this->user);

application/common/service/ApproveInfoService.php

@@ -100,6 +100,14 @@ class ApproveInfoService
         $data = [];
         switch ($module) {
             case CommonConstant::MODULE_1:
+                $data['info_id'] = $info_id;
+                $data['reason'] = $params['reason'];
+                $data['type'] = $params['type'];
+                $data['total_amount'] = $params['total_amount'];
+                $data['apply_date'] = $params['apply_date'];
+                $data['document'] = $params['document'];
+                $data['images'] = $params['images'];
+                $data['pay_type'] = $params['pay_type'];
                 break;
             case CommonConstant::MODULE_2:
                 $data['info_id'] = $info_id;
@@ -112,8 +120,16 @@ class ApproveInfoService
                 $data['document'] = $params['document'];
                 break;
             case CommonConstant::MODULE_3:
+                $data['info_id'] = $info_id;
+                $data['document'] = $params['document'];
+                $data['images'] = $params['images'];
+                $data['remark'] = $params['remark'];
                 break;
             case CommonConstant::MODULE_4:
+                $data['info_id'] = $info_id;
+                $data['reason'] = $params['reason'];
+                $data['document'] = $params['document'];
+                $data['remark'] = $params['remark'];
                 break;
             case CommonConstant::MODULE_5:
                 $data['info_id'] = $info_id;
@@ -131,6 +147,8 @@ class ApproveInfoService
                 $data['type'] = $params['type'];
                 $data['start_time'] = $params['start_time'];
                 $data['end_time'] = $params['end_time'];
+                $data['start_am'] = $params['start_am'];
+                $data['end_am'] = $params['end_am'];
                 $data['time'] = $params['time'];
                 $data['reason'] = $params['reason'];
                 $data['document'] = $params['document'];
@@ -187,7 +205,6 @@ class ApproveInfoService
                 $data['serial_number'] = $params['serial_number'];
                 break;
         }
-
         if ($type == 'update') {
             $module_result = $info->module_info->save($data);
         } else {

application/common/validate/ApproveApply.php

@@ -14,11 +14,9 @@ class ApproveApply extends Validate
      */
     protected $rule = [
         'reason' => 'require',
-        'start_time' => 'require|check_start_time',
-        'end_time' => 'require|check_end_time',
-        'type' => 'require|in:1,2',
-        'is_who' => 'requireIf:type,1',
-        'remark' => 'requireIf:is_who,1',
+        'type' => 'require|gt:0',
+        'total_amount' => 'require|gt:0',
+        'pay_type' => 'require|gt:0',
         'approve_user' => 'require',
     ];
     /**
@@ -30,9 +28,9 @@ class ApproveApply extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'update' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'edit' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark'],
+        'create' => ['reason', 'type', 'total_amount', 'pay_type', 'approve_user'],
+        'update' => ['reason', 'type', 'total_amount', 'pay_type', 'approve_user'],
+        'edit' => ['reason', 'type', 'total_amount', 'pay_type'],
     ];
 
     /**
@@ -45,36 +43,17 @@ class ApproveApply extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
-            'reason' => '事由',
-            'start_time' => '出差开始时间',
-            'end_time' => '出差结束时间',
-            'type' => '出差类型',
-            'is_who' => '是否跨关内关外',
-            'remark' => '备注',
+            'reason' => '申购事由',
+            'type' => '采购类型',
+            'total_amount' => '总金额',
+            'pay_type' => '支付方式',
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
-            'start_time.check_start_time' => '出差开始时间必须大于当前时间',
-            'end_time.check_end_time' => '出差结束时间必须大于开始时间',
-            'type.in' => '请选择出差类型',
+            'type.gt' => '请选择正确的采购类型',
+            'pay_type.gt' => '请选择正确的支付方式',
         ]);
         parent::__construct($rules, $message, $field);
     }
 
-    protected function check_start_time($value, $rule, $data)
-    {
-        if ($value <= date('Y-m-d H:i')) {
-            return false;
-        }
-        return true;
-    }
-
-    protected function check_end_time($value, $rule, $data)
-    {
-        if ($data['start_time'] >= $value) {
-            return false;
-        }
-        return true;
-    }
-
 }

application/common/validate/ApproveStock.php

@@ -13,12 +13,6 @@ class ApproveStock extends Validate
      * 验证规则
      */
     protected $rule = [
-        'reason' => 'require',
-        'start_time' => 'require|check_start_time',
-        'end_time' => 'require|check_end_time',
-        'type' => 'require|in:1,2',
-        'is_who' => 'requireIf:type,1',
-        'remark' => 'requireIf:is_who,1',
         'approve_user' => 'require',
     ];
     /**
@@ -30,9 +24,9 @@ class ApproveStock extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'update' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'edit' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark'],
+        'create' => ['approve_user'],
+        'update' => ['approve_user'],
+        'edit' => [],
     ];
 
     /**
@@ -45,36 +39,12 @@ class ApproveStock extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
-            'reason' => '事由',
-            'start_time' => '出差开始时间',
-            'end_time' => '出差结束时间',
-            'type' => '出差类型',
-            'is_who' => '是否跨关内关外',
-            'remark' => '备注',
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
-            'start_time.check_start_time' => '出差开始时间必须大于当前时间',
-            'end_time.check_end_time' => '出差结束时间必须大于开始时间',
-            'type.in' => '请选择出差类型',
+
         ]);
         parent::__construct($rules, $message, $field);
     }
 
-    protected function check_start_time($value, $rule, $data)
-    {
-        if ($value <= date('Y-m-d H:i')) {
-            return false;
-        }
-        return true;
-    }
-
-    protected function check_end_time($value, $rule, $data)
-    {
-        if ($data['start_time'] >= $value) {
-            return false;
-        }
-        return true;
-    }
-
 }

application/common/validate/ApproveUse.php

@@ -14,11 +14,6 @@ class ApproveUse extends Validate
      */
     protected $rule = [
         'reason' => 'require',
-        'start_time' => 'require|check_start_time',
-        'end_time' => 'require|check_end_time',
-        'type' => 'require|in:1,2',
-        'is_who' => 'requireIf:type,1',
-        'remark' => 'requireIf:is_who,1',
         'approve_user' => 'require',
     ];
     /**
@@ -30,9 +25,9 @@ class ApproveUse extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'update' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'edit' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark'],
+        'create' => ['reason','approve_user'],
+        'update' => ['reason','approve_user'],
+        'edit' => ['reason',],
     ];
 
     /**
@@ -45,36 +40,13 @@ class ApproveUse extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
-            'reason' => '事由',
-            'start_time' => '出差开始时间',
-            'end_time' => '出差结束时间',
-            'type' => '出差类型',
-            'is_who' => '是否跨关内关外',
-            'remark' => '备注',
+            'reason' => '物品用途',
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
-            'start_time.check_start_time' => '出差开始时间必须大于当前时间',
-            'end_time.check_end_time' => '出差结束时间必须大于开始时间',
-            'type.in' => '请选择出差类型',
+
         ]);
         parent::__construct($rules, $message, $field);
     }
 
-    protected function check_start_time($value, $rule, $data)
-    {
-        if ($value <= date('Y-m-d H:i')) {
-            return false;
-        }
-        return true;
-    }
-
-    protected function check_end_time($value, $rule, $data)
-    {
-        if ($data['start_time'] >= $value) {
-            return false;
-        }
-        return true;
-    }
-
 }