DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-07-25 17:10:53 +08:00
parent b41c015b57 ea1777e65e
commit 084a44ccf2
7 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java
View File

@@ -35,8 +35,6 @@ public class TreeEntity<T> extends BaseEntity {
*/
@TableField(exist = false)
private List<T> children = new ArrayList<>();
/** 显示顺序 */
private Integer orderNum;
/** 祖级列表 */
@TableField(exist = false)

4
klp-ui/src/views/mes/dv/checkplan/index.vue
View File

@@ -176,7 +176,7 @@
<el-input v-model="form.planCode" placeholder="请输入方案编码" />
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
@@ -184,7 +184,7 @@
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item label="方案名称" prop="planName">
<el-input v-model="form.planName" placeholder="请输入方案名称" />

38
klp-ui/src/views/mes/dv/checkrecord/index.vue
View File

@@ -226,6 +226,7 @@ import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
import CheckplanSelect from "@/components/dvplanSelect/index.vue";
import CheckRecordLine from "./line.vue";
import UserSingleSelect from "@/components/userSelect/single.vue"
import {formatDate} from "@/utils";
export default {
name: "Checkrecord",
dicts: ['mes_order_status'],
@@ -255,7 +256,19 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, checkTime: null, nickName: null, status: null, },
planId: null,
planCode: null,
planName: null,
planType: null,
machineryId: null,
machineryCode: null,
machineryName: null,
machineryBrand: null,
machinerySpec: null,
checkTime: null,
nickName: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
@@ -291,7 +304,28 @@ export default {
// 表单重置
reset() {
this.form = {
recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, checkTime: this.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"), status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
recordId: null,
planId: null,
planCode: null,
planName: null,
planType: null,
machineryId: null,
machineryCode: null,
machineryName: null,
machineryBrand: null,
machinerySpec: null,
checkTime: formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"),
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.form.userId= this.$store.state.user.id;
this.form.nickName= this.$store.state.user.nick;
this.form.userName= this.$store.state.user.name;

8
klp-ui/src/views/mes/dv/machinery/index.vue
View File

@@ -85,7 +85,7 @@
v-hasPermi="['mes:dv:machinery:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="info"
plain
@@ -94,7 +94,7 @@
@click="handleImport"
v-hasPermi="['mes:dv:machinery:import']"
>导入</el-button>
</el-col>
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -155,13 +155,13 @@
@click="handleDelete(scope.row)"
v-hasPermi="['mes:dv:machinery:remove']"
>删除</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-printer"
@click="handleHiPrint(scope.row)"
v-hasPermi="['mes:dv:machinery:print']"
>标签打印</el-button>
>标签打印</el-button>-->
</template>
</el-table-column>
</el-table>

33
klp-ui/src/views/mes/dv/maintenrecord/line.vue
View File

@@ -91,7 +91,7 @@
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="项目内容">
<el-form-item label="项目内容" prop="subjectContent">
<editor v-model="form.subjectContent" :min-height="192"/>
</el-form-item>
<el-form-item label="标准" prop="subjectStandard">
@@ -149,7 +149,16 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
recordId: null, subjectId: null, subjectCode: null, subjectName: null, subjectType: null, subjectContent: null, subjectStandard: null, maintenStatus: null, maintenResult: null, },
recordId: null,
subjectId: null,
subjectCode: null,
subjectName: null,
subjectType: null,
subjectContent: null,
subjectStandard: null,
maintenStatus: null,
maintenResult: null,
},
// 表单参数
form: {},
// 表单校验
@@ -188,7 +197,25 @@ export default {
// 表单重置
reset() {
this.form = {
lineId: null, recordId: null, subjectId: null, subjectCode: null, subjectName: null, subjectType: null, subjectContent: null, subjectStandard: null, maintenStatus: "0", maintenResult: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
lineId: null,
recordId: null,
subjectId: null,
subjectCode: null,
subjectName: null,
subjectType: null,
subjectContent: null,
subjectStandard: null,
maintenStatus: "0",
maintenResult: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */

8
klp-ui/src/views/mes/dv/repair/index.vue
View File

@@ -166,7 +166,7 @@
<el-input v-model="form.repairCode" placeholder="请输入维修单编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
@@ -174,7 +174,7 @@
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item label="维修单名称" prop="repairName">
<el-input v-model="form.repairName" placeholder="请输入维修单名称" />
@@ -208,7 +208,7 @@
v-model="form.requireDate"
style="width: 187px"
type="date"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择报修日期">
</el-date-picker>
</el-form-item>
@@ -219,7 +219,7 @@
v-model="form.finishDate"
style="width: 187px"
type="date"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd "
placeholder="请选择维修完成日期">
</el-date-picker>
</el-form-item>

4
klp-ui/src/views/mes/dv/subject/index.vue
View File

@@ -133,7 +133,7 @@
<el-input v-model="form.subjectCode" placeholder="请输入项目编码" />
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
@@ -141,7 +141,7 @@
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item label="项目名称" prop="subjectName">
<el-input v-model="form.subjectName" placeholder="请输入项目名称" />