OTHER_COMPANY_PROJECTS / ota

Download as
Browse Code »

Commit b8970364c233f815cb437e0501c41658f86322b5

Authored by xu
1 parent 94d44367
Exists in master

app-ht 

1. F 后台厂商，项目，型号，生产日期不能录入空格
2. F 改筛选列表各个选择的autocomplete off
Showing 20 changed files with 54 additions and 36 deletions   Show diff stats
app-ht/modules/device/controllers/DeviceController.php
  Diff comments   View file @b897036
@@ -847,9 +847,9 @@ class DeviceController extends BaseController @@ -847,9 +847,9 @@ class DeviceController extends BaseController
847 $trans = Yii::$app->getDb()->beginTransaction(); 847 $trans = Yii::$app->getDb()->beginTransaction();
848 try { 848 try {
849 $newDeviceModel->device_id = $deviceId; 849 $newDeviceModel->device_id = $deviceId;
850 - $newDeviceModel->status = DeviceStatus::HAS_AUTH; 850 + $newDeviceModel->status = DeviceStatus::NO_AUTH;
851 $newDeviceModel->apply_at = $tt ; 851 $newDeviceModel->apply_at = $tt ;
852 - $newDeviceModel->auth_at = $tt; 852 + //$newDeviceModel->auth_at = $tt;
853 $newDeviceModel->save(); 853 $newDeviceModel->save();
854 $deviceFailModel->is_delete = 1; 854 $deviceFailModel->is_delete = 1;
855 $deviceFailModel->save(); 855 $deviceFailModel->save();
app-ht/modules/manufacturer/controllers/ManufacturerController.php
  Diff comments   View file @b897036
@@ -103,7 +103,7 @@ class ManufacturerController extends BaseController @@ -103,7 +103,7 @@ class ManufacturerController extends BaseController
103 $request = Yii::$app->request; 103 $request = Yii::$app->request;
104 $name = $request->post("name"); 104 $name = $request->post("name");
105 $phone = $request->post("phone"); 105 $phone = $request->post("phone");
106 - if (empty($name)) { 106 + if (empty(trim($name))) {
107 Yii::$app->session->setFlash('error', '厂商名称不能为空'); 107 Yii::$app->session->setFlash('error', '厂商名称不能为空');
108 return $this->render('create'); 108 return $this->render('create');
109 } 109 }
@@ -156,7 +156,7 @@ class ManufacturerController extends BaseController @@ -156,7 +156,7 @@ class ManufacturerController extends BaseController
156 $params = $this->dataList(1); 156 $params = $this->dataList(1);
157 return $this->render('index', $params); 157 return $this->render('index', $params);
158 } 158 }
159 - if (empty($name)) { 159 + if (empty(trim($name))) {
160 Yii::$app->session->setFlash('error', '厂商名称不能为空'); 160 Yii::$app->session->setFlash('error', '厂商名称不能为空');
161 return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]); 161 return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
162 } 162 }
app-ht/modules/manufacturer/views/manufacturer/create.php
  Diff comments   View file @b897036
