mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui drawer ui change

Browse Source
This commit is contained in:
lb 2024-03-13 18:14:06 +08:00
parent 25f3c5d13b
commit 26d2e2b7e5
15 changed files with 270 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/specialEquipment/check/Config.vue
View File

@ -51,7 +51,8 @@
<addOrUpdata
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getList" />
@refreshDataList="getList"
@destroy="addOrUpdateVisible = false" />
</div>
</template>
@ -60,10 +61,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import addOrUpdata from './add-or-updata.vue';
import add from './add.vue';
import { parseTime } from '../../core/mixins/code-filter';
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
export default {
name: 'SpecialEquipmentCheckConfig',
components: { addOrUpdata, add },
components: { addOrUpdata, add, BaseDialog: BaseDialogWrapperVue },
mixins: [basicPageMixin],
data() {
return {
@ -188,6 +190,7 @@ export default {
pageSize: 10,
name: null,
status: 0,
special: true,
},
// 表单参数
form: {},

65
src/views/specialEquipment/check/Content-edit.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -171,7 +173,7 @@
</div>
<div class="drawer-body__footer">
<el-button style="" @click="handleCancel">
<el-button v-if="!disableEdit" @click="handleCancel">
{{ disableEdit ? '返回' : '取消' }}
</el-button>
<el-button
@ -206,35 +208,11 @@
<script>
import DialogForm from '../../../components/DialogForm/index.vue';
import { groupConnectWorkshop } from '@/utils/equipment-module';
const SmallTitle = {
name: 'SmallTitle',
props: ['size'],
components: {},
data() {
return {};
},
methods: {},
render: function (h) {
return h(
'span',
{
class: 'small-title',
style: {
fontSize: '18px',
lineHeight:
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
fontWeight: 500,
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
},
},
this.$slots.default
);
},
};
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
import SmallTitle from '../components/SmallTitle.js';
export default {
components: { SmallTitle, DialogForm },
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
props: ['dataId'], // dataId 作为一个通用的存放id的字段
data() {
return {
@ -411,6 +389,35 @@ export default {
this.getList('inspector');
},
methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
if (this.disableEdit) return this.handleCancel();
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.handleCancel();
}
} catch (err) {
return false;
}
},
handleSearchBarBtnClick(btn) {
switch (btn.btnName) {
case 'search':

19
src/views/specialEquipment/check/Content.vue
View File

@ -64,10 +64,18 @@ import { parseTime } from '../../core/mixins/code-filter';
import CheckOrderListTable from './CheckOrderListTable.vue';
import edit from './Content-edit.vue';
import AddCheckDet from './Content-add_detail.vue';
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
export default {
name: 'SpecialEquipmentCheckConfig',
components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
components: {
addOrUpdata,
add,
edit,
AddCheckDet,
BaseDialog: BaseDialogWrapperVue,
CheckOrderListTable,
},
mixins: [basicPageMixin],
data() {
return {
@ -86,7 +94,7 @@ export default {
? {
type: 'edit',
btnName: '修改',
}
}
: undefined,
{
type: 'detail',
@ -96,7 +104,7 @@ export default {
? {
type: 'delete',
btnName: '删除',
}
}
: undefined,
].filter((v) => v),
tableProps: [
@ -334,9 +342,8 @@ export default {
}
return this.$axios({
url:
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
// + checkPersonParam,
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
// + checkPersonParam,
// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
method: 'put',
data: [id],

41
src/views/specialEquipment/check/Record-detail.vue
View File

@ -7,9 +7,10 @@
<template>
<el-drawer
:visible="visible"
:visible.sync="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="true"
:close-on-click-modal="true"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -30,13 +31,13 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="巡检单名称" prop="name">
<div style="">{{ form.name }}</div>
<div style="">{{ form.name || '---' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门" prop="department">
<div style="">{{ form.department }}</div>
<div style="">{{ form.department || '---' }}</div>
</el-form-item>
</el-col>
@ -111,7 +112,7 @@
</div>
<div class="drawer-body__footer">
<el-button style="" @click="handleCancel">
<el-button v-if="!disableEdit" @click="handleCancel">
{{ disableEdit ? '返回' : '取消' }}
</el-button>
<el-button
@ -146,35 +147,11 @@
<script>
import { parseTime } from '../../core/mixins/code-filter';
import DialogForm from '../../../components/DialogForm/index.vue';
const SmallTitle = {
name: 'SmallTitle',
props: ['size'],
components: {},
data() {
return {};
},
methods: {},
render: function (h) {
return h(
'span',
{
class: 'small-title',
style: {
fontSize: '18px',
lineHeight:
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
fontWeight: 500,
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
},
},
this.$slots.default
);
},
};
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
import SmallTitle from '../components/SmallTitle.js';
export default {
components: { SmallTitle, DialogForm },
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
props: ['dataId'], // dataId 作为一个通用的存放id的字段
filters: { parseTime },
data() {

41
src/views/specialEquipment/check/add-or-updata.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible.sync="visible"
:show-close="false"
:wrapper-closable="true"
:wrapperClosable="true"
:close-on-click-modal="true"
@closed="$emit('destroy')"
class="drawer"
size="50%">
<small-title slot="title" :no-padding="true">
@ -37,12 +39,12 @@
</el-col> -->
<el-col :span="8">
<el-form-item label="巡检单名称" prop="name">
{{ dataForm.name }}
{{ dataForm.name || '---' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门" prop="department">
{{ dataForm.department }}
{{ dataForm.department || '---' }}
</el-form-item>
</el-col>
<el-col :span="8">
@ -94,7 +96,7 @@
@pagination="getList" />
<!-- <div class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button>
<el-button type="primary" @click="goback()">返回</el-button>
</div> -->
</div>
</div>
@ -111,7 +113,7 @@
<script>
import SmallTitle from './SmallTitle';
import attrAdd from './attr-add';
import { DICT_TYPE, getDictDatas } from '@/utils/dict';
// import { DICT_TYPE, getDictDatas } from '@/utils/dict';
import { parseTime } from '../../core/mixins/code-filter';
const tableBtn = [
@ -183,6 +185,33 @@ export default {
},
mounted() {},
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.visible = false;
}
} catch (err) {
return false;
}
},
initData() {
this.checkDetList.splice(0);
this.checkDetList.total = 0;
@ -245,7 +274,7 @@ export default {
});
},
goback() {
this.$emit('refreshDataList');
// this.$emit('refreshDataList');
this.visible = false;
// this.initData();
},

2
src/views/specialEquipment/check/attr-add.vue
View File

@ -51,7 +51,7 @@
<el-row style="text-align: right">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
</el-row>
</el-dialog>
</template>

62
src/views/specialEquipment/maintain/Monitor--detail.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -115,7 +117,7 @@
</div>
<div class="drawer-body__footer">
<el-button style="" @click="cancel">返回</el-button>
<!-- <el-button style="" @click="cancel">返回</el-button> -->
<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
编辑
</el-button>
@ -143,32 +145,7 @@
<script>
import DialogForm from '@/components/DialogForm';
const SmallTitle = {
name: 'SmallTitle',
props: ['size'],
components: {},
data() {
return {};
},
methods: {},
render: function (h) {
return h(
'span',
{
class: 'small-title',
style: {
fontSize: '18px',
lineHeight:
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
fontWeight: 500,
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
},
},
this.$slots.default
);
},
};
import SmallTitle from '../components/SmallTitle.js';
export default {
name: 'PlanConfig--addContent',
@ -263,6 +240,35 @@ export default {
this.loadEquipments();
},
methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
if (this.mode.includes('detail')) return this.cancel();
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.cancel();
}
} catch (err) {
return false;
}
},
show({
departmentName,
id,

2
src/views/specialEquipment/maintain/Monitor.vue
View File

@ -61,7 +61,7 @@
</template>
<script>
import { publicFormatter } from '@/utils/dict';
// import { publicFormatter } from '@/utils/dict';
// import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record';

2
src/views/specialEquipment/maintain/PlanConfig--addContent.vue
View File

@ -243,6 +243,8 @@ export default {
methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
if (this.mode.includes('detail')) return this.cancel();
if (document.querySelector('.small-title').innerText.includes('添加内容')) return this.cancel();
try {
if (
await this.$confirm(

2
src/views/specialEquipment/maintain/PlanConfig.vue
View File

@ -103,7 +103,7 @@ export default {
: undefined,
].filter((v) => v),
tableProps: [
{ prop: 'name', label: '计划名称' },
{ prop: 'name', label: '保养计划名称' },
{ prop: 'departmentName', label: '部门' },
{ width: 144, prop: 'lineName', label: '产线名' },
{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },

84
src/views/specialEquipment/maintain/Record--detail.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -84,7 +86,7 @@
</div>
<div class="drawer-body__footer">
<el-button style="" @click="cancel">返回</el-button>
<!-- <el-button style="" @click="cancel">返回</el-button> -->
<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
编辑
</el-button>
@ -112,36 +114,12 @@
<script>
import DialogForm from '@/components/DialogForm';
const SmallTitle = {
name: 'SmallTitle',
props: ['size'],
components: {},
data() {
return {};
},
methods: {},
render: function (h) {
return h(
'span',
{
class: 'small-title',
style: {
fontSize: '18px',
lineHeight:
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
fontWeight: 500,
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
},
},
this.$slots.default
);
},
};
import SmallTitle from '../components/SmallTitle.js';
import BaseDialogWrapper from '../components/BaseDialogWrapper';
export default {
name: 'PlanConfig--addContent',
components: { SmallTitle, DialogForm },
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
props: ['maintainData'],
data() {
return {
@ -229,6 +207,35 @@ export default {
this.loadEquipments();
},
methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
if (this.mode.includes('detail')) return this.cancel();
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.cancel();
}
} catch (err) {
return false;
}
},
show({ planMaintainWorker, id, maintainWorker }) {
this.form = Object.assign(
{},
@ -305,17 +312,14 @@ export default {
}
try {
const res = await this.$axios(
'/base/equipment-maintain-log-det/page',
{
params: {
pageNo: this.detailTableQuery.pageNo,
pageSize: this.detailTableQuery.pageSize,
// planId: this.form.id,
logId: this.form.id,
},
}
);
const res = await this.$axios('/base/equipment-maintain-log-det/page', {
params: {
pageNo: this.detailTableQuery.pageNo,
pageSize: this.detailTableQuery.pageSize,
// planId: this.form.id,
logId: this.form.id,
},
});
this.detailList = res.data?.list || [];
this.detailTotal = res.data?.total || 0;
this.detailLoading = false;

3
src/views/specialEquipment/maintain/Repair.vue
View File

@ -70,10 +70,11 @@ import {
import { parseTime } from '@/utils/ruoyi';
import htmls from './htmls.vue';
import DialogForm from './Repair--add.vue';
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
export default {
name: 'SpecialEquipmentRepair',
components: { DetailDrawer, DialogForm },
components: { DetailDrawer, DialogForm, BaseDialog: BaseDialogWrapperVue },
mixins: [basicPageMixin],
data() {
return {

54
src/views/specialEquipment/maintain/WaitingList.vue
View File

@ -97,42 +97,39 @@
</template>
<script>
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
import UnplannedAddDet from './WaitingListUnplanned--add_detail.vue';
import {
exportMaintainLogExcel,
} from '@/api/equipment/base/maintain/record';
import { exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
import WaitingListTable from './WaitingListTable.vue';
import RecordDetail from './Record--detail.vue';
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
const btn = {
name: 'tableBtn',
props: ['injectData'],
data() {
return {};
},
methods: {
handleClick() {
this.$emit('emitData', {
action: this.injectData.label,
value: this.injectData,
});
},
},
render: function (h) {
return (
<el-button type="text" onClick={this.handleClick}>
{this.injectData.name}
</el-button>
);
},
};
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
// const btn = {
// name: 'tableBtn',
// props: ['injectData'],
// data() {
// return {};
// },
// methods: {
// handleClick() {
// this.$emit('emitData', {
// action: this.injectData.label,
// value: this.injectData,
// });
// },
// },
// render: function (h) {
// return (
// <el-button type="text" onClick={this.handleClick}>
// {this.injectData.name}
// </el-button>
// );
// },
// };
export default {
name: 'SpecialEquipmentMaintainRecord',
@ -143,6 +140,7 @@ export default {
UnplannedEditDrawer,
UnplannedAddDet,
PlannedEditDrawer,
BaseDialog: BaseDialogWrapper,
},
mixins: [basicPageMixin],
data() {

31
src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -482,6 +484,33 @@ export default {
this.getList('line');
},
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.handleCancel();
}
} catch (err) {
return false;
}
},
handleSearchBarBtnClick(btn) {
switch (btn.btnName) {
case 'search':

32
src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -419,6 +421,34 @@ export default {
this.getList('line');
},
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>
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
确定关闭将不保留编辑内容
</p>
</div>,
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.handleCancel();
}
} catch (err) {
return false;
}
},
handleSearchBarBtnClick(btn) {
console.log('btn', btn);
switch (btn.btnName) {