From adae7524c986a758dd61bc5d0c23f6b922e299c7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 一月 2024 17:06:35 +0800
Subject: [PATCH] 加班管理添加字段
---
src/views/eam/EquipmentUnsealList.vue | 251 +++++++++++++++++++++++++++++++-------------------
1 files changed, 156 insertions(+), 95 deletions(-)
diff --git a/src/views/eam/EquipmentUnsealList.vue b/src/views/eam/EquipmentUnsealList.vue
index 7a85a28..1259867 100644
--- a/src/views/eam/EquipmentUnsealList.vue
+++ b/src/views/eam/EquipmentUnsealList.vue
@@ -1,8 +1,14 @@
<template>
- <a-card :bordered="false">
+ <a-card
+ title='璁惧鍚皝'
+ :bordered="false"
+ >
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="false">
<a-form-item label="鍙樺姩鏂瑰紡(灏佸瓨-seal锛屽惎灏�-unseal,鎶ュ簾-scrap锛屽缃�-disposal)">
@@ -10,14 +16,31 @@
:defaultValue="changeMethod"></a-input>
</a-form-item>
</a-col> -->
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item label="鍗曟嵁鍙�">
- <a-input placeholder="璇疯緭鍏ュ崟鎹彿" v-model="queryParam.num"></a-input>
+ <a-input
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ v-model="queryParam.num"
+ ></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item label="瀹℃壒鐘舵��">
- <j-dict-select-tag placeholder="璇烽�夋嫨瀹℃壒鐘舵��" v-model="queryParam.auditStatus" dictCode="audit_status" />
+ <j-dict-select-tag
+ placeholder="璇烽�夋嫨瀹℃壒鐘舵��"
+ v-model="queryParam.auditStatus"
+ dictCode="audit_status"
+ />
</a-form-item>
</a-col>
<!-- <template v-if="toggleSearchStatus">
@@ -30,10 +53,27 @@
</a-form-item>
</a-col>
</template> -->
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
@@ -47,52 +87,71 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <!-- <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='notSubmitted'" @click="handleSubmit" type="primary" icon="check">鎻愪氦</a-button>
- <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus === 'pendingApproval'" @click="handleRevocation" type="primary" icon="rollback">鎾ゅ洖</a-button> -->
-
- <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙樺姩')">瀵煎嚭</a-button>-->
- <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
- <!-- <a-button type="primary" icon="import">瀵煎叆</a-button>-->
- <!-- </a-upload>-->
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
- <!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
- <!-- <a-menu slot="overlay">-->
- <!-- <a-menu-item key="1" @click="batchDel">-->
- <!-- <a-icon type="delete" />-->
- <!-- 鍒犻櫎-->
- <!-- </a-menu-item>-->
- <!-- </a-menu>-->
- <!-- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔-->
- <!-- <a-icon type="down" />-->
- <!-- </a-button>
- </a-dropdown>-->
+ <a-button
+ @click="handleAdd"
+ type="primary"
+ icon="plus"
+ >鏂板</a-button>
</div>
- <!-- table鍖哄煙-begin -->
<div>
- <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
- <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�-->
- <!-- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>-->
- <!-- </div>-->
-
- <a-table ref="table" size="middle" bordered rowKey="id" class="j-table-force-nowrap" :scroll="{ x: true }"
- :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ class="j-table-force-nowrap"
+ :scroll="{ x: true }"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio' }"
- :customRow="clickThenSelect" @change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
+ :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;" />
+ <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;"
+ />
</template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
+ <template
+ slot="fileSlot"
+ slot-scope="text"
+ >
+ <span
+ v-if="!text"
+ style="font-size: 12px;font-style: italic;"
+ >鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)"
+ >
涓嬭浇
</a-button>
</template>
@@ -101,32 +160,35 @@
slot="action"
slot-scope="text, record"
>
- <a-popconfirm
- v-if="record.auditStatus == 'notSubmitted'"
- title="纭鎻愪氦鍚�?"
- @confirm="() =>handleCommit(record,'commit')"
- >
- <a>鎻愪氦</a>
- </a-popconfirm>
- <a-popconfirm
- v-if="record.auditStatus == 'pendingApproval'"
- title="纭鎾ゅ洖鍚�?"
- @confirm="() =>handleCommit(record,'back')"
- >
- <a>鎾ゅ洖</a>
- </a-popconfirm>
+ <a-popconfirm
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'Rejected'"
+ title="纭鎻愪氦鍚�?"
+ @confirm="() =>handleCommit(record,'commit')"
+ >
+ <a>鎻愪氦</a>
+ </a-popconfirm>
+ <a-popconfirm
+ v-if="record.auditStatus == 'pendingApproval'"
+ title="纭鎾ゅ洖鍚�?"
+ @confirm="() =>handleCommit(record,'back')"
+ >
+ <a>鎾ゅ洖</a>
+ </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
+ 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>
@@ -171,13 +233,23 @@
</div>
<a-tabs defaultActiveKey="1">
- <a-tab-pane tab="璁惧鍚皝鏄庣粏" key="1">
+ <a-tab-pane
+ tab="璁惧鍚皝鏄庣粏"
+ key="1"
+ >
<EquipmentUnsealDetailList :mainId="equipmentUnsealDetailMainId" />
</a-tab-pane>
</a-tabs>
- <equipmentUnseal-modal ref="modalForm" @ok="modalFormOk"></equipmentUnseal-modal>
- <approvel-modal ref="approvalModalForm" @ok='approvalModalFormOk' @cancel='approvalModalFormOk'></approvel-modal>
+ <equipmentUnseal-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></equipmentUnseal-modal>
+ <approvel-modal
+ ref="approvalModalForm"
+ @ok='approvalModalFormOk'
+ @cancel='approvalModalFormOk'
+ ></approvel-modal>
</a-card>
</template>
@@ -185,10 +257,9 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EquipmentUnsealModal from './modules/equipmentUnseal/EquipmentUnsealModal'
-import { getAction,deleteAction,postAction } from '@/api/manage'
+import { getAction, deleteAction, postAction } from '@/api/manage'
import EquipmentUnsealDetailList from './modules/equipmentUnseal/EquipmentUnsealDetailList'
import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-
import '@/assets/less/TableExpand.less'
import ApprovelModal from './modules/equipmentSeal/ApprovelModal'
@@ -224,7 +295,10 @@
title: '鍗曟嵁鍙�',
align: 'center',
sorter: true,
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true
},
{
title: '鍒涘缓浜�',
@@ -273,8 +347,8 @@
deleteBatch: '/eam/equipmentUnseal/deleteBatch',
exportXlsUrl: '/eam/equipmentUnseal/exportXls',
importExcelUrl: 'eam/equipmentUnseal/importExcel',
- submit:'eam/equipmentUnseal/submit',
- revocation:'eam/equipmentUnseal/revocation'
+ submit: 'eam/equipmentUnseal/submit',
+ revocation: 'eam/equipmentUnseal/revocation'
},
dictOptions: {
auditStatus: []
@@ -292,14 +366,13 @@
total: 0
},
selectedMainId: '',
- superFieldList: [],
equipmentUnsealDetailMainId: '',
// 榛樿鍙樺姩鏂瑰紡 灏佸瓨-seal锛屽惎灏�-unseal,鎶ュ簾-scrap锛屽缃�-disposal
changeMethod: 'unseal'
}
},
created() {
- this.getSuperFieldList()
+
},
computed: {
importExcelUrl: function () {
@@ -354,7 +427,7 @@
this.equipmentUnsealDetailMainId = ""
},
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 => {
@@ -371,10 +444,10 @@
}
})
},
- handleApprove: function(record) {
+ 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
@@ -385,19 +458,7 @@
//娓呯┖鍒楄〃閫変腑
this.onClearSelected()
},
- getSuperFieldList() {
- let fieldList = []
- fieldList.push({ type: 'string', value: 'num', text: '鍗曟嵁鍙�', dictCode: '' })
- fieldList.push({ type: 'string', value: 'auditStatus', text: '瀹℃壒鐘舵��(鏈彁浜�-notSubmitted銆佸緟瀹℃壒 pendingApproval銆佸鎵逛腑-approvalProcess銆佸凡椹冲洖-Rejected銆佸凡閫氳繃-Approved)', dictCode: 'audit_status' })
- fieldList.push({ type: 'string', value: 'changeMethod', text: '鍙樺姩鏂瑰紡(灏佸瓨-seal锛屽惎灏�-unseal,鎶ュ簾-scrap锛屽缃�-disposal)', dictCode: '' })
- fieldList.push({ type: 'string', value: 'remark', text: '澶囨敞', dictCode: '' })
- fieldList.push({ type: 'string', value: 'createBy', text: '鍒涘缓浜�', dictCode: 'sys_user,realname,username' })
- fieldList.push({ type: 'date', value: 'createTime', text: '鍒涘缓鏃堕棿' })
- fieldList.push({ type: 'string', value: 'updateBy', text: '淇敼浜�', dictCode: 'sys_user,realname,username' })
- fieldList.push({ type: 'date', value: 'updateTime', text: '淇敼鏃堕棿' })
- this.superFieldList = fieldList
- this.queryParam.changeMethod = this.changeMethod
- },
+
searchReset() {
this.queryParam = {
changeMethod: this.changeMethod
@@ -414,7 +475,7 @@
// 閫変腑鍒楄〃鏂板椤�
this.selectedRowKeys = [this.dataSource[0].id]
this.selectionRows = [this.dataSource[0]]
- this.selectedMainId = this.dataSource[0].id
+ this.selectedMainId = this.dataSource[0].id
this.equipmentUnsealDetailMainId = this.dataSource[0].id
},
handleDelete(id) {
@@ -427,7 +488,7 @@
}
deleteAction(this.url.delete, { id: id }).then(res => {
if (res.success) {
- //閲嶆柊璁＄畻鍒嗛〉闂
+ //閲嶆柊璁＄畻鍒嗛〉闂
this.reCalculatePage(1)
this.$message.success(res.message)
this.loadData()
--
Gitblit v1.9.3