TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: TuringsMachine:6677b3b0b8261c749da55444c6ee7bebc04de2a5
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd
..
compare: TuringsMachine:5abebfbc309b554f81174029c2e3ca33ee40cea6
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd

3 Commits
6677b3b0b8 ... 5abebfbc30

Author SHA1 Message Date
zhangjunwen
5abebfbc30 Merge branch 'zjw' 2024-10-30 17:43:07 +08:00
zhangjunwen
89d3b3e516 Merge branch 'zjw' 2024-10-29 17:51:56 +08:00
xusd
29d38aeeff 点检工单管理，不显示已完成的内容 2024-10-29 10:32:50 +08:00
2 changed files with 9 additions and 5 deletions
Show Stats Expand all files Collapse all files

1
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/inspection/InspectionInfoMapper.java
View File

@ -22,6 +22,7 @@ public interface InspectionInfoMapper extends BaseMapperX<InspectionInfoDO> {
.eqIfPresent(InspectionInfoDO::getCustomerId, reqVO.getCustomerId()) .eqIfPresent(InspectionInfoDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(InspectionInfoDO::getInspectionPlanId, reqVO.getInspectionPlanId()) .eqIfPresent(InspectionInfoDO::getInspectionPlanId, reqVO.getInspectionPlanId())
.eqIfPresent(InspectionInfoDO::getStatus, reqVO.getStatus()) .eqIfPresent(InspectionInfoDO::getStatus, reqVO.getStatus())
.neIfPresent(InspectionInfoDO::getStatus,3)
.orderByDesc(InspectionInfoDO::getInspectionId)); .orderByDesc(InspectionInfoDO::getInspectionId));
} }

13
imt-ui/src/views/system/inspection/inspectionInfo/index.vue
View File

@ -38,7 +38,7 @@
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.INSPECTION_STATUS)" <el-option v-for="dict in inspectionStatusList"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -50,10 +50,10 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)" <!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"-->
v-hasPermi="['imt:inspection-info:create']">新增</el-button> <!-- v-hasPermi="['imt:inspection-info:create']">新增</el-button>-->
</el-col> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"--> <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"-->
<!-- v-hasPermi="['imt:inspection-info:export']">导出</el-button>--> <!-- v-hasPermi="['imt:inspection-info:export']">导出</el-button>-->
@ -158,6 +158,7 @@ import * as InspectionInfoApi from '@/api/system/inspection/inspectionInfo';
import InspectionInfoForm from './InspectionInfoForm.vue'; import InspectionInfoForm from './InspectionInfoForm.vue';
import {getEquipCascader} from "@/api/system/equip/equipInfo"; import {getEquipCascader} from "@/api/system/equip/equipInfo";
import {getCustomerSelection} from "@/api/system/baseData/customerInfo"; import {getCustomerSelection} from "@/api/system/baseData/customerInfo";
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
export default { export default {
name: "InspectionInfo", name: "InspectionInfo",
@ -166,6 +167,7 @@ export default {
}, },
data() { data() {
return { return {
inspectionStatusList:[],
exclusiveInspectionFeedbackTitle:"定制化点检反馈", exclusiveInspectionFeedbackTitle:"定制化点检反馈",
exclusiveInspectionFeedbackVisible:false, exclusiveInspectionFeedbackVisible:false,
exclusiveInspectionFeedbackData:{}, exclusiveInspectionFeedbackData:{},
@ -273,6 +275,7 @@ export default {
}) })
this.equipCascader = res; this.equipCascader = res;
}) })
this.inspectionStatusList = getDictDatas(DICT_TYPE.INSPECTION_STATUS).filter(item => item.value !== "3");
}, },
cascaderChange(value){ cascaderChange(value){
if (value.length > 0){ if (value.length > 0){