From 92ff846fb659c62037a32b1d8c15eae9df9d9b54 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期一, 18 九月 2023 13:24:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430
---
src/views/eam/EquipmentScrapList.vue | 436 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 436 insertions(+), 0 deletions(-)
diff --git a/src/views/eam/EquipmentScrapList.vue b/src/views/eam/EquipmentScrapList.vue
new file mode 100644
index 0000000..0ebb7af
--- /dev/null
+++ b/src/views/eam/EquipmentScrapList.vue
@@ -0,0 +1,436 @@
+<template>
+ <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">
+ <a-form-item label="鍗曟嵁鍙�">
+ <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-form-item label="瀹℃壒鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨瀹℃壒鐘舵��" v-model="queryParam.auditStatus" dictCode="audit_status" />
+ </a-form-item>
+ </a-col>
+ <!-- <template v-if="toggleSearchStatus">
+
+ <a-col :xl="10" :lg="11" :md="12" :sm="24">
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <j-date placeholder="璇烽�夋嫨寮�濮嬫棩鏈�" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+ <span class="query-group-split-cust"></span>
+ <j-date placeholder="璇烽�夋嫨缁撴潫鏃ユ湡" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+ </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 @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+ </a> -->
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <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>-->
+ </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"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+ :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>
+ <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="uploadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+ <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="remark" slot-scope="text">
+ <j-ellipsis :value="text" :length="15" />
+ </span>
+
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <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'||record.auditStatus =='Rejected'"
+ type="vertical"
+ />
+ <a
+ 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'||record.auditStatus =='Rejected'"
+ type="vertical"
+ />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </a-menu-item>
+ <a-menu-item v-if="record.auditStatus == 'notSubmitted'">
+ <a-popconfirm
+ v-if="record.auditStatus == 'notSubmitted'"
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ <!-- <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+
+
+
+ </span> -->
+
+ </a-table>
+ <!-- </div>-->
+
+ <a-tabs defaultActiveKey="1">
+ <a-tab-pane tab="璁惧鎶ュ簾鏄庣粏" key="1">
+ <equipment-scrap-detail-list :mainId="equipmentScrapDetailMainId" />
+ </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>
+ </a-card>
+</template>
+
+<script>
+
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+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'
+
+export default {
+ name: 'EquipmentScrapList',
+ mixins: [JeecgListMixin],
+ components: {
+ EquipmentScrapModal,
+ EquipmentScrapDetailList,
+ JEllipsis,
+ 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',
+ sorter: true,
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true
+
+ },
+ {
+ title: '瀹℃壒鐘舵��',
+ align: 'center',
+ dataIndex: 'auditStatus_dictText'
+ },
+ // {
+ // title:'鍙樺姩鏂瑰紡',
+ // align:"center",
+ // dataIndex: 'changeMethod'
+ // },
+
+ {
+ title: '鍒涘缓浜�',
+ align: 'center',
+ dataIndex: 'createBy'
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ dataIndex: 'createTime'
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,19):text)
+ // }
+ },
+ {
+ title: '淇敼浜�',
+ align: 'center',
+ dataIndex: 'updateBy'
+ },
+ {
+ title: '淇敼鏃堕棿',
+ align: 'center',
+ dataIndex: 'updateTime'
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,19):text)
+ // }
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark',
+ scopedSlots: { customRender: 'remark' }
+
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: '/eam/equipmentScrap/list',
+ approve: '/eam/equipmentScrap/approve',
+ delete: '/eam/equipmentScrap/delete',
+ deleteBatch: '/eam/equipmentScrap/deleteBatch',
+ exportXlsUrl: '/eam/equipmentScrap/exportXls',
+ importExcelUrl: 'eam/equipmentScrap/importExcel',
+ submit: '/eam/equipmentScrap/submit',
+ revocation: '/eam/equipmentScrap/revocation',
+ submitBatch: '/eam/equipmentScrap/submitBatch',
+ revocationBatch: '/eam/equipmentScrap/revocationBatch'
+
+ },
+ 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: [],
+ equipmentScrapDetailMainId: ''
+ }
+ },
+ created() {
+ this.getSuperFieldList()
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ 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.equipmentScrapDetailMainId = 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.equipmentScrapDetailMainId = ''
+ },
+ 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 => {
+ if (res.success) {
+ if (type === 'commit') {
+ this.$message.success('鎻愪氦鎴愬姛锛�')
+ } else {
+ this.$message.success('鎾ゅ洖鎴愬姛锛�')
+ }
+
+ this.loadData(1)
+ } else {
+ 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.title = '瀹℃壒'
+ this.$refs.approvalModalForm.disableSubmit = false
+
+ },
+ approvalModalFormOk() {
+ // 閫氳繃/椹冲洖鏃讹紝閲嶈浇鍒楄〃
+ this.loadData()
+ //娓呯┖鍒楄〃閫変腑
+ this.onClearSelected()
+ },
+ getSuperFieldList() {
+ let fieldList = []
+ fieldList.push({ type: 'string', value: 'num', text: '鍗曟嵁鍙�', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'auditStatus', text: '瀹℃壒鐘舵��', dictCode: 'audit_status' })
+ // fieldList.push({type:'string',value:'changeMethod',text:'鍙樺姩鏂瑰紡',dictCode:''})
+ fieldList.push({ type: 'string', value: 'remark', text: '澶囨敞', dictCode: '' })
+ this.superFieldList = fieldList
+ }
+
+ }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
--
Gitblit v1.9.3