@@ -17,13 +17,13 @@ $this->params['breadcrumbs'][] = $this->title; @@ -17,13 +17,13 @@ $this->params['breadcrumbs'][] = $this->title;
17 <div class="form-group col-sm-12"> 17 <div class="form-group col-sm-12">
18 <label for="skillName" class="col-sm-4 control-label text-right">厂商名称：</label> 18 <label for="skillName" class="col-sm-4 control-label text-right">厂商名称：</label>
19 <div class="col-sm-4 text-left"> 19 <div class="col-sm-4 text-left">
20 - <input type="text" value="" name="name" placeholder="请填写厂商名称" class="form-control""> 20 + <input type="text" value="" name="name" placeholder="请填写厂商名称" class="form-control"" autocomplete="off">
21 </div> 21 </div>
22 </div> 22 </div>
23 <div class="form-group col-sm-12"> 23 <div class="form-group col-sm-12">
24 <label for="skillName" class="col-sm-4 control-label text-right">厂商电话：</label> 24 <label for="skillName" class="col-sm-4 control-label text-right">厂商电话：</label>
25 <div class="col-sm-4 text-left"> 25 <div class="col-sm-4 text-left">
26 - <input type="text" value="" name="phone" placeholder="请填写联系电话" class="form-control" > 26 + <input type="text" value="" name="phone" placeholder="请填写联系电话" class="form-control" autocomplete="off">
27 </div> 27 </div>
28 </div> 28 </div>
29 </div> 29 </div>
@@ -51,8 +51,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -51,8 +51,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
51 $('#myFrom').attr('action', getUrl); 51 $('#myFrom').attr('action', getUrl);
52 var a = $("input[name='name']").val(); 52 var a = $("input[name='name']").val();
53 var b = $("input[name='phone']").val(); 53 var b = $("input[name='phone']").val();
54 - if (a == ""){  
55 - alert("用户名称不能为空"); 54 + if ($.trim(a) == ""){
  55 + alert("厂商名称不能为空");
56 return false; 56 return false;
57 } 57 }
58 if (!new RegExp("^0?(13|15|18|14|17)[0-9]{9}$").test(b)){ 58 if (!new RegExp("^0?(13|15|18|14|17)[0-9]{9}$").test(b)){
app-ht/modules/manufacturer/views/manufacturer/edit.php
  Diff comments   View file @b897036
@@ -27,19 +27,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -27,19 +27,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
27 <div class="form-group col-sm-12"> 27 <div class="form-group col-sm-12">
28 <label for="skillName" class="col-sm-4 control-label text-right">厂商名称：</label> 28 <label for="skillName" class="col-sm-4 control-label text-right">厂商名称：</label>
29 <div class="col-sm-4 text-left"> 29 <div class="col-sm-4 text-left">
30 - <input type="text" value="<?= isset($info["name"]) ? $info["name"] : "" ?>" name="name" placeholder="请填写厂商名称" class="form-control"> 30 + <input type="text" value="<?= isset($info["name"]) ? $info["name"] : "" ?>" name="name" placeholder="请填写厂商名称" class="form-control" autocomplete="off">
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="form-group col-sm-12"> 33 <div class="form-group col-sm-12">
34 <label for="skillName" class="col-sm-4 control-label text-right">厂商电话：</label> 34 <label for="skillName" class="col-sm-4 control-label text-right">厂商电话：</label>
35 <div class="col-sm-4 text-left"> 35 <div class="col-sm-4 text-left">
36 - <input type="text" value="<?= isset($info["phone"]) ? $info["phone"] : "" ?>" name="phone" placeholder="请填写联系电话" class="form-control" > 36 + <input type="text" value="<?= isset($info["phone"]) ? $info["phone"] : "" ?>" name="phone" placeholder="请填写联系电话" class="form-control" autocomplete="off">
37 </div> 37 </div>
38 </div> 38 </div>
39 <div class="form-group col-sm-12"> 39 <div class="form-group col-sm-12">
40 <label for="skillName" class="col-sm-4 control-label text-right">账号：</label> 40 <label for="skillName" class="col-sm-4 control-label text-right">账号：</label>
41 <div class="col-sm-4 text-left"> 41 <div class="col-sm-4 text-left">
42 - <input type="text" value="<?= isset($info["username"]) ? $info["username"] : "" ?>" name="username" placeholder="请填写账号名称" class="form-control" > 42 + <input type="text" value="<?= isset($info["username"]) ? $info["username"] : "" ?>" name="username" placeholder="请填写账号名称" class="form-control" autocomplete="off">
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="form-group col-sm-12"> 45 <div class="form-group col-sm-12">
@@ -76,7 +76,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -76,7 +76,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
76 var b = $("input[name='phone']").val(); 76 var b = $("input[name='phone']").val();
77 var c = $("input[name='username']").val(); 77 var c = $("input[name='username']").val();
78 var d = $("input[name='password']").val(); 78 var d = $("input[name='password']").val();
79 - if (a == ""){ 79 + if ($.trim(a) == ""){
80 alert("用户名称不能为空"); 80 alert("用户名称不能为空");
81 return false; 81 return false;
82 } 82 }
@@ -84,12 +84,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -84,12 +84,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
84 alert("请填写正确的手机号码"); 84 alert("请填写正确的手机号码");
85 return false; 85 return false;
86 } 86 }
87 - if (c == ""){ 87 + if ($.trim(c) == ""){
88 alert("账号不能为空"); 88 alert("账号不能为空");
89 $("input[name='username']").focus(); 89 $("input[name='username']").focus();
90 return false; 90 return false;
91 } 91 }
92 - if (d == ""){ 92 + if ($.trim(d) == ""){
93 alert("密码不能为空"); 93 alert("密码不能为空");
94 return false; 94 return false;
95 } 95 }
app-ht/modules/manufacturer/views/manufacturer/index.php
  Diff comments   View file @b897036
