录入

app/admin/controller/goods/ProductConfig.php

@@ -22,8 +22,8 @@ class ProductConfig extends Backend
         $this->model = new ProductConfigModel();
 
         //
-        $this->assign('varietyList', StockConfig::where('type_id', 'variety_name')->column('field_name','id'));
-        $this->assign('packingList', StockConfig::where('type_id', 'packing_box')->column('field_name','id'));
+        $this->assign('varietyList', StockConfig::where('type_id', 'variety_name')->column('title','id'));
+        $this->assign('packingList', StockConfig::where('type_id', 'packing_box')->column('title','id'));
      
     }
 

app/admin/view/goods/product_config/add.html

@@ -13,11 +13,11 @@
             row:Yunqi.data.row,
             columns:[
                 {field: 'id',title: __('ID'),edit:'hidden'},
-                {field: 'type_id', title: __('类型'), edit: 'select',rules:"required",searchList: Yunqi.data.varietyList},
+                {field: 'type_id', title: __('类型'), edit: 'radio',rules:"required",searchList: Yunqi.data.varietyList},
                 {field: 'title',title: __('名称'),edit:'text',rules:'required'},
                 {field: 'another_name',title: __('别名'),edit:'text',rules:'required'},
                 {field: 'weight',title: __('重量(斤)'),edit:'text',rules:'required'},
-                {field: 'type_box',title: __('包装箱'),edit:'select',rules:'required', searchList: Yunqi.data.packingList},
+                {field: 'type_box',title: __('包装箱'),edit:'radio',rules:'required', searchList: Yunqi.data.packingList},
                 {field: 'sort',title: __('排序'),edit:'text'},
                 {field: 'status', title: __('状态'), edit:'switch',searchList: {1: __('正常'),2: __('隐藏')}},
             ]

app/admin/view/shop/shop_list/add.html

@@ -17,7 +17,7 @@
                 {field: 'id',title: __('ID'),edit:'hidden'},
        
                 {field: 'customer_id', title: __('客户'),searchList:Yunqi.data.customerList,edit: 'select',rules:'required'},
-                {field: 'platform',title: __('平台'), edit: 'select', rules:'required',searchList:Yunqi.data.platformList},
+                {field: 'platform',title: __('平台'), edit: 'radio', rules:'required',searchList:Yunqi.data.platformList},
                 {field: 'name',title: __('店铺名称'),edit:'text',rules:'required'},
                {field: 'staff_id', title: __('员工'), edit: 'select',searchList: Yunqi.data.userList},
                 {field: 'status', title: __('状态'), edit:'switch',searchList: {1: __('正常'),2: __('隐藏')}},

app/admin/view/user/index/add.html

@@ -16,7 +16,7 @@
                 {field: 'nickname', title: __('姓名'), edit: 'text',rules:"required",searchList: Yunqi.data.varietyList},
                 {field: 'username',title: __('账户'),edit:'text',rules:'required'},
                 {field: 'password',title: __('密码'),edit:'text',rules:'required;length(6~30)'},
-                {field: 'role',title: __('角色'),edit:'radio',searchList: {1:'录入员', 2:'库管'}},
+                {field: 'role',title: __('角色'),edit:'checkbox',searchList: {1:'录入员', 2:'库管'}},
                 {field: 'remark',title: __('备注'),edit:'textarea'},
                 {field: 'status', title: __('状态'), edit:'switch',searchList: {'normal': __('正常'),'hidden': __('隐藏')}},
             ]

app/admin/view/user/index/edit.html

@@ -25,7 +25,7 @@
                 {field: 'sex', title: __('性别'), edit: 'radio',rules:"required",searchList: {1: __('男'), 2: __('女')}},
                 {field: 'email',title: __('邮箱'),rules:'email',edit:'text'},
                 {field: 'mobile',title: __('手机'),edit:'text',rules:'mobile'},
-                {field: 'role',title: __('角色'),edit:'radio',searchList: {1:'录入员', 2:'库管'}},
+                {field: 'role',title: __('角色'),edit:'checkbox',searchList: {1:'录入员', 2:'库管'}},
                 {field: 'status', title: __('状态'), edit:'switch',searchList: {'normal': __('正常'),'hidden': __('隐藏')}},
             ]
         },

app/admin/view/user/index/index.html

@@ -41,7 +41,16 @@
                 {field: 'sex', title: __('性别'),width:100,searchList: {1: __('男'), 2: __('女')},operate:false,formatter:Yunqi.formatter.select},
                 {field: 'email',title: __('邮箱'),operate:'LIKE'},
                 {field: 'mobile',title: __('手机'),operate: '='},
-                {field: 'role', title: __('角色'),sortable: true,operate:'selects',searchList:{0:'录入员 ',1:'库管'}},
+                {field: 'role', title: __('角色'),sortable: true,operate:'selects', formatter(value, row, index) {
+                    let role = "";
+                    if(value ==0)  return "";
+                    if(value=="1,2") return "录入员-库管";
+                    if (value.indexOf("1") !== -1) {
+                        return "录入员";
+                    } else {
+                        return "库管";
+                    }
+                }},
                 {field: 'status', title: __('状态'),searchList: {'normal': __('正常'),'hidden': __('隐藏')},formatter:Yunqi.formatter.switch,operate:'select'},
                 {field: 'createtime', title: __('创建时间'), width:160,formatter: Yunqi.formatter.datetime,operate:false,sortable: true},
                 {

app/api/controller/Shops.php

@@ -12,16 +12,15 @@ use think\exception\ValidateException;
 
 class Shops extends Base
 {
-   // protected $noNeedLogin = [''];
+    //protected $noNeedLogin = ['*'];
 
     /**
      * @return void 全部平台
      */
     public function getPlatform(){
 
-
         $list  = site_config('addonsd.platform_list');
-        $this->success('提交成功', $list);
+        $this->success('提交成功', [$list]);
     }
 
     //获取店铺
@@ -31,7 +30,7 @@ class Shops extends Base
         if(empty($platform_id)){
             $this->error('参数有误');
         }
-        return $this->success('ok', $shopList->where('platform', $platform_id)->column('name', 'id'));   
+        return $this->success('ok', [$shopList->where('platform', $platform_id)->column('name', 'id')]);   
     }
 
 
@@ -56,7 +55,7 @@ class Shops extends Base
         $result = false;
         try {
             validate(ShopValidate::class)->scene('add')->check($data);
-
+           
             $data['user_id'] = $this->userinfo['id'];
             $data['variety'] = json_encode($data['variety'], JSON_UNESCAPED_UNICODE);
             $result = $userEnterLog::create($data);