10 Commits

Author SHA1 Message Date
751828be48 refactor: 处理迁移文件
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 3s
2026-08-11 09:39:44 +08:00
e2d6718e9c refactor: 清理产品兼容性与产品关联相关
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 4s
2026-08-11 09:32:14 +08:00
71f4b82e4b fix: 处理产品兼容性信息回显数据结构问题
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 4s
2026-07-09 11:27:04 +08:00
b4b4b914c2 fix: 修复兼容配件类型状态筛选bug
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 3s
2026-07-09 10:09:46 +08:00
d71251fecf refactor: 去除兼容配件类型model中不必要的获取器代码
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 3s
2026-07-09 09:56:23 +08:00
77e60ef482 fix: 兼容配件遗漏状态筛选问题
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 3s
2026-07-09 09:46:09 +08:00
116d788ecc fix: 修复产品兼容性信息更新问题
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 2s
2026-07-08 18:01:24 +08:00
0c20bd0519 refactor: 更新产品兼容性关联表迁移文件
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 3s
2026-07-08 17:52:09 +08:00
d8a584e9b7 refactor: 产品详细兼容性信息输入及更新
All checks were successful
Gitea Actions Official-website / deploy-dev (push) Successful in 6s
2026-07-08 17:45:48 +08:00
36261488b4 feat: 产品更新时可编辑兼容性数据 2026-07-08 17:26:18 +08:00
5 changed files with 19 additions and 61 deletions

View File

@@ -16,8 +16,9 @@ class ProductCompatParts
{
$params = request()->param([
'name',
'page/d' => 1,
'size/d' => 10
'is_show' => null,
'page/d' => 1,
'size/d' => 10
]);
$list = ProductCompatPartsModel::withoutField([
@@ -25,6 +26,7 @@ class ProductCompatParts
'deleted_at'
])
->language(request()->lang_id)
->disabled(is_null($params['is_show']) ? null : ($params['is_show'] == 1 ? 0 : 1))
->withSearch('name', [
'name' => $params['name']??null
])

View File

@@ -16,13 +16,6 @@ class ProductCompatPartsModel extends ProductCompatPartsBaseModel
// 软件删除时间字段
protected $deleteTime = 'deleted_at';
// 状态获取器
public function getStatusTextAttr($value, array $data)
{
$status = ['启用', '禁用'];
return $status[$data['status']];
}
// 按所属语言查询
public function scopeLanguage(\think\db\Query $query, int $value)
{
@@ -39,6 +32,13 @@ class ProductCompatPartsModel extends ProductCompatPartsBaseModel
$query->where('name', '=', $value);
}
// 按状态查询
public function scopeDisabled(\think\db\Query $query, int|null $disabled)
{
if (is_null($disabled)) return;
$query->where('disabled', '=', $disabled);
}
// 查询配件类型名称搜索
public function searchNameAttr(\think\db\Query $query, string|null $value, array $data)
{

View File

@@ -1,14 +0,0 @@
<?php
declare (strict_types = 1);
namespace app\admin\model\v1;
use app\common\model\ProductCompatRelBaseModel;
/**
* @mixin \think\Model
*/
class ProductCompatRelModel extends ProductCompatRelBaseModel
{
//
}

View File

@@ -1,29 +0,0 @@
<?php
declare (strict_types = 1);
namespace app\common\model;
/**
* @mixin \think\Model
*/
class ProductCompatRelBaseModel extends BaseModel
{
// 表名
protected $name = "product_compat_rel";
// 主键
protected $pk = "id";
// 字段信息
protected $schema = [
"id" => "int",
"language_id" => "int",
"product_id" => "int",
"compat_id" => "int",
"series_name" => "string",
"show_series_name" => "int",
"remark" => "int",
"created_at" => "datetime",
"updated_at" => "datetime",
];
}

View File

@@ -3,7 +3,7 @@
use think\migration\Migrator;
use think\migration\db\Column;
class CreateProductCompatRel extends Migrator
class CreateProductCompatTypes extends Migrator
{
/**
* Change Method.
@@ -28,20 +28,19 @@ class CreateProductCompatRel extends Migrator
*/
public function change()
{
$table = $this->table('product_compat_rel', [
'engine' => 'InnoDB',
$table = $this->table('product_compat_types', [
'engine' => 'MyISAM',
'collation' => 'utf8mb4_general_ci',
'comment' => '产品兼容性关联表'
'comment' => '产品兼容性-产品类型'
]);
$table->addColumn('language_id', 'integer', ['signed' => false, 'null' => false, 'comment' => '语言ID'])
->addColumn('product_id', 'integer', ['null' => false, 'comment' => '产品id'])
->addColumn('compat_id', 'json', ['null' => false, 'comment' => '关联的兼容性数据id'])
->addColumn('series_name', 'string', ['limit' => 128, 'null' => true, 'comment' => '产品系列名'])
->addColumn('show_series_name', 'boolean', ['null' => false, 'default' => 0, 'comment' => '是否显示系列名0=否1=是'])
->addColumn('remark', 'string', ['limit' => 512, 'null' => true, 'comment' => '兼容性说明'])
->addColumn('name', 'string', ['limit' => 128, 'null' => true, 'comment' => '类型名称'])
->addColumn('sort', 'integer', ['default' => 0, 'comment' => '排序'])
->addColumn('disabled', 'boolean', ['default' => 0, 'comment' => '是否禁用 0:启用 1:禁用'])
->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间'])
->addColumn('updated_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'comment' => '更新时间'])
->addColumn('deleted_at', 'timestamp', ['null' => true, 'comment' => '删除时间'])
->addIndex(['language_id'], ['name' => 'idx_language_id'])
->create();
}