From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/views/eam/EquipmentScrapList.vue | 81 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/EquipmentScrapList.vue b/src/views/eam/EquipmentScrapList.vue
index 79611d4..0ebb7af 100644
--- a/src/views/eam/EquipmentScrapList.vue
+++ b/src/views/eam/EquipmentScrapList.vue
@@ -1,16 +1,16 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" title="璁惧鎶ュ簾">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!-- v-show="false" hidden="true"-->
-<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24" v-show="true">-->
-<!-- <!– defaultValue="disposal"–>-->
-<!-- <a-form-item label="鍙樺姩鏂瑰紡">-->
-<!-- <a-input placeholder="璇疯緭鍏ュ彉鍔ㄦ柟寮�" v-model="queryParam.changeMethod" defaultValue="scrap"></a-input>-->
-<!-- </a-form-item>-->
-<!-- </a-col>-->
+ <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24" v-show="true">-->
+ <!-- <!– defaultValue="disposal"–>-->
+ <!-- <a-form-item label="鍙樺姩鏂瑰紡">-->
+ <!-- <a-input placeholder="璇疯緭鍏ュ彉鍔ㄦ柟寮�" v-model="queryParam.changeMethod" defaultValue="scrap"></a-input>-->
+ <!-- </a-form-item>-->
+ <!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="鍗曟嵁鍙�">
@@ -90,12 +90,16 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+ <span slot="num" slot-scope="text">
+ <j-ellipsis :value="text" :length="15" />
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;" />
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
+ style="max-width:80px;font-size: 12px;font-style: italic;" />
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
@@ -109,28 +113,20 @@
涓嬭浇
</a-button>
</template>
- <!-- <template>-->
- <!-- <a-tooltip placement="topLeft">-->
- <!-- <template slot="title">-->
- <!-- <span>{{value}}</span>-->
- <!-- </template>-->
- <!-- {{ value | ellipsis(length) }}-->
- <!-- </a-tooltip>-->
- <!-- </template>-->
<!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span slot="remark" slot-scope="text">
<j-ellipsis :value="text" :length="15" />
</span>
- <span
- slot="action"
- slot-scope="text, record"
- >
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<a-popconfirm
- v-if="record.auditStatus == 'notSubmitted'"
- title="纭鎻愪氦鍚�?"
- @confirm="() =>handleCommit(record,'commit')"
- >
+ v-if="record.auditStatus == 'notSubmitted'||record.auditStatus =='Rejected'"
+ title="纭鎻愪氦鍚�?"
+ @confirm="() =>handleCommit(record,'commit')"
+ >
<a>鎻愪氦</a>
</a-popconfirm>
<a-popconfirm
@@ -142,16 +138,16 @@
</a-popconfirm>
<a-divider
- v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
type="vertical"
/>
<a
- v-if="record.auditStatus == 'notSubmitted' "
+ v-if="record.auditStatus == 'notSubmitted' ||record.auditStatus =='Rejected'"
@click="handleEdit(record)"
>缂栬緫</a>
<a v-if="record.auditStatus == 'pendingApproval'" @click="handleApprove(record)">瀹℃壒</a>
<a-divider
- v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'"
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'pendingApproval'||record.auditStatus =='Rejected'"
type="vertical"
/>
<a-dropdown>
@@ -201,19 +197,18 @@
</a-tab-pane>
</a-tabs>
<equipment-scrap-modal ref="modalForm" @ok="modalFormOk"></equipment-scrap-modal>
- <approvel-modal ref="approvalModalForm" @ok='approvalModalFormOk' @cancel='approvalModalFormOk'></approvel-modal>
+ <approvel-modal ref="approvalModalForm" @ok="approvalModalFormOk" @cancel="approvalModalFormOk"></approvel-modal>
</a-card>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import EquipmentScrapModal from './modules/equipmentScrap/EquipmentScrapModal.vue'
-import EquipmentScrapDetailList from './modules/equipmentScrap/EquipmentScrapDetailList.vue'
-import { getAction,postAction } from '@/api/manage'
-import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentScrapModal from './modules/equipmentScrap/EquipmentScrapModal.vue'
+import EquipmentScrapDetailList from './modules/equipmentScrap/EquipmentScrapDetailList'
+import { getAction, postAction } from '@/api/manage'
+import JEllipsis from '@/components/jeecg/JEllipsis'
import '@/assets/less/TableExpand.less'
import ApprovelModal from './modules/equipmentSeal/ApprovelModal'
@@ -245,7 +240,11 @@
title: '鍗曟嵁鍙�',
align: 'center',
sorter: true,
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true
+
},
{
title: '瀹℃壒鐘舵��',
@@ -386,30 +385,30 @@
}
this.loading = false
})
- this.equipmentScrapDetailMainId = ""
+ this.equipmentScrapDetailMainId = ''
},
handleCommit(record, type) {
- let url
+ let url
type == 'commit' ? record.auditStatus = 'pendingApproval' : record.auditStatus = 'notSubmitted'
type == 'commit' ? url = this.url.submit : url = this.url.revocation
postAction(url, record).then(res => {
if (res.success) {
if (type === 'commit') {
- this.$message.success("鎻愪氦鎴愬姛锛�");
+ this.$message.success('鎻愪氦鎴愬姛锛�')
} else {
- this.$message.success("鎾ゅ洖鎴愬姛锛�");
+ this.$message.success('鎾ゅ洖鎴愬姛锛�')
}
- this.loadData(1);
+ this.loadData(1)
} else {
- this.$message.warning(res.message);
+ this.$message.warning(res.message)
}
})
},
handleApprove: function(record) {
let approve
approve = this.url.approve
- this.$refs.approvalModalForm.showModals(record, approve,'Approved','Rejected')
+ this.$refs.approvalModalForm.showModals(record, approve, 'Approved', 'Rejected')
this.$refs.approvalModalForm.title = '瀹℃壒'
this.$refs.approvalModalForm.disableSubmit = false
--
Gitblit v1.9.3