Merge branch 'master' of gitee.com:huangsanjia/qua-vocs.com

application/admin/controller/Entrust.php

@@ -100,7 +100,7 @@ class Entrust extends Backend
                 $company = Db::name('company')->where('id',$company_id)->column('id,name');
             }
             $this->assign('company',$company);
-            $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
+            $judgeData = Db::name('item_judge')->whereNull('delete')->order('weigh asc')->column('id,name');
             $this->view->assign('judgeData', $judgeData);
             $this->view->assign('nickname', $nickname);
             return $this->view->fetch();
@@ -303,8 +303,6 @@ class Entrust extends Backend
         $log = [];
         foreach ($idList as $ke => $id) {
             $temp_id[$ke] = Db::name('entrust')->where('id', $id)->value('standard_id');
-            //$temp_id[$kk] 判断标准id
-            //$vv 委托单id
             if (empty($temp_id[$ke])) {
                 $this->error('序号为'.$id . '未获取到判断标准,请先编辑确认标准');
             }
@@ -461,8 +459,21 @@ class Entrust extends Backend
             $record = [];
             for ($i=0;$i<count($idList);$i++){
                 $entrust_res = Db::name('entrust')->where('id', $idList[$i])->update($entrust_update[$i]);
-                Db::name('res')->where('entrust_id',$idList[$i])->update(['delete_time'=>date('Y-m-d H:i:s',time())]);
-                $res_check = Db::name('res')->insert($params[$i]);
+//                Db::name('res')->where('entrust_id',$idList[$i])->update(['delete_time'=>date('Y-m-d H:i:s',time())]);
+//                $res_check = Db::name('res')->insert($params[$i]);
+                $entrust_id = Db::name('res')->where('entrust_id',$idList[$i])->order('id desc')->find();
+                if (empty($entrust_id)) {
+                    $res_check = Db::name('res')->insert($params[$i]);
+                } else {
+                    if ($entrust_id['status'] != 1){
+                        $data =Db::name('res')
+                            ->where('id',$entrust_id['id'])
+                            ->update(['delete_time'=>date('Y-m-d H:i:s',time())]);
+                        $res_check = Db::name('res')->insert($params[$i]);
+                    }else{
+                        $res_check = true;
+                    }
+                }
                 $log_res = Db::name('entrust_log')->insert($log[$i]);
                 if (!$log_res || !$res_check) {
                     $record[$i] = $idList[$i];

application/admin/view/entrust/add.html

@@ -49,7 +49,6 @@
         <label class="control-label col-xs-12 col-sm-2">判定标准:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_select('row[standard_id]', $judgeData, null,['class'=>'form-control standard_id'])}
-
         </div>
     </div>
     <div class="form-group">
@@ -163,7 +162,7 @@
             <div class="col-xs-12 col-sm-8">
                 <div class="check">
                     <label>
-                        <input name="row[report_grant][]" type="checkbox" value="自取" />自取
+                        <input name="row[report_grant][]" type="checkbox" value="自取" checked />自取
                     </label>
                     <label>
                         <input name="row[report_grant][]" type="checkbox" value="邮寄" />邮寄
@@ -172,7 +171,7 @@
                         <input name="row[report_grant][]" type="checkbox" value="传真" />传真
                     </label>
                     <label>
-                        <input name="row[report_grant][]" type="checkbox" value="邮箱" checked />邮箱
+                        <input name="row[report_grant][]" type="checkbox" value="邮箱"  />邮箱
                     </label>
                 </div>
             </div>
@@ -184,7 +183,7 @@
             <div class="col-xs-12 col-sm-8">
                 <div class="check">
                     <label >
-                        <input name="row[sample_stand][]" type="checkbox" value="YC/T 207-2014" >YC/T 207-2014
+                        <input name="row[sample_stand][]" type="checkbox" value="YC/T 207-2014"  checked >YC/T 207-2014
                     </label>
                     <label >
                         <input name="row[sample_stand][]" type="checkbox" value="YQ/T 35-2013" >YQ/T 35-2013

application/admin/view/entrust/index.html

@@ -20,8 +20,8 @@
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('entrust/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('entrust/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('entrust/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-printing btn-disabled disabled {:$auth->check('entrust/print')?'':'hide'}" title="打印" ><i class="fa fa-pencil"></i>打印委托单</a>
-                        <a href="javascript:;" class="btn btn-success btn-submits btn-disabled disabled {:$auth->check('entrust/submits')?'':'hide'}" title="批量提交" ><i class="fa fa-pencil"></i>批量提交</a>
+                        <a href="javascript:;" class="btn btn-success btn-printing btn-disabled disabled {:$auth->check('entrust/print')?'':'hide'}" title="打印" ><i class="glyphicon glyphicon-floppy-disk"></i>打印委托单</a>
+                        <a href="javascript:;" class="btn btn-success btn-submits btn-disabled disabled {:$auth->check('entrust/submits')?'':'hide'}" title="批量提交" ><i class="glyphicon glyphicon-ok-circle"></i>批量提交</a>
 
 <!--                        <div class="dropdown btn-group {:$auth->check('entrust/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>-->

application/admin/view/res/index.html

@@ -22,7 +22,7 @@
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('res/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
 <!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('res/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         <a href="javascript:POBrowser.openWindowModeless('http://www.6in7.cn/SendParameters/SendParameters.php?doc=/www/wwwroot/res.7in6.com/public/test.doc' , 'width=1200px;height=800px;');">编辑文档</a>
-                        <a href="javascript:;" class="btn btn-success btn-reports btn-disabled disabled {:$auth->check('res/report')?'':'hide'}" title="批量导出" ><i class="fa fa-pencil"></i> 批量导出</a>
+                        <a href="javascript:;" class="btn btn-success btn-reports btn-disabled disabled {:$auth->check('res/report')?'':'hide'}" title="批量导出" ><i class="glyphicon glyphicon-export"></i> 批量导出</a>
                         <a href="javascript:;" class="btn btn-success btn-couse btn-disabled disabled {:$auth->check('res/couse')?'':'hide'}" title="批量审核" ><i class="fa fa-pencil"></i> 批量审核</a>
 
                         <div class="dropdown btn-group {:$auth->check('res/multi')?'':'hide'}">

public/assets/js/backend/entrust.js

@@ -33,7 +33,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'bach', title: __('Bach'), operate: 'LIKE'},
                         {field: 'sell_bach', title: __('Sell_bach'), operate: 'LIKE'},
-                        {field: 'company', title: __('送样单位')},
                         {field: 'sample_no', title: __('Sample_no'), operate: 'LIKE'},
                         {field: 'is_two', title: __('是否双样'),operate:false,formatter: function (value,row,index) {
                                 if (value == 0){
@@ -44,14 +43,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     return '<span style="color: #f75444">' + value + '</span>';
                                 }
                             }},
+
                         {field: 'standard_name', title: __('Standard_name'), operate:false},
+                        {field: 'data_status', title: __('检测数据'),operate:false,formatter: function (value,row,index) {
+                                if (value == 0){
+                                    value = '';
+                                    return '<span style="color: #f75444">' +value+ '</span>';
+                                }else {
+                                    value = '已有';
+                                    return '<span style="color: #18bc9c">' + value + '</span>';
+                                }
+                            }},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status},
+                        {field: 'company', title: __('送样单位')},
                         {field: 'sample_status', title: __('Sample_status'), operate:false, formatter: Table.api.formatter.status},
                         {field: 'create', title: __('Create'), operate:false, addclass:'datetimerange', autocomplete:false},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate:false},
-                        // {field: 'report_id', title: __('Report_id')},
-                        // {field: 'user_id', title: __('User_id')},
-                        // {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
                             buttons: [
                                 // {