From 2de735967d33dba5da5fc87191dee543b000afaf Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 18 七月 2025 20:20:18 +0800
Subject: [PATCH] 删除
---
src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue | 389 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 212 insertions(+), 177 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
index a997c26..5ac868f 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
@@ -1,46 +1,35 @@
<template>
<a-card :bordered="false">
-
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
-
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍒犻櫎鏍囪">
- <a-input placeholder="璇疯緭鍏ュ垹闄ゆ爣璁�" v-model="queryParam.delFlag"></a-input>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="缁熶竴缂栫爜">
+ <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="宸ュ崟ID">
- <a-input placeholder="璇疯緭鍏ュ伐鍗旾D" v-model="queryParam.orderId"></a-input>
- </a-form-item>
- </a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="6" :md="8" :sm="12">
<a-form-item label="鍙樻洿鍗曞彿">
- <a-input placeholder="璇疯緭鍏ュ彉鏇村崟鍙�" v-model="queryParam.changeOrderNum"></a-input>
+ <a-input placeholder="璇疯緭鍏ュ彉鏇村崟鍙�" v-model="queryParam.changeOrderNum"/>
</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.applicant"></a-input>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="鐢宠鏃堕棿">
+ <a-range-picker v-model="queryParam.dates" @change="handleDateRangeChange" value-format="YYYY-MM-DD"/>
</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.factoryOrgCode"></a-input>
+ <a-col :xl="4" :lg="6" :md="8" :sm="12">
+ <a-form-item label="鍙樻洿鐘舵��">
+ <j-dict-select-tag dict-code=" technical_status_evaluation_order_change_status" placeholder="璇烽�夋嫨鍙樻洿鐘舵��"
+ v-model="queryParam.changeStatus"/>
</a-form-item>
</a-col>
- </template>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+
+ <a-col :xl="4" :lg="6" :md="8" :sm="12">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="info" @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>
@@ -48,78 +37,58 @@
</a-form>
</div>
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</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>
- <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"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
-
+ <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+ :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">
<span slot="action" slot-scope="text, record">
+ <tamplate v-if="record.changeStatus=='WAIT_SUBMIT'">
<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-divider type="vertical"/>
- </a-table>
- </div>
+ <a-popconfirm title="纭畾鎻愪氦鍚楋紵" @confirm="handleSubmit(record.id)">
+ <a>鎻愪氦</a>
+ </a-popconfirm>
+
+ <a-divider type="vertical"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚楋紵" @confirm="handleAbolish(record.id)">
+ <a>浣滃簾</a>
+ </a-popconfirm>
+ </tamplate>
+
+ <a @click="handleDetail(record)"
+ v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">璇︽儏</a>
+ </span>
+ </a-table>
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamTechnicalStatusEvaluationOrderChange-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusEvaluationOrderChange-modal>
+ <eamTechnicalStatusEvaluationOrderChange-modal ref="modalForm" @ok="modalFormOk"/>
+
+ <!--鍙樻洿娴佺▼寮圭獥-->
+ <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamTechnicalStatusEvaluationOrderChangeModal from './modules/EamTechnicalStatusEvaluationOrderChangeModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import { getAction } from '@/api/manage'
+ import TechnicalStatusEvaluationOrderChangeApprovalModal
+ from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
export default {
- name: "EamTechnicalStatusEvaluationOrderChangeList",
- mixins:[JeecgListMixin],
+ name: 'EamTechnicalStatusEvaluationOrderChangeList',
+ mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationOrderChangeApprovalModal,
+ LxSearchEquipmentSelect,
EamTechnicalStatusEvaluationOrderChangeModal
},
- data () {
+ data() {
return {
description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸鐞嗛〉闈�',
// 琛ㄥご
@@ -127,129 +96,195 @@
{
title: '#',
dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
- title: '宸ュ崟ID',
- align:"center",
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '宸ュ崟鍙�',
+ align: 'center',
dataIndex: 'orderId'
- },
- {
+ },
+ {
title: '鍙樻洿鍗曞彿',
- align:"center",
+ align: 'center',
dataIndex: 'changeOrderNum'
- },
- {
+ },
+ {
title: '鐢宠浜�',
- align:"center",
- dataIndex: 'applicant'
- },
- {
+ align: 'center',
+ dataIndex: 'applicant_dictText'
+ },
+ {
title: '鐢宠閮ㄩ棬',
- align:"center",
- dataIndex: 'factoryOrgCode'
- },
- {
+ align: 'center',
+ dataIndex: 'factoryOrgCode_dictText'
+ },
+ {
title: '鐢宠鏃ユ湡',
- align:"center",
+ align: 'center',
dataIndex: 'applyDate'
- },
- {
- title: '鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚',
- align:"center",
- dataIndex: 'changeStatus'
- },
- {
- title: '鍙樻洿鍘熷洜;鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈恒�佽澶囨晠闅滄澶勪簬缁翠慨鐘舵�併�佽澶囧凡鎶ュ簾銆佽澶囧ぇ淇�佹惉杩併�佹敼閫�',
- align:"center",
- dataIndex: 'applyReason'
- },
- {
+ },
+ {
+ title: '鍙樻洿鐘舵��',
+ align: 'center',
+ dataIndex: 'changeStatus_dictText'
+ },
+ {
+ title: '鍙樻洿鍘熷洜',
+ align: 'center',
+ dataIndex: 'applyReason_dictText'
+ },
+ {
title: '鍙樻洿閴村畾鏃ユ湡',
- align:"center",
- dataIndex: 'deferredMaintenanceDate'
- },
- {
+ align: 'center',
+ dataIndex: 'deferredEvaluationDate'
+ },
+ {
title: '涓荤棰嗗绛惧瓧',
- align:"center",
- dataIndex: 'equipmentManagerSignature'
- },
- {
+ align: 'center',
+ dataIndex: 'equipmentManagerSignature_dictText'
+ },
+ {
title: '涓荤棰嗗绛惧瓧鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'equipmentManagerSignatureTime'
- },
- {
- title: '閮ㄩ棬棰嗗绛惧瓧;鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒',
- align:"center",
- dataIndex: 'departManagerSignature'
- },
- {
+ },
+ {
+ title: '閮ㄩ棬棰嗗绛惧瓧',
+ align: 'center',
+ dataIndex: 'departManagerSignature_dictText'
+ },
+ {
title: '閮ㄩ棬棰嗗绛惧瓧鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'departManagerSignatureTime'
- },
- {
- title: '閮ㄩ棬棰嗗鎰忚',
- align:"center",
- dataIndex: 'departManagerComment'
- },
- {
+ },
+ {
title: '鐢熶骇淇濋殰閮ㄩ瀵肩瀛�',
- align:"center",
- dataIndex: 'productionSupportSignature'
- },
- {
+ align: 'center',
+ dataIndex: 'productionSupportSignature_dictText'
+ },
+ {
title: '鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'productionSupportSignatureTime'
- },
- {
- title: '鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�',
- align:"center",
- dataIndex: 'productionSupportComment'
- },
- {
+ },
+ {
title: 'HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCode'
- },
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
- align:"center",
+ align: 'center',
scopedSlots: { customRender: 'action' },
+ fixed: 'right',
+ width: 200
}
],
- url: {
- list: "/eam/eamTechnicalStatusEvaluationOrderChange/list",
- delete: "/eam/eamTechnicalStatusEvaluationOrderChange/delete",
- deleteBatch: "/eam/eamTechnicalStatusEvaluationOrderChange/deleteBatch",
- exportXlsUrl: "eam/eamTechnicalStatusEvaluationOrderChange/exportXls",
- importExcelUrl: "eam/eamTechnicalStatusEvaluationOrderChange/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ selectedRowData: {},
+ url: {
+ list: '/eam/eamTechnicalStatusEvaluationOrderChange/list',
+ edit: '/eam/eamTechnicalStatusEvaluationOrderChange/edit',
+ submit: '/eam/eamTechnicalStatusEvaluationOrderChange/submit',
+ abolish: '/eam/eamTechnicalStatusEvaluationOrderChange/abolish'
+ }
+ }
+ },
methods: {
-
+ /**
+ * 鎻愪氦鏃惰Е鍙�
+ * @param id
+ */
+ handleSubmit(id) {
+ const that = this
+ that.loading = true
+ getAction(this.url.submit, { id })
+ .then(res => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ that.loading = false
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
+
+ /**
+ * 浣滃簾鏃惰Е鍙�
+ * @param id
+ */
+ handleAbolish(id) {
+ const that = this
+ that.loading = true
+ getAction(this.url.abolish, { id })
+ .then(res => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loading = false
+ }
+ })
+ },
+
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
+ handleDetail(record) {
+ this.$refs.evaluationOrderChangeApprovalModal.title = '璇︽儏'
+ this.$refs.evaluationOrderChangeApprovalModal.disableSubmit = true
+ this.$refs.evaluationOrderChangeApprovalModal.visible = true
+ this.$refs.evaluationOrderChangeApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐢宠鏃堕棿鍙戠敓鏀瑰彉鏃惰Е鍙�
+ * @param dateStringArray
+ */
+ handleDateRangeChange(dateStringArray) {
+ this.queryParam.dateBegin = dateStringArray[0]
+ this.queryParam.dateEnd = dateStringArray[1]
+ }
}
}
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3