@@ -25,11 +25,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -25,11 +25,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
25 <tbody> 25 <tbody>
26 <tr > 26 <tr >
27 <td width="10%" class="text-right">厂商名称：</td> 27 <td width="10%" class="text-right">厂商名称：</td>
28 - <td width="20%" class="text-left"><input type="text" placeholder="输入厂商名称" class="form-control" name="name" id="name" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>"></td> 28 + <td width="20%" class="text-left"><input type="text" placeholder="厂商关键字" autocomplete="off" class="form-control" name="name" id="name" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>"></td>
29 <td width="10%" class="text-right">联系电话：</td> 29 <td width="10%" class="text-right">联系电话：</td>
30 - <td width="20%" class="text-left"><input type="text" placeholder="输入联系电话" class="form-control" name="phone" id="phone" value="<?php if (!empty($gets['phone'])){ echo $gets['phone']; } ?>"></td> 30 + <td width="20%" class="text-left"><input type="text" placeholder="联系电话键字" autocomplete="off" class="form-control" name="phone" id="phone" value="<?php if (!empty($gets['phone'])){ echo $gets['phone']; } ?>"></td>
31 <td width="10%" class="text-right">账号：</td> 31 <td width="10%" class="text-right">账号：</td>
32 - <td width="20%" class="text-left"><input type="text" placeholder="输入登录账号" class="form-control" name="loginName" id="loginName" value="<?php if (!empty($gets['loginName'])){ echo $gets['loginName']; } ?>"></td> 32 + <td width="20%" class="text-left"><input type="text" placeholder="输入登录账号" autocomplete="off" class="form-control" name="loginName" id="loginName" value="<?php if (!empty($gets['loginName'])){ echo $gets['loginName']; } ?>"></td>
33 </tr> 33 </tr>
34 <tr > 34 <tr >
35 <td width="10%" class="text-right">厂商添加开始时间：</td> 35 <td width="10%" class="text-right">厂商添加开始时间：</td>
app-ht/modules/model/controllers/ModelController.php
  Diff comments   View file @b897036
@@ -91,7 +91,7 @@ class ModelController extends BaseController @@ -91,7 +91,7 @@ class ModelController extends BaseController
91 { 91 {
92 $request = Yii::$app->request; 92 $request = Yii::$app->request;
93 $name = $request->post("name"); // 机器型号 93 $name = $request->post("name"); // 机器型号
94 - if (empty($name)) { 94 + if (empty(trim($name))) {
95 Yii::$app->session->setFlash('error', '机器型号不能为空'); 95 Yii::$app->session->setFlash('error', '机器型号不能为空');
96 return $this->render('create'); 96 return $this->render('create');
97 } 97 }
@@ -140,7 +140,7 @@ class ModelController extends BaseController @@ -140,7 +140,7 @@ class ModelController extends BaseController
140 $params = $this->dataList(1); 140 $params = $this->dataList(1);
141 return $this->render('index', $params); 141 return $this->render('index', $params);
142 } 142 }
143 - if (empty($name)) { 143 + if (empty(trim($name))) {
144 Yii::$app->session->setFlash('error', '机器型号不能为空'); 144 Yii::$app->session->setFlash('error', '机器型号不能为空');
145 return $this->render('edit', ["info" => $model]); 145 return $this->render('edit', ["info" => $model]);
146 } 146 }
app-ht/modules/model/views/model/create.php
  Diff comments   View file @b897036
