bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-28 15:51:01 +08:00
parent 4acdf29606 4dece6271b
commit a01d33ea69
6 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -194,8 +194,9 @@ public class MaTypeController extends BaseController {
@GetMapping("/getListByMaType")
public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId,
@RequestParam(required = false) String typeName) {
startPage();
List<MaType> listByMaType = iTypeService.getListByParentId(typeId, typeName);
return success(listByMaType);
return success(getDataTable(listByMaType));
}
/**

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -531,7 +531,7 @@
company_id,
</if>
<if test="scrapReason != null and scrapReason != ''">
audit_remark,
remark,
</if>
<if test="scrapType != null and scrapType != ''">
scrap_type,

5
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -347,7 +347,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
left join ma_type_keeper mtk on m.type_id = mtk.type_id
left join sys_user su on mtk.user_id = su.user_id
where m.parent_id = #{typeId} and m.status = '0' and m.del_flag = '0'
where m.status = '0' and m.del_flag = '0'
<if test="typeId != null and typeId !=''">
AND m.parent_id = #{typeId}
</if>
<if test="typeName != null and typeName !=''">
AND type_name like concat('%',#{typeName},'%')
</if>

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -293,7 +293,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
scrapApplyDetails.setCreateTime(new Date());
scrapApplyDetails.setCompanyId((long) companyId);
scrapApplyDetails.setAuditRemark(bean.getScrapReason());
scrapApplyDetails.setRemark(bean.getScrapReason());
//根据fileIds获取所有的图片地址
if (StringUtils.isNotEmpty(bean.getFileIds())){
String[] fileIsList = bean.getFileIds().split(",");

4
sgzb-ui/src/components/Editor/index.vue
View File

@ -81,8 +81,8 @@ export default {
[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
[{ align: [] }], // 对齐方式
["clean"], // 清除文本格式
["link", "image", "video"] // 链接、图片、视频
["clean"] // 清除文本格式
// ["link", "image", "video"] // 链接、图片、视频
],
},
placeholder: "请输入内容",

22
sgzb-ui/src/views/system/user/index.vue
View File

@ -135,17 +135,17 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button
>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-upload2"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['system:user:import']"-->
<!-- >导入</el-button-->
<!-- >-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"