11

application/admin/controller/WasteApplyOption.php

@@ -209,7 +209,7 @@ class WasteApplyOption extends Auth {
             ->find();
         if (request()->isPost()) {
             $data = request()->post();
-            $key = ['user_id','cateid','weight','waste_device_id'];
+            $key = ['user_id','cateid','weight','waste_device_id','num'];
             $su = 0;
             $aa = [];
             foreach ($key as $kk=>$vv){

application/admin/controller/WasteType.php

@@ -33,7 +33,7 @@ class WasteType extends Auth
             }
 
             $map[] = ['del','=',0];
-//            $map[] = ['org_id','in',[0,$this->orgId]];
+            $map[] = ['org_id','in',[0,$this->orgId]];
             $map= empty($map) ? true: $map;
             //数据查询
             $lists = db($this->table)->where($map)->limit($start,$length)->order($order)->select();
@@ -61,9 +61,9 @@ class WasteType extends Auth
                 if(!$info){
                     $this->error('参数错误');
                 }
-//                if($info['org_id'] <= 0){
-//                    $this->error('共有类型无法修改');
-//                }
+                if($info['org_id'] <= 0){
+                    $this->error('共有类型无法修改');
+                }
             }
             $res = $this->model->updates();
             if($res){

application/admin/view/waste_type/add.html

@@ -9,20 +9,20 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">名称<span class="text-danger">*</span></label>
                         <div class="col-sm-6">
-                            <input type="text" class="form-control" name="title" readonly value="{$info.title|default=''}">
+                            <input type="text" class="form-control" name="title" value="{$info.title|default=''}">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-6">
+                            <label class="cr-inline">
+                                <input type="radio" value="1" name="enable">正常&nbsp;&nbsp;
+                            </label>
+                            <label class="cr-inline">
+                                <input type="radio" value="0" name="enable">禁用
+                            </label>
                         </div>
                     </div>
-<!--                    <div class="form-group">-->
-<!--                        <label class="col-sm-2 control-label">状态</label>-->
-<!--                        <div class="col-sm-6">-->
-<!--                            <label class="cr-inline">-->
-<!--                                <input type="radio" value="1" name="enable">正常&nbsp;&nbsp;-->
-<!--                            </label>-->
-<!--                            <label class="cr-inline">-->
-<!--                                <input type="radio" value="0" name="enable">禁用-->
-<!--                            </label>-->
-<!--                        </div>-->
-<!--                    </div>-->
                     <div class="form-group">
                         <label class="col-sm-2 control-label">模式<span class="text-danger">*</span></label>
                         <div class="col-sm-6">

application/admin/view/waste_type/index.html

@@ -4,9 +4,9 @@
 <div class="ibox">
     <div class="ibox-content">
         <div class="row">
-<!--            <div class="col-xs-3">-->
-<!--                <a href="javascript:;" url="{:url('add')}" data-title="新增{$m_name}" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">新增</a>-->
-<!--            </div>-->
+            <div class="col-xs-3">
+                <a href="javascript:;" url="{:url('add')}" data-title="新增{$m_name}" onclick="layer_open(this,1)" class="btn btn-sm btn-primary">新增</a>
+            </div>
             <div class="col-xs-12" style="text-align: right;">
             <form class="form-inline" id="form-search" action="{:url('index')}">
                 <div class="input-group">
@@ -57,23 +57,23 @@
                 {label:'名称',name:'title',index:'title',width:80,editable: false,sortable: false},
 
                 {label:'创建时间',name:'create_time',index:'create_time',width:40,sortable: true},
-                // {label:'状态',name:'enable',index:'enable',width:40,editable: false,sortable: false,formatter:function (a,b,c){
-                //     if(a == 0){
-                //         var url = "{:url('changeField',[],'')}/fn/enable/fv/1/id/"+c.id;
-                //         return '<a href="'+url+'" class="ajax-get" data-table="1"><span class="label label-danger" title="禁用">禁用</span></a>';
-                //     } else{
-                //         var url = "{:url('changeField',[],'')}/fn/enable/fv/0/id/"+c.id;
-                //         return '<a href="'+url+'" class="ajax-get" data-table="1"><span class="label label-primary" title="正常">正常</span></a>';
-                //     }
-                // }},
-                // {label:'类型',name:'enable',index:'enable',width:40,editable: false,sortable: false,formatter:function (a,b,c){
-                //         if(c.org_id > 0){
-                //             return '私有';
-                //         } else{
-                //             return '共有';
-                //         }
-                //     }},
-                {label:'类型',name:'type',index:'type',width:40,editable: false,sortable: false,formatter:function (a,b,c){
+                {label:'状态',name:'enable',index:'enable',width:40,editable: false,sortable: false,formatter:function (a,b,c){
+                    if(a == 0){
+                        var url = "{:url('changeField',[],'')}/fn/enable/fv/1/id/"+c.id;
+                        return '<a href="'+url+'" class="ajax-get" data-table="1"><span class="label label-danger" title="禁用">禁用</span></a>';
+                    } else{
+                        var url = "{:url('changeField',[],'')}/fn/enable/fv/0/id/"+c.id;
+                        return '<a href="'+url+'" class="ajax-get" data-table="1"><span class="label label-primary" title="正常">正常</span></a>';
+                    }
+                }},
+                {label:'类型',name:'enable',index:'enable',width:40,editable: false,sortable: false,formatter:function (a,b,c){
+                        if(c.org_id > 0){
+                            return '私有';
+                        } else{
+                            return '共有';
+                        }
+                    }},
+                {label:'模式',name:'type',index:'type',width:40,editable: false,sortable: false,formatter:function (a,b,c){
                         if(a == 0){
                             return '重量模式';
                         } else{
@@ -84,7 +84,7 @@
                     var editurl = "{:url('add',[],'')}/id/"+c.id;
                     var delurl = "{:url('del',[],'')}/id/"+c.id;
                     var btn = '<a url="'+editurl+'" href="javascript:;" data-title="编辑{$m_name}" onclick="layer_open(this,1)"><span class="label label-primary" title="编辑">编辑</span></a>&nbsp;';
-                    // btn += '<a {if !btnAuth(session("user_auth.id"),"WasteType/del")} style="display:none"{/if} href="'+delurl+'" class="confirm ajax-get" data-confirm="确定要删除此记录吗?" data-table="1"><span class="label label-danger" title="删除">删除</span></a>';
+                    btn += '<a {if !btnAuth(session("user_auth.id"),"WasteType/del")} style="display:none"{/if} href="'+delurl+'" class="confirm ajax-get" data-confirm="确定要删除此记录吗?" data-table="1"><span class="label label-danger" title="删除">删除</span></a>';
                     return btn;
                 }},
             ],