@@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
17 <div class="form-group col-sm-12"> 17 <div class="form-group col-sm-12">
18 <label for="skillName" class="col-sm-4 control-label text-right">机器型号：</label> 18 <label for="skillName" class="col-sm-4 control-label text-right">机器型号：</label>
19 <div class="col-sm-4 text-left"> 19 <div class="col-sm-4 text-left">
20 - <input type="text" value="" name="name" placeholder="请输入机器型号" style="margin-top: -6px;" class="form-control""> 20 + <input type="text" value="" name="name" placeholder="请输入机器型号" style="margin-top: -6px;" class="form-control"" autocomplete="off">
21 </div> 21 </div>
22 </div> 22 </div>
23 </div> 23 </div>
@@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
44 var getUrl = '<?=Url::toRoute("/model/model/do-add")?>'; 44 var getUrl = '<?=Url::toRoute("/model/model/do-add")?>';
45 $('#myFrom').attr('action', getUrl); 45 $('#myFrom').attr('action', getUrl);
46 var a = $("input[name='name']").val(); 46 var a = $("input[name='name']").val();
47 - if (a == ""){ 47 + if ($.trim(a) == ""){
48 alert("机器型号不能为空"); 48 alert("机器型号不能为空");
49 return false; 49 return false;
50 } 50 }
app-ht/modules/model/views/model/edit.php
  Diff comments   View file @b897036
@@ -20,7 +20,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -20,7 +20,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
20 <div class="form-group col-sm-12"> 20 <div class="form-group col-sm-12">
21 <label for="skillName" class="col-sm-4 control-label text-right">机器型号：</label> 21 <label for="skillName" class="col-sm-4 control-label text-right">机器型号：</label>
22 <div class="col-sm-4 text-left"> 22 <div class="col-sm-4 text-left">
23 - <input type="text" value="<?= isset($info["name"]) ? $info["name"] : "" ?>" style="margin-top: -6px;" name="name" placeholder="请填写机器型号" class="form-control"> 23 + <input type="text" value="<?= isset($info["name"]) ? $info["name"] : "" ?>" style="margin-top: -6px;" name="name" placeholder="请填写机器型号" class="form-control" autocomplete="off">
24 </div> 24 </div>
25 </div> 25 </div>
26 </div> 26 </div>
@@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
48 var getUrl = '<?=Url::toRoute("/model/model/do-edit")?>'; 48 var getUrl = '<?=Url::toRoute("/model/model/do-edit")?>';
49 $('#myFrom').attr('action', getUrl); 49 $('#myFrom').attr('action', getUrl);
50 var a = $("input[name='name']").val(); 50 var a = $("input[name='name']").val();
51 - if (a == ""){ 51 + if ($.trim(a) == ""){
52 alert("机器型号不能为空"); 52 alert("机器型号不能为空");
53 return false; 53 return false;
54 } 54 }
app-ht/modules/model/views/model/index.php
  Diff comments   View file @b897036
@@ -27,7 +27,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -27,7 +27,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
27 <td width="10%" class="text-right">机器型号</td> 27 <td width="10%" class="text-right">机器型号</td>
28 <td width="35%" class="text-left"> 28 <td width="35%" class="text-left">
29 <div class="form-inline"> 29 <div class="form-inline">
30 - <input type="text" class="form-control" style="width: 150px;" name="name" placeholder="输入机器型号" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>"> 30 + <input type="text" class="form-control" style="width: 150px;" name="name" placeholder="型号关键字" autocomplete="off" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>">
31 </div> 31 </div>
32 </td> 32 </td>
33 <td width="10%" class="text-right">创建时间</td> 33 <td width="10%" class="text-right">创建时间</td>
app-ht/modules/production/controllers/ProductionController.php
  Diff comments   View file @b897036
