diff --git a/app-ht/config/params.php b/app-ht/config/params.php index c42feaf..a1f383b 100644 --- a/app-ht/config/params.php +++ b/app-ht/config/params.php @@ -1,5 +1,5 @@ 'v1.8.6 build 14', + 'VERSION' => 'v1.8.6 build 15', 'MANUFACTURE_ROLE_ID' => 1 ]; \ No newline at end of file diff --git a/app-ht/modules/upgrade/views/upgrade/create.php b/app-ht/modules/upgrade/views/upgrade/create.php index dd7513e..1ec8334 100644 --- a/app-ht/modules/upgrade/views/upgrade/create.php +++ b/app-ht/modules/upgrade/views/upgrade/create.php @@ -113,10 +113,25 @@ $this->params['breadcrumbs'][] = $this->title; var getUrl = '=Url::toRoute("/upgrade/upgrade/do-add")?>'; $('#myFrom').attr('action', getUrl); var a = $("input[name='version']").val(); + var package_name = $("input[name='package_name']").val(); + var manufacture_id = $("input[name='manufacture_id']").val(); + var path = $("input[name='path']").val(); if (a == ""){ alert("APP版本号不能为空"); return false; } + if (package_name == ""){ + alert("安装包名不能为空"); + return false; + } + if (manufacture_id == ""){ + alert("请选择厂商"); + return false; + } + if (path == ""){ + alert("请上传安装包"); + return false; + } var cb = $("#myFrom").validate().form(); if (!cb){ return; @@ -181,6 +196,7 @@ $this->params['breadcrumbs'][] = $this->title; '
等待上传...
' + '' );*/ + $("#save").attr("disabled", "disabled"); $list.html( '等待上传...
' + @@ -206,6 +222,7 @@ $this->params['breadcrumbs'][] = $this->title; // 文件上传成功 uploader.on( 'uploadSuccess', function( file,response) { $( '#'+file.id ).find('p.state').text('已上传'); + $("#save").removeAttr("disabled"); //$list.append(''); $("input[name='path']").val(response.filePath); $("input[name='size']").val(response.fileSize); diff --git a/domain/upgrade/UpgradeRepository.php b/domain/upgrade/UpgradeRepository.php index 183da6d..8a4b3f3 100644 --- a/domain/upgrade/UpgradeRepository.php +++ b/domain/upgrade/UpgradeRepository.php @@ -38,7 +38,7 @@ class UpgradeRepository if ($limit) { $upgradeFind->limit($limit); } - $upgradeFind->andWhere(["is_delete" => 0]); + $upgradeFind->andWhere(["u.is_delete" => 0]); $upgradeFind->orderBy("u.id desc"); $upgradeFind->asArray(); $dataList = $upgradeFind->all(); @@ -57,7 +57,7 @@ class UpgradeRepository if (!empty($map)) { $upgradeFind->where($map); } - $upgradeFind->andWhere(["is_delete" => 0]); + $upgradeFind->andWhere(["u.is_delete" => 0]); $pageCount = $upgradeFind->count(); return $pageCount; -- libgit2 0.21.0