From e2edf3fe20ab00e25248d738153bf3f464cec7b6 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 05 九月 2023 17:15:49 +0800
Subject: [PATCH] 小修改
---
src/views/eam/EquipmentSealList.vue | 540 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 303 insertions(+), 237 deletions(-)
diff --git a/src/views/eam/EquipmentSealList.vue b/src/views/eam/EquipmentSealList.vue
index 4ea51a2..25b01dd 100644
--- a/src/views/eam/EquipmentSealList.vue
+++ b/src/views/eam/EquipmentSealList.vue
@@ -1,17 +1,40 @@
<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">
+ <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">
@@ -23,10 +46,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'"/>
@@ -40,30 +80,14 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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"
@@ -77,24 +101,50 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
:customRow="clickThenSelect"
- @change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
+ @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>
+ <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)">
+ @click="downloadFile(text)"
+ >
涓嬭浇
</a-button>
</template>
@@ -103,32 +153,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>
@@ -173,199 +226,212 @@
</div>
<a-tabs defaultActiveKey="1">
- <a-tab-pane tab="璁惧灏佸瓨鏄庣粏" key="1" >
+ <a-tab-pane
+ tab="璁惧灏佸瓨鏄庣粏"
+ key="1"
+ >
<equipment-seal-detail-list :mainId="equipmentSealDetailMainId" />
</a-tab-pane>
</a-tabs>
- <equipmentSeal-modal ref="modalForm" @ok="modalFormOk"></equipmentSeal-modal>
- <approvel-modal ref="approvalModalForm" @ok='approvalModalFormOk' @cancel='approvalModalFormOk'></approvel-modal>
+ <equipmentSeal-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></equipmentSeal-modal>
+ <approvel-modal
+ ref="approvalModalForm"
+ @ok='approvalModalFormOk'
+ @cancel='approvalModalFormOk'
+ ></approvel-modal>
</a-card>
</template>
<script>
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import EquipmentSealModal from './modules/equipmentSeal/EquipmentSealModal'
- import { getAction,postAction } from '@/api/manage'
- import EquipmentSealDetailList from './modules/equipmentSeal/EquipmentSealDetailList'
- import {initDictOptions,filterMultiDictText} from '@/components/dict/JDictSelectUtil'
- import '@/assets/less/TableExpand.less'
- import ApprovelModal from './modules/equipmentSeal/ApprovelModal'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import EquipmentSealModal from './modules/equipmentSeal/EquipmentSealModal'
+import { getAction, postAction } from '@/api/manage'
+import EquipmentSealDetailList from './modules/equipmentSeal/EquipmentSealDetailList'
+import { initDictOptions, filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import '@/assets/less/TableExpand.less'
+import ApprovelModal from './modules/equipmentSeal/ApprovelModal'
- export default {
- name: "EquipmentSealList",
- mixins:[JeecgListMixin],
- components: {
- EquipmentSealDetailList,
- EquipmentSealModal,
- ApprovelModal
+export default {
+ name: "EquipmentSealList",
+ mixins: [JeecgListMixin],
+ components: {
+ EquipmentSealDetailList,
+ EquipmentSealModal,
+ ApprovelModal
+ },
+ data() {
+ return {
+ description: '璁惧灏佸瓨绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
+ }
+ },
+ {
+ title: '瀹℃壒鐘舵��',
+ align: "center",
+ dataIndex: 'auditStatus_dictText'
+ },
+ {
+ title: '鍗曟嵁鍙�',
+ align: "center",
+ sorter: true,
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true
+ },
+ {
+ title: '鍒涘缓浜�',
+ align: "center",
+ dataIndex: 'createBy'
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,10):text)
+ // }
+ },
+ {
+ title: '淇敼浜�',
+ align: "center",
+ dataIndex: 'updateBy'
+ },
+ {
+ title: '淇敼鏃堕棿',
+ align: "center",
+ dataIndex: 'updateTime',
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,10):text)
+ // }
+ },
+ {
+ title: '澶囨敞',
+ align: "center",
+ dataIndex: 'remark'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ fixed: "right",
+ width: 147,
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ url: {
+ list: "/eam/equipmentSeal/list",
+ approve: '/eam/equipmentSeal/approve',
+ delete: "/eam/equipmentSeal/delete",
+ deleteBatch: "/eam/equipmentSeal/deleteBatch",
+ exportXlsUrl: "/eam/equipmentSeal/exportXls",
+ importExcelUrl: "eam/equipmentSeal/importExcel",
+ submit: 'eam/equipmentSeal/submit',
+ revocation: 'eam/equipmentSeal/revocation'
+ },
+ dictOptions: {
+ auditStatus: [],
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ selectedMainId: '',
+ superFieldList: [],
+ equipmentSealDetailMainId: '',
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+ initDictConfig() {
},
- data () {
+ clickThenSelect(record) {
return {
- description: '璁惧灏佸瓨绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'瀹℃壒鐘舵��',
- align:"center",
- dataIndex: 'auditStatus_dictText'
- },
- {
- title:'鍗曟嵁鍙�',
- align:"center",
- sorter: true,
- dataIndex: 'num'
- },
- {
- title:'鍒涘缓浜�',
- align:"center",
- dataIndex: 'createBy'
- },
- {
- title:'鍒涘缓鏃堕棿',
- align:"center",
- dataIndex: 'createTime',
- // customRender:function (text) {
- // return !text?"":(text.length>10?text.substr(0,10):text)
- // }
- },
- {
- title:'淇敼浜�',
- align:"center",
- dataIndex: 'updateBy'
- },
- {
- title:'淇敼鏃堕棿',
- align:"center",
- dataIndex: 'updateTime',
- // customRender:function (text) {
- // return !text?"":(text.length>10?text.substr(0,10):text)
- // }
- },
- {
- title:'澶囨敞',
- align:"center",
- dataIndex: 'remark'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' },
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
}
- ],
- url: {
- list: "/eam/equipmentSeal/list",
- approve: '/eam/equipmentSeal/approve',
- delete: "/eam/equipmentSeal/delete",
- deleteBatch: "/eam/equipmentSeal/deleteBatch",
- exportXlsUrl: "/eam/equipmentSeal/exportXls",
- importExcelUrl: "eam/equipmentSeal/importExcel",
- submit:'eam/equipmentSeal/submit',
- revocation:'eam/equipmentSeal/revocation'
- },
- dictOptions:{
- auditStatus:[],
- },
- /* 鍒嗛〉鍙傛暟 */
- ipagination:{
- current: 1,
- pageSize: 5,
- pageSizeOptions: ['5', '10', '50'],
- showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },
- selectedMainId:'',
- superFieldList:[],
- equipmentSealDetailMainId: '',
+ }
}
},
- created() {
- this.getSuperFieldList();
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ this.selectedMainId = ''
},
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ onSelectChange(selectedRowKeys, selectionRows) {
+ this.selectedMainId = selectedRowKeys[0]
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ this.equipmentSealDetailMainId = selectionRows[0]['id']
+ },
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error("璇疯缃畊rl.list灞炴��!")
+ return
}
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ this.onClearSelected()
+ var params = this.getQueryParams();//鏌ヨ鏉′欢
+ this.loading = true;
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ if (res.code === 510) {
+ this.$message.warning(res.message)
+ }
+ this.loading = false;
+ })
+ this.equipmentSealDetailMainId = ''
},
- methods: {
- initDictConfig(){
- },
- clickThenSelect(record) {
- return {
- on: {
- click: () => {
- this.onSelectChange(record.id.split(","), [record]);
- }
- }
- }
- },
- onClearSelected() {
- this.selectedRowKeys = [];
- this.selectionRows = [];
- this.selectedMainId=''
- },
- onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId=selectedRowKeys[0]
- this.selectedRowKeys = selectedRowKeys;
- this.selectionRows = selectionRows;
- this.equipmentSealDetailMainId = selectionRows[0]['id']
- },
- loadData(arg) {
- if(!this.url.list){
- this.$message.error("璇疯缃畊rl.list灞炴��!")
- return
- }
- //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- if (arg === 1) {
- this.ipagination.current = 1;
- }
- this.onClearSelected()
- var params = this.getQueryParams();//鏌ヨ鏉′欢
- this.loading = true;
- getAction(this.url.list, params).then((res) => {
- if (res.success) {
- this.dataSource = res.result.records;
- this.ipagination.total = res.result.total;
- }
- if(res.code===510){
- this.$message.warning(res.message)
- }
- this.loading = false;
- })
- this.equipmentSealDetailMainId=''
- },
- 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
- },
- handleCommit(record, type) {
- let url
+ 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
+ },
+ handleCommit(record, type) {
+ 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 => {
@@ -382,10 +448,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
@@ -407,9 +473,9 @@
//this.equipmentSealDetailMainId=''
this.loadData(1)
},
- }
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3