@@ -147,7 +147,7 @@ class ProductionController extends BaseController @@ -147,7 +147,7 @@ class ProductionController extends BaseController
147 $params = $this->dataList(1); 147 $params = $this->dataList(1);
148 return $this->render('index', $params); 148 return $this->render('index', $params);
149 } 149 }
150 - if (empty($name)) { 150 + if (empty(trim($name))) {
151 Yii::$app->session->setFlash('error', '生产日期不能为空'); 151 Yii::$app->session->setFlash('error', '生产日期不能为空');
152 return $this->render('edit', ["info" => $production]); 152 return $this->render('edit', ["info" => $production]);
153 } 153 }
app-ht/modules/production/views/production/create.php
  Diff comments   View file @b897036
@@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
17 <div class="form-group col-sm-12"> 17 <div class="form-group col-sm-12">
18 <label for="skillName" class="col-sm-4 control-label text-right">生产日期：</label> 18 <label for="skillName" class="col-sm-4 control-label text-right">生产日期：</label>
19 <div class="col-sm-4 text-left"> 19 <div class="col-sm-4 text-left">
20 - <input type="date" value="" name="name" placeholder="请输入生产日期（如：2019-10-28）" style="margin-top: -6px;" class="form-control""> 20 + <input type="date" value="" name="name" placeholder="请输入生产日期（如：2019-10-28）" style="margin-top: -6px;" class="form-control"" autocomplete="off">
21 </div> 21 </div>
22 </div> 22 </div>
23 </div> 23 </div>
@@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
44 var getUrl = '<?=Url::toRoute("/production/production/do-add")?>'; 44 var getUrl = '<?=Url::toRoute("/production/production/do-add")?>';
45 $('#myFrom').attr('action', getUrl); 45 $('#myFrom').attr('action', getUrl);
46 var a = $("input[name='name']").val(); 46 var a = $("input[name='name']").val();
47 - if (a == ""){ 47 + if ($.trim(a) == ""){
48 alert("生产日期不能为空"); 48 alert("生产日期不能为空");
49 return false; 49 return false;
50 } 50 }
app-ht/modules/production/views/production/edit.php
  Diff comments   View file @b897036
@@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
48 var getUrl = '<?=Url::toRoute("/production/production/do-edit")?>'; 48 var getUrl = '<?=Url::toRoute("/production/production/do-edit")?>';
49 $('#myFrom').attr('action', getUrl); 49 $('#myFrom').attr('action', getUrl);
50 var a = $("input[name='name']").val(); 50 var a = $("input[name='name']").val();
51 - if (a == ""){ 51 + if ($.trim(a) == ""){
52 alert("生产日期不能为空"); 52 alert("生产日期不能为空");
53 return false; 53 return false;
54 } 54 }
app-ht/modules/project/controllers/ProjectController.php
  Diff comments   View file @b897036
@@ -140,7 +140,7 @@ class ProjectController extends BaseController @@ -140,7 +140,7 @@ class ProjectController extends BaseController
140 $params = $this->dataList(1); 140 $params = $this->dataList(1);
141 return $this->render('index', $params); 141 return $this->render('index', $params);
142 } 142 }
143 - if (empty($name)) { 143 + if (empty(trim($name))) {
144 Yii::$app->session->setFlash('error', '项目不能为空'); 144 Yii::$app->session->setFlash('error', '项目不能为空');
145 return $this->render('edit', ["info" => $Project]); 145 return $this->render('edit', ["info" => $Project]);
146 } 146 }
app-ht/modules/project/views/project/create.php
  Diff comments   View file @b897036
