优化委托单

application/admin/controller/Entrust.php

@@ -112,6 +112,7 @@ class Entrust extends Backend
         $params['project'] = implode(',',$params['project']);
         $params['report_grant'] = implode(',',$params['report_grant']);
         $params['sample_stand'] = implode(',',$params['sample_stand']);
+        $params['manufacturer'] = preg_replace('/\s+/','',$params['manufacturer']);
         $params['user_name'] = $userinfo['username'];
         $params['work_unit'] = $userinfo['company'];
         $params['work_name'] = Db::name('company')->where('id',$userinfo['company'])->value('name');

application/admin/lang/zh-cn/entrust.php

@@ -13,13 +13,14 @@ return [
     'Sample_status' => '样品状态',
     'Create'        => '委托日期',
     'Status'        => '状态',
-    'Status 1'      => '委托待提交',
-    'Status 2'      => '检测待提交',
+    'Status 1'      => '待检测',
+    'Status 2'      => '检测已完成',
     'Status 3'      => '报告待提交',
     'Status 4'      => '已归档',
     'Status 5'      => '已取消',
     'Remark'        => '备注',
     'Report_id'     => '关联报告id',
     'User_id'       => '用户id',
-    'User_name'     => '用户名称'
+    'User_name'     => '用户名称',
+    'Manufacturer'     => '生产厂家'
 ];

application/admin/view/entrust/add.html

@@ -45,6 +45,12 @@
             {:build_select('mark', ['0'=>'请选择','1'=>'A:出厂成品样', '2'=>'B:半成品样', '3'=>'C:材料样', '4'=>'D:翌星送样'], null,['class'=>'form-control mark'])}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Manufacturer')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-manufacturer" data-rule="required" class="form-control" name="row[manufacturer]" type="text" value="" >
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sample_no')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/entrust/edit.html

@@ -49,6 +49,12 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Manufacturer')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-manufacturer" data-rule="required" class="form-control" name="row[manufacturer]" type="text" value="{$row.manufacturer|htmlentities}" readonly>
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sample_no')}:</label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/entrust.js

@@ -134,13 +134,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
-            $('#c-name').blur(function () {
-                var str = $(this).val()
-                str = str.replace(/\s+/g,'');//去除所有空格
-                var bach = str.substr(str.length - 7);
-                $('#c-bach').val(bach)
-                $('#c-sell_bach').val(bach)
-            })
+            // $('#c-name').blur(function () {
+            //     var str = $(this).val()
+            //     str = str.replace(/\s+/g,'');//去除所有空格
+            //     var bach = str.substr(str.length - 7);
+            //     $('#c-bach').val(bach)
+            //     $('#c-sell_bach').val(bach)
+            // })
             $('.mark').change(function () {
                 var mark = parseInt($(this).val());
                 var company = $('.company option:selected').val();