edit

assets/layadmin/html/project/database/update.html

@@ -101,7 +101,7 @@
         }
     });
     */
-
+    /*
     var obj = skuTable.render({
             //规格类型 0统一规格 1多规格
             isAttributeValue: 0,
@@ -222,7 +222,7 @@
             //获取SKU数据接口地址，如果为空或者不配置则使用skuData配置
             //接口要求返回格式参考 skuData.json
             // skuDataUrl: './json/skuData.json',
-        });
+        });*/
 
     init();
   });

database/admin.php

@@ -978,10 +978,11 @@ return array
             'option' => array
             (
                 'ids' => array('yes-id', 'in'),
+                'status' => 1,
                 'state' => 1,
             ),
             'type' => 'all',
-            'col' => '*',
+            'col' => '*,username as name',
         ),
 
         # 扩展list方法的option

database/role.php

@@ -292,7 +292,7 @@ $config = array
 			'default' 	=> '',
 			'desc' 		=> '请选择数据权限',
 			'match' 	=> 'option',
-			'update'	=> 'checkbox',
+			//'update'	=> 'checkbox',
 			'option'	=> $top,
 		),
 

src/Company.php

@@ -162,8 +162,11 @@ class Company extends Save
     }
 
     # 获取部门下的员工
-    public function getAdmin($group, $id = false)
+    public function getAdmin($group, $id = false, $admin_id = false)
     {
+        if ($admin_id) {
+            return Dever::db('manage/admin')->getAll(array('ids' => $admin_id));
+        }
         $where['group_id'] = $group;
         if ($id) {
             $where['admin_id'] = $id;

src/Database.php

@@ -4166,20 +4166,45 @@ class Database
                         $sku_table = $config['manage']['sku']['sku'];
                     }
 
-                    [{"id":1,"title":"颜色","child":[{"id":"1","title":"红","checked":true},{"id":"2","title":"黄","checked":false},{"id":"3","title":"蓝","checked":false}]},{"id":2,"title":"尺码","child":[{"id":"4","title":"S","checked":true},{"id":"5","title":"M","checked":true},{"id":"6","title":"L","checked":true},{"id":"7","title":"XL","checked":true}]},{"id":3,"title":"款式","child":[{"id":"8","title":"男款","checked":true},{"id":"9","title":"女款","checked":true}]}]
-                    
+                    /*
+                    [{"id":1,"title":"颜色","child":[{"id":"1","title":"红","checked":true},{"id":"2","title":"黄","checked":false},{"id":"3","title":"蓝","checked":false}]},{"id":2,"title":"尺码","child":[{"id":"4","title":"S","checked":true},{"id":"5","title":"M","checked":true},{"id":"6","title":"L","checked":false},{"id":"7","title":"XL","checked":false}]},{"id":3,"title":"款式","child":[{"id":"8","title":"男款","checked":true},{"id":"9","title":"女款","checked":true}]},{"id":"4w627wudvpy000","title":"test","child":[{"id":"2kct9uahekm000","title":"111","checked":true},{"id":"vishp09dv4000","title":"222","checked":true}]}]
+
+                    skus[1-4-8-2kct9uahekm000][price]: 0
+                    */
+
                     $spec = Dever::input('spec');
-                    if ($spec) {
+                    $sku = Dever::input('skus');
+                    if ($spec && $sku) {
                         if (!isset($spec_table)) {
                             $spec_table = 'info_spec';
                         }
+                        $spec_table = $this->project . '/' . $spec_table;
+                        $spec_value_table = $spec_table . '_value';
                         $spec = Dever::json_decode($spec);
                         if ($spec) {
+                            $sku_id = array();
+                            Dever::db($spec_table)->updates(array('option_info_id' => $id, 'set_state' => 2));
+                            Dever::db($spec_value_table)->updates(array('option_info_id' => $id, 'set_state' => 2));
                             foreach ($spec as $k1 => $v1) {
                                 if (is_numeric($v1['id'])) {
-
+                                    $spec_id = Dever::db($spec_table)->update(array('where_id' => $v1['id'], 'set_state' => 1));
                                 } else {
+                                    $spec_id = Dever::db($spec_table)->insert(array('name' => $v1['title'], 'info_id' => $id));
+                                }
+                                foreach ($v1['child'] as $k2 => $v2) {
+                                    if (is_numeric($v2['id'])) {
+                                        $sku_id[$v2['id']] = Dever::db($spec_value_table)->update(array('where_id' => $v2['id'], 'set_state' => 1));
+                                    } else {
+                                        $v2['checked'] = $v2['checked'] ? 1 : 2;
+                                        $sku_id[$v2['id']] = Dever::db($spec_value_table)->insert(array('value' => $v2['title'], 'is_checked' => $v2['checked'], 'info_id' => $id, 'spec_id' => $spec_id));
+                                    }
+                                }
+                            }
 
+                            //Dever::db($spec_table)->delete(array('info_id' => $id, 'state' => 2));
+                            if ($sku_id) {
+                                foreach ($sku as $k1 => $v1) {
+                                    $temp = explode('-', $k1);
                                 }
                             }
                         }