@@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
17 <div class="form-group col-sm-12"> 17 <div class="form-group col-sm-12">
18 <label for="skillName" class="col-sm-4 control-label text-right">项目名称：</label> 18 <label for="skillName" class="col-sm-4 control-label text-right">项目名称：</label>
19 <div class="col-sm-4 text-left"> 19 <div class="col-sm-4 text-left">
20 - <input type="text" value="" name="name" placeholder="请输入项目名称" style="margin-top: -6px;" class="form-control""> 20 + <input type="text" value="" name="name" placeholder="请输入项目名称" style="margin-top: -6px;" class="form-control"" autocomplete="off">
21 </div> 21 </div>
22 </div> 22 </div>
23 </div> 23 </div>
@@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -44,7 +44,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
44 var getUrl = '<?=Url::toRoute("/project/project/do-add")?>'; 44 var getUrl = '<?=Url::toRoute("/project/project/do-add")?>';
45 $('#myFrom').attr('action', getUrl); 45 $('#myFrom').attr('action', getUrl);
46 var a = $("input[name='name']").val(); 46 var a = $("input[name='name']").val();
47 - if (a == ""){ 47 + if ($.trim(a) == ""){
48 alert("项目名称不能为空"); 48 alert("项目名称不能为空");
49 return false; 49 return false;
50 } 50 }
app-ht/modules/project/views/project/edit.php
  Diff comments   View file @b897036
@@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -48,7 +48,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
48 var getUrl = '<?=Url::toRoute("/project/project/do-edit")?>'; 48 var getUrl = '<?=Url::toRoute("/project/project/do-edit")?>';
49 $('#myFrom').attr('action', getUrl); 49 $('#myFrom').attr('action', getUrl);
50 var a = $("input[name='name']").val(); 50 var a = $("input[name='name']").val();
51 - if (a == ""){ 51 + if ($.trim(a) == ""){
52 alert("项目名称不能为空"); 52 alert("项目名称不能为空");
53 return false; 53 return false;
54 } 54 }
app-ht/modules/project/views/project/index.php
  Diff comments   View file @b897036
@@ -27,7 +27,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -27,7 +27,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
27 <td width="10%" class="text-right">项目名称</td> 27 <td width="10%" class="text-right">项目名称</td>
28 <td width="35%" class="text-left"> 28 <td width="35%" class="text-left">
29 <div class="form-inline"> 29 <div class="form-inline">
30 - <input type="text" class="form-control" style="width: 150px;" name="name" placeholder="输入项目名称" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>"> 30 + <input type="text" class="form-control" style="width: 150px;" name="name" autocomplete="off" placeholder="项目关键字" value="<?php if (!empty($gets['name'])){ echo $gets['name']; } ?>">
31 </div> 31 </div>
32 </td> 32 </td>
33 <td width="10%" class="text-right">创建时间</td> 33 <td width="10%" class="text-right">创建时间</td>
domain/manufacturer/Manufacturer.php
  Diff comments   View file @b897036
@@ -26,8 +26,8 @@ class Manufacturer @@ -26,8 +26,8 @@ class Manufacturer
26 try { 26 try {
27 $manufacturerModel = Yii::createObject(ManufacturerModel::className()); 27 $manufacturerModel = Yii::createObject(ManufacturerModel::className());
28 $manufacturerModel->manufacture_no = self::getManufactureNo(); 28 $manufacturerModel->manufacture_no = self::getManufactureNo();
29 - $manufacturerModel->name = $item["name"]; // 厂商名称  
30 - $manufacturerModel->phone = $item['phone']; 29 + $manufacturerModel->name = trim($item["name"]); // 厂商名称
  30 + $manufacturerModel->phone = trim($item['phone']);
31 $result = $manufacturerModel->save(); 31 $result = $manufacturerModel->save();
32 $saveResult = false; 32 $saveResult = false;
33 if ($result) { 33 if ($result) {
@@ -87,6 +87,9 @@ class Manufacturer @@ -87,6 +87,9 @@ class Manufacturer
87 if (empty($sysUserModel)) { 87 if (empty($sysUserModel)) {
88 return false; 88 return false;
89 } 89 }
  90 + if (isset($item['name'])) {
  91 + $item['name'] = trim($item['name']);
  92 + }
90 if (isset($item['name']) && !empty($item['name'])) { 93 if (isset($item['name']) && !empty($item['name'])) {
91 $manufacturerModel->name = $item['name']; 94 $manufacturerModel->name = $item['name'];
92 } 95 }
domain/model/Model.php
  Diff comments   View file @b897036
@@ -20,7 +20,10 @@ class Model @@ -20,7 +20,10 @@ class Model
20 static function create($item) 20 static function create($item)
21 { 21 {
22 try { 22 try {
23 - $findModelModel = ModelModel::findOne(['name' => $item["name"]]); 23 + if (isset($item['name'])) {
  24 + $item['name'] = trim($item["name"]);
  25 + }
  26 + $findModelModel = ModelModel::findOne(['name' => $item['name']]);
24 if (!empty($findModelModel)) { 27 if (!empty($findModelModel)) {
25 return -1; 28 return -1;
26 } 29 }
@@ -46,6 +49,9 @@ class Model @@ -46,6 +49,9 @@ class Model
46 if (empty($modelModel)) { 49 if (empty($modelModel)) {
47 return false; 50 return false;
48 } 51 }
  52 + if (isset($item['name'])) {
  53 + $item['name'] = trim($item["name"]);
  54 + }
49 if (isset($item['name']) && $modelModel->name != $item['name']) { 55 if (isset($item['name']) && $modelModel->name != $item['name']) {
50 $findModelModel = ModelModel::findOne(['name' => $item["name"]]); 56 $findModelModel = ModelModel::findOne(['name' => $item["name"]]);
51 if (!empty($findModelModel)) { 57 if (!empty($findModelModel)) {
domain/production/Production.php
  Diff comments   View file @b897036
@@ -46,6 +46,9 @@ class Production @@ -46,6 +46,9 @@ class Production
46 if (empty($productionModel)) { 46 if (empty($productionModel)) {
47 return false; 47 return false;
48 } 48 }
  49 + if (isset($item['name'])) {
  50 + $item['name'] = trim($item["name"]);
  51 + }
49 if (isset($item['name']) && $productionModel->name != $item['name']) { 52 if (isset($item['name']) && $productionModel->name != $item['name']) {
50 $findProductionModel = ProductionModel::findOne(['name' => $item["name"]]); 53 $findProductionModel = ProductionModel::findOne(['name' => $item["name"]]);
51 if (!empty($findProductionModel)) { 54 if (!empty($findProductionModel)) {
domain/project/Project.php
  Diff comments   View file @b897036
@@ -20,6 +20,9 @@ class Project @@ -20,6 +20,9 @@ class Project
20 static function create($item) 20 static function create($item)
21 { 21 {
22 try { 22 try {
  23 + if (isset($item['name'])) {
  24 + $item['name'] = trim($item['name']);
  25 + }
23 $findProjectModel = ProjectModel::findOne(['name' => $item["name"]]); 26 $findProjectModel = ProjectModel::findOne(['name' => $item["name"]]);
24 if (!empty($findProjectModel)) { 27 if (!empty($findProjectModel)) {
25 return -1; 28 return -1;
@@ -46,6 +49,9 @@ class Project @@ -46,6 +49,9 @@ class Project
46 if (empty($projectModel)) { 49 if (empty($projectModel)) {
47 return false; 50 return false;
48 } 51 }
  52 + if (isset($item['name'])) {
  53 + $item['name'] = trim($item['name']);
  54 + }
49 if (isset($item['name']) && $projectModel->name != $item['name']) { 55 if (isset($item['name']) && $projectModel->name != $item['name']) {
50 $findProjectModel = ProjectModel::findOne(['name' => $item["name"]]); 56 $findProjectModel = ProjectModel::findOne(['name' => $item["name"]]);
51 if (!empty($findProjectModel)) { 57 if (!empty($findProjectModel)) {