Эх сурвалжийг харах

配方审核功能及打印

huangsanjia 3 жил өмнө
parent
commit
fbc7f9561a

+ 61 - 1
application/admin/controller/Formula.php

@@ -60,7 +60,7 @@ class Formula extends Backend
         $map = [];
         if ($user_info['id'] !== 1){
             $map['company_id'] = $user_info['company_id'];
-            $map['examine_status'] = 1;
+            $map['examine_status'] = 2;
         }
         $list = $this->model
             ->where($where)
@@ -370,6 +370,66 @@ class Formula extends Backend
         }
         $this->success();
 
+    }
+    //配方审核列表
+    public function examine(){
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage,则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $user_info = Session::get('admin');
+        $map = [];
+        $map['examine_status'] = 1;
+        if ($user_info['id'] !== 1){
+            $map['company_id'] = $user_info['company_id'];
+        }
+        $list = $this->model
+            ->where($where)
+            ->where($map)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+    public function status($ids=null){
+        if (!$ids) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $list = Db::name('formula')->where('id',$ids)->find();
+            //可用性,对应客户名称
+            if ($list['usability'] != 99){
+                $customer = explode(',',$list['usability']);
+                $name = Db::name('customer')->where('id','in',$customer)->column('customer_name');
+            }
+            $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
+            $this->view->assign('ids',$ids);
+            $this->view->assign('name',$name);
+            $this->view->assign('row', $list);
+
+            return $this->view->fetch();
+        }
+        $status =  $this->request->post('status');
+
+        if (!isset($status) || !isset($ids)){
+            $this->error('审核失败');
+        }
+        $params = [];
+        $params['examine_status'] = $status;
+        $params['update'] = date('Y-m-d H:i:s');
+        $res = Db::name('formula')->where('id',$ids)->update($params);
+        if ($res){
+            $this->success('更新成功');
+        }else{
+            $this->error('审核失败');
+        }
+
     }
     //下拉选择获取客户列表
     public function getCustomer(){

+ 2 - 2
application/admin/view/formula/edit.html

@@ -89,7 +89,7 @@
             {/foreach}
         </table>
     </div>
-    <div >
+    <div style="display: none">
         <div class="form-group" id="print_area" >
             <div id="head">
                 <table class="tg"  style="width: 800px;">
@@ -137,7 +137,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled submit">{:__('OK')}</button>
+            <button type="submit" class="btn btn-primary btn-embossed disabled submit">保存</button>
             <button type="button" class="btn btn-default btn-embossed  print-link">打印预览</button>
         </div>
     </div>

+ 44 - 0
application/admin/view/formula/examine.html

@@ -0,0 +1,44 @@
+<div class="panel panel-default panel-intro">
+
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+<!--            {foreach name="statusList" item="vo"}-->
+<!--            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>-->
+<!--            {/foreach}-->
+        </ul>
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('formula/add')?'':'hide'}" title="{:__('Add')}" data-area=["100%","100%"]><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('formula/edit')?'':'hide'}" title="{:__('Edit')}" data-area=["100%","100%"] ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('formula/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+
+
+<!--                        <div class="dropdown btn-group {:$auth->check('formula/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+<!--                            </ul>-->
+<!--                        </div>-->
+
+
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 79 - 0
application/admin/view/formula/status.html

@@ -0,0 +1,79 @@
+
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <span id="ids" data-value="{$ids}"></span>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row['name']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">编号:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-formula_no" class="form-control" name="row[formula_no]" type="text" value="{$row['formula_no']}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1">{:__('Charge_name')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-charge_name" data-rule="required" class="form-control" name="row[charge_name]" type="text" value="{$row['charge_name']}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Examine_name')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text" value="{$row['examine_name']}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-7">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row['remark']}">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1">{:__('Version')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-version" data-rule="required" class="form-control" name="row[version]" type="text" value="{$row['version']}" readonly>
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Date')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-date" class="form-control datetimepicker" name="row[date]" type="text" data-date-format="YYYY-MM-DD" data-use-current="true" value="{$row['date']}">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1">可用性:</label>
+        <div class="col-xs-12 col-sm-7">
+            <input id="c-usability"  data-source="formula/getCustomer"
+                   data-params='{"custom[type]":"bm","isTree":1}' data-multiple="true" data-field="customer_name"  class="form-control selectpage" name="usability"
+                   type="text" value="{$row['usability']|htmlentities}" placeholder="配方对应客户,不选默认全部客户可用">
+        </div>
+    </div>
+    <div class="form-group">
+        <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
+            <tr>
+                <th class="col-xs-12 col-sm-1">原材料</th>
+                <th class="col-xs-12 col-sm-1">百分比(%)</th>
+                <th class="col-xs-12 col-sm-8">操作工艺说明</th>
+                <th class="col-xs-12 col-sm-1">工序号(必填)</th>
+            </tr>
+            {foreach name='row["gyinfo"]' id='vo'}
+            <tr>
+                <td><input  class="form-control material" type="text" value="{$vo.material}"></td>
+                <td><input  class="form-control percentage" type="text" value="{$vo.percentage}"></td>
+                <td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}"></td>
+                <td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}"></td>
+            </tr>
+            {/foreach}
+        </table>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-success btn-embossed examine" data-value="2">审核通过</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <button type="button" class="btn btn-danger btn-embossed examine" data-value="3">审核不通过</button>
+        </div>
+    </div>
+</form>
+
+

+ 1 - 1
application/admin/view/formula/task.html

@@ -161,7 +161,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled submit">{:__('OK')}</button>
+            <button type="submit" class="btn btn-primary btn-embossed disabled submit">保存</button>
             <button type="button" class="btn btn-default btn-embossed  print-link">打印预览</button>
         </div>
     </div>

+ 87 - 0
public/assets/js/backend/formula.js

@@ -401,6 +401,93 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 });
             });
         },
+        examine:function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'formula/examine' + location.search,
+                    add_url: 'formula/add',
+                    edit_url: 'formula/examine_edit',
+                    del_url: 'formula/del',
+                    multi_url: 'formula/multi',
+                    import_url: 'formula/import',
+                    table: 'formula',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id') ,operate: false},
+                        {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'version', title: __('Version'),operate: false},
+                        {field: 'create', title: __('Create'),operate: false, addclass:'datetimerange', autocomplete:false},
+                        {field: 'operate', title: '操作',  table: table, events: Table.api.events.operate, formatter: function (value,row,index) {
+                                var that = $.extend({},this);
+                                var table = $(that.table).clone(true);
+                                $(table).data('operate-del',null)//隐藏自带删除  修改按钮
+                                $(table).data('operate-edit',null)
+                                that.table = table;
+                                return Table.api.formatter.operate.call(that,value,row,index);
+                            },
+                            buttons:[{
+                                name:'task',
+                                text:'审核配方',
+                                title:'审核配方',
+                                icon:'fa fa-add',
+                                extend: 'data-area=["100%","100%"]',
+                                classname:'btn btn-xs btn-info btn-fields btn-dialog task',
+                                url:'formula/status',
+                            }],
+                        },
+                    ]
+                ]
+            });
+            table.on('post-body.bs.table',function(){
+                $(".btn-editone").data("area",["100%","100%"]);
+            })
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        status:function () {
+
+            Controller.api.bindevent();
+            $(document).on('click','.examine',function () {
+                console.log(44444)
+                var ids = $('#ids').attr('data-value');
+                var status = $(this).attr('data-value');
+                console.log(ids)
+                console.log(status);
+
+                if (status == ''){
+                    layer.confirm('数据错误,请重新打开页面');return false;
+                }
+                Fast.api.ajax({
+                    url:'formula/status?ids='+ids,
+                    data:{status:status}
+                },function (data,ret) {
+                    //成功回调
+                    parent.Toastr.success("审核成功");
+                    Fast.api.close();
+                    parent.Fast.api.refreshmenu();
+                    return false;
+                },function (data,ret) {
+                    parent.Toastr.error("审核失败");
+                    Fast.api.close();
+                    return false;
+                });
+            });
+
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));