Merge pull request 'projects/mesxc-lb' (#257) from projects/mesxc-lb into projects/mesxc-test

Reviewed-on: #257
This commit is contained in:
朱菊兰 2024-03-21 13:37:34 +08:00
commit 7bc5947a43
12 changed files with 89 additions and 13 deletions

View File

@ -24,6 +24,8 @@
<el-form-item label="部门" prop="departmentId"> <el-form-item label="部门" prop="departmentId">
<el-select <el-select
v-model="dataForm.departmentId" v-model="dataForm.departmentId"
filterable
clearable
:placeholder="`请选择部门`"> :placeholder="`请选择部门`">
<el-option <el-option
v-for="opt in departmentOptions" v-for="opt in departmentOptions"
@ -167,7 +169,7 @@ export default {
const workerlist = await this.$axios( const workerlist = await this.$axios(
// '/base/core-worker/listAll' // '/base/core-worker/listAll'
'/base/core-worker/workerList' '/base/core-worker/workerList'
); );
if (workerlist.code == 0) { if (workerlist.code == 0) {
inspectorList = inspectorList.concat( inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({ workerlist.data.map((item) => ({

View File

@ -155,6 +155,18 @@ export default {
rules: [ rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' }, { required: true, message: '设备不能为空', trigger: 'blur' },
], ],
bind: {
clearable: true,
filterable: true
}
},
{
input: true,
label: '巡检项目',
prop: 'program',
rules: [
{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
],
}, },
], ],
[ [

View File

@ -251,6 +251,10 @@ export default {
rules: [ rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' }, { required: true, message: '设备不能为空', trigger: 'blur' },
], ],
bind: {
filterable: true,
clearable: true,
}
}, },
], ],
[ [

View File

@ -91,7 +91,7 @@ export default {
tableProps: [ tableProps: [
{ prop: 'name', label: '巡检单名称' }, { prop: 'name', label: '巡检单名称' },
{ prop: 'department', label: '部门' }, { prop: 'department', label: '部门' },
{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime }, { prop: 'planCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'groupClass', label: '班次' }, { prop: 'groupClass', label: '班次' },
// { // {
// prop: '_detail', // prop: '_detail',

View File

@ -109,6 +109,7 @@ export default {
departmentId: null, departmentId: null,
planCheckTime: null, planCheckTime: null,
confirmTimeLimit: null, confirmTimeLimit: null,
checkPeriod: null,
groupClass: null, groupClass: null,
remark: null, remark: null,
// special: true, // special: true,

View File

@ -40,37 +40,37 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="保养计划名称" prop="name"> <el-form-item label="保养计划名称" prop="name">
<span>{{ form.name }}</span> <span>{{ form.name || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="部门" prop="departmentName"> <el-form-item label="部门" prop="departmentName">
<span>{{ form.departmentName }}</span> <span>{{ form.departmentName || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产线名" prop="lineName"> <el-form-item label="产线名" prop="lineName">
<span>{{ form.lineName }}</span> <span>{{ form.lineName || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="保养频率" prop="maintenancePeriod"> <el-form-item label="保养频率" prop="maintenancePeriod">
<span>{{ form.maintenancePeriod }}</span> <span>{{ form.maintenancePeriod || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="保养时长" prop="maintainDuration"> <el-form-item label="保养时长" prop="maintainDuration">
<span>{{ form.maintainDuration }}</span> <span>{{ form.maintainDuration || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="计划保养人员" prop="maintainer"> <el-form-item label="计划保养人员" prop="maintainer">
<span>{{ form.maintainer }}</span> <span>{{ form.maintainer || '---' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

View File

@ -119,7 +119,7 @@ const btn = {
render: function (h) { render: function (h) {
return ( return (
<el-button type="text" onClick={this.handleClick}> <el-button type="text" onClick={this.handleClick}>
{this.injectData.name} {this.injectData.entryText}
</el-button> </el-button>
); );
}, },
@ -188,7 +188,7 @@ export default {
{ {
prop: 'opt2', prop: 'opt2',
label: '保养内容', label: '保养内容',
name: '详情', entryText: '详情',
subcomponent: btn, subcomponent: btn,
width: 100, width: 100,
}, },
@ -386,6 +386,7 @@ export default {
case '保养内容': case '保养内容':
this.monitorDetailVisible = true; this.monitorDetailVisible = true;
this.$nextTick(() => { this.$nextTick(() => {
console.log('value', value);
this.$refs.monitorDetailDrawer.show(value); this.$refs.monitorDetailDrawer.show(value);
}); });
break; break;

View File

@ -188,6 +188,10 @@ export default {
rules: [ rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' }, { required: true, message: '设备不能为空', trigger: 'blur' },
], ],
bind: {
filterable: true,
clearable: true,
}
}, },
], ],
[ [

View File

@ -296,6 +296,8 @@ export default {
placeholder: '请选择保养计划名称', placeholder: '请选择保养计划名称',
param: 'maintainPlanId', param: 'maintainPlanId',
defaultSelect: null, defaultSelect: null,
filterable: true,
clearable: true
}, },
// //
{ {

View File

@ -269,6 +269,7 @@ export default {
}, },
mounted() { mounted() {
// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode'); // !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
// this.getList('code');
this.getList('maintainer'); this.getList('maintainer');
this.getList('department'); this.getList('department');
this.getList('line'); this.getList('line');
@ -328,6 +329,7 @@ export default {
'/base/core-department/listAll', '/base/core-department/listAll',
'/base/core-worker/workerList', '/base/core-worker/workerList',
// '/base/core-worker/listAll', // '/base/core-worker/listAll',
'/base/equipment-maintain-log/getCode',
]; ];
let res; let res;
switch (source) { switch (source) {

View File

@ -381,6 +381,8 @@ export default {
placeholder: '请选择保养计划名称', placeholder: '请选择保养计划名称',
param: 'maintainPlanId', param: 'maintainPlanId',
defaultSelect: null, defaultSelect: null,
clearable: true,
filterable: true,
}, },
// //
{ {
@ -669,8 +671,21 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.$axios({
this.title = '添加待确认保养记录'; url: '/base/equipment-maintain-log/getCode',
})
.then((res) => {
if (res.code == 0) {
this.form.maintainOrderNumber = res.data;
this.open = true;
this.title = '添加待确认保养记录';
}
})
.catch((err) => {
this.$message.error('获取保养单号出错');
this.open = true;
this.title = '添加待确认保养记录';
});
}, },
getConfirmed() { getConfirmed() {

View File

@ -9,7 +9,9 @@
<el-drawer <el-drawer
:visible="visible" :visible="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer" class="drawer"
custom-class="mes-drawer" custom-class="mes-drawer"
size="60%" size="60%"
@ -172,6 +174,10 @@ export default {
rules: [ rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' }, { required: true, message: '设备不能为空', trigger: 'blur' },
], ],
bind: {
filterable: true,
clearable: true,
},
}, },
], ],
[ [
@ -253,6 +259,33 @@ export default {
// this.getList('line'); // this.getList('line');
}, },
methods: { methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
try {
if (
await this.$confirm(
<div style="position: relative; margin-bottom: 26px; overflow: visible;">
<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
确认要关闭页面吗?
</h1>
</div>,
// <p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
//
// </p>
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.handleConfirm();
}
} catch (err) {
return false;
}
},
handleSearchBarBtnClick(btn) { handleSearchBarBtnClick(btn) {
switch (btn.btnName) { switch (btn.btnName) {
case 'search': case 'search':