zhanglinxin 1 year ago
parent
commit
ee8c1896c7

+ 24 - 5
application/api/controller/Approveinfo.php

@@ -52,14 +52,32 @@ class Approveinfo extends Base
      * @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落款")
-     * @Apidoc\Param("peer_user", type="array", require=false, desc="同行员工数据 module=5",
+     * @Apidoc\Param("approve_user", type="string", require=true, desc="审批人id(多个用英文逗号隔开)")
+     * @Apidoc\Param("copy_user", type="string", require=false, desc="抄送人id(多个用英文逗号隔开)")
+     * @Apidoc\Param("apply_data", type="array", require=false, desc="module=1 && type=1 必传申购物品数据",
+     *     @Apidoc\Param("goods_category_first", type="integer", require=true, desc="商品分类一级ID"),
+     *     @Apidoc\Param("goods_category_id", type="integer", require=true, desc="商品分类ID"),
+     *     @Apidoc\Param("goods_no", type="string", require=true, desc="商品编号"),
+     *     @Apidoc\Param("goods_name", type="string", require=true, desc="商品名称"),
+     *     @Apidoc\Param("goods_brand", type="string", require=false, desc="商品品牌"),
+     *     @Apidoc\Param("goods_sku", type="array", require=false, desc="规格项列表",
+     *          @Apidoc\Param("attr_name", type="string", desc="属性名"),
+     *          @Apidoc\Param("attr_values_text", type="array", desc="属性值列表",
+     *              @Apidoc\Param("value", type="string", desc="属性值"),
+     *          ),
+     *     ),
+     *     @Apidoc\Param("goods_sku_value", type="array", require=false, desc="规格列表",
+     *          @Apidoc\Param("goods_sku_ids", type="string", desc="规格项ids 多个用英文逗号隔开"),
+     *          @Apidoc\Param("price", type="integer", desc="单价"),
+     *          @Apidoc\Param("stock", type="integer", desc="数量"),
+     *     ),
+     * )
+     * @Apidoc\Param("peer_user", type="array", require=false, desc="module=5 传同行员工数据",
      *     @Apidoc\Param("is_who", type="integer", require=true, desc="是否外部人员:0=否,1=是"),
      *     @Apidoc\Param("user_id", type="string", require=false, desc="用户userid"),
      *     @Apidoc\Param("name", type="string", require=true, desc="姓名"),
      *     @Apidoc\Param("desc", type="string", require=false, desc="备注"),
      * )
-     * @Apidoc\Param("approve_user", type="string", require=true, desc="审批人id(多个用英文逗号隔开)")
-     * @Apidoc\Param("copy_user", type="string", require=false, desc="抄送人id(多个用英文逗号隔开)")
      */
     public function create()
     {
@@ -91,10 +109,11 @@ class Approveinfo extends Base
         $degree = input('degree');
         $department = input('department');
         $department_sign = input('department_sign');
-        $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", "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");
+        $apply_data = input('apply_data');
+        $peer_user = input('peer_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", "approve_user", "copy_user","apply_data","peer_user");
         Db::startTrans();
         try {
             ApproveInfoService::create($id, $module, $params, $this->user);

+ 6 - 6
application/api/controller/Goods.php

@@ -28,13 +28,13 @@ class Goods extends Base
      * @Apidoc\Returned("goods_name", type="integer", desc="商品名称")
      * @Apidoc\Returned("is_sku", type="string", desc="规格类型:0=单规格,1=多规格")
      * @Apidoc\Returned("weigh", type="integer", desc="权重")
-     * @Apidoc\Returned("goods_sku", type="array", desc="规格列表",
-     *     @Apidoc\Returned("id", type="integer", desc="规格ID"),
+     * @Apidoc\Returned("goods_sku", type="array", desc="规格列表",
+     *     @Apidoc\Returned("id", type="integer", desc="规格ID"),
      *     @Apidoc\Returned("goods_id", type="integer", desc="商品ID"),
-     *     @Apidoc\Returned("attr_name", type="string", desc="规格项"),
-     *     @Apidoc\Returned("attr_values_text", type="array", desc="规格值列表",
-     *         @Apidoc\Returned("id", type="integer", desc="规格值ID"),
-     *         @Apidoc\Returned("value", type="string", desc="规格值")
+     *     @Apidoc\Returned("attr_name", type="string", desc="属性名"),
+     *     @Apidoc\Returned("attr_values_text", type="array", desc="属性值列表",
+     *         @Apidoc\Returned("id", type="integer", desc="属性值序号"),
+     *         @Apidoc\Returned("value", type="string", desc="属性值")
      *     )
      * )
      */

+ 1 - 1
application/common/model/Goods.php

@@ -19,7 +19,7 @@ class Goods extends Model
     ];
 
 
-    // 关联商品Sku (商品列表)
+    // 关联商品规格项 (商品列表)
     public function goodsSku()
     {
         return $this->hasMany(GoodsSku::class, 'goods_id', 'id');