From 11fc602abfc00455ae7302d3c185dcec18e7780e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 11:17:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/technical/EamTechnicalStatusChangeList.vue | 363 ++++++++++++++++++++++++++++++---------------------
1 files changed, 214 insertions(+), 149 deletions(-)
diff --git a/src/views/eam/technical/EamTechnicalStatusChangeList.vue b/src/views/eam/technical/EamTechnicalStatusChangeList.vue
index acc6201..cd4a84d 100644
--- a/src/views/eam/technical/EamTechnicalStatusChangeList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusChangeList.vue
@@ -1,49 +1,41 @@
<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-form-item>
- </a-col>
- <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-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="鍙樻洿鍗曠姸鎬�">
- <a-input placeholder="璇疯緭鍏ュ彉鏇村崟鐘舵��" v-model="queryParam.changeStatus"></a-input>
+ <j-dict-select-tag dict-code="technical_status_change_order_status" placeholder="璇烽�夋嫨鍙樻洿鍗曠姸鎬�"
+ v-model="queryParam.changeStatus"/>
</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.designer"></a-input>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="鐢宠鍗曚綅">
+ <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠鍗曚綅"
+ allow-clear tree-default-expand-all>
+ </a-tree-select>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="缂栧埗鏃堕棿">
- <a-input placeholder="璇疯緭鍏ョ紪鍒舵椂闂�" v-model="queryParam.designerTime"></a-input>
+ <a-range-picker v-model="queryParam.dates" value-format="YYYY-MM-DD" @change="handleDateRangeChange"/>
</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>
-
</a-row>
</a-form>
</div>
@@ -51,75 +43,68 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
+ :customRow="customRow">
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <template v-if="record.changeStatus=='WAIT_SUBMIT'">
+ <a @click.stop="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>
+ <a-divider type="vertical"/>
+
+ <a-popconfirm title="纭畾鎻愪氦鍚楋紵" @confirm="handleSubmit(record.id)">
+ <a @click="e=>e.stopPropagation()">鎻愪氦</a>
+ </a-popconfirm>
+
+ <a-divider type="vertical"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚楋紵" @confirm="handleAbolish(record.id)">
+ <a @click="e=>e.stopPropagation()">浣滃簾</a>
+ </a-popconfirm>
+ </template>
+
+ <a @click.stop="handleDetail(record)"
+ v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">璇︽儏</a>
</span>
-
- </a-table>
- </div>
+ </a-table>
<!-- table鍖哄煙-end -->
+ <a-tabs v-if="selectedRowKeys.length>0">
+ <a-tab-pane tab="璁惧鏄庣粏">
+ <eam-technical-status-change-equipment-detail :selectedRow="selectionRows[0]"/>
+ </a-tab-pane>
+ </a-tabs>
+
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamTechnicalStatusChange-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusChange-modal>
+ <eamTechnicalStatusChange-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>
+
+ <!--鐘舵�佸彉鏇村鎵瑰脊绐�-->
+ <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamTechnicalStatusChangeModal from './modules/EamTechnicalStatusChangeModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { getAction } from '@/api/manage'
+ import TechnicalStatusChangeApprovalModal
+ from '../../flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import EamTechnicalStatusChangeEquipmentDetail from './modules/EamTechnicalStatusChangeEquipmentDetail'
export default {
- name: "EamTechnicalStatusChangeList",
- mixins:[JeecgListMixin],
+ name: 'EamTechnicalStatusChangeList',
+ mixins: [JeecgListMixin],
components: {
+ EamTechnicalStatusChangeEquipmentDetail,
+ TechnicalStatusChangeApprovalModal,
EamTechnicalStatusChangeModal
},
- data () {
+ data() {
return {
description: '鎶�鏈姸鎬佸彉鏇寸敵璇风鐞嗛〉闈�',
// 琛ㄥご
@@ -127,99 +112,179 @@
{
title: '#',
dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
+ },
+ {
title: '鍙樻洿鍗曞彿',
- align:"center",
+ align: 'center',
dataIndex: 'changeOrderNum'
- },
- {
+ },
+ {
title: '鍙樻洿鍗曠姸鎬�',
- align:"center",
- dataIndex: 'changeStatus'
- },
- {
+ align: 'center',
+ dataIndex: 'changeStatus_dictText'
+ },
+ {
title: '缂栧埗浜�',
- align:"center",
- dataIndex: 'designer'
- },
- {
+ align: 'center',
+ dataIndex: 'designer_dictText'
+ },
+ {
title: '缂栧埗鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'designerTime'
- },
- {
- title: '浣跨敤鍗曚綅瀹や富绠＄瀛�',
- align:"center",
- dataIndex: 'departHeaderSignature'
- },
- {
- title: '浣跨敤鍗曚綅瀹や富绠＄瀛楁椂闂�',
- align:"center",
+ },
+ {
+ title: '浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧',
+ align: 'center',
+ dataIndex: 'departHeaderSignature_dictText'
+ },
+ {
+ title: '浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧鏃堕棿',
+ align: 'center',
dataIndex: 'departHeaderSignatureTime'
- },
- {
- title: '浣跨敤鍗曚綅瀹や富绠℃剰瑙�',
- align:"center",
- dataIndex: 'departHeaderSignatureComment'
- },
- {
- title: '浣跨敤鍗曚綅閮ㄤ富绠＄瀛�',
- align:"center",
- dataIndex: 'departLeaderSignature'
- },
- {
- title: '浣跨敤鍗曚綅閮ㄤ富绠＄瀛楁椂闂�',
- align:"center",
+ },
+ {
+ title: '浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧',
+ align: 'center',
+ dataIndex: 'departLeaderSignature_dictText'
+ },
+ {
+ title: '浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧鏃堕棿',
+ align: 'center',
dataIndex: 'departLeaderSignatureTime'
- },
- {
- title: '浣跨敤鍗曚綅閮ㄤ富绠＄瀛�',
- align:"center",
- dataIndex: 'departLeaderSignatureComment'
- },
- {
+ },
+ {
title: 'HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCode'
- },
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
- align:"center",
- scopedSlots: { customRender: 'action' },
+ align: 'center',
+ width: 200,
+ fixed: 'right',
+ scopedSlots: { customRender: 'action' }
}
],
- url: {
- list: "/eam/eamTechnicalStatusChange/list",
- delete: "/eam/eamTechnicalStatusChange/delete",
- deleteBatch: "/eam/eamTechnicalStatusChange/deleteBatch",
- exportXlsUrl: "eam/eamTechnicalStatusChange/exportXls",
- importExcelUrl: "eam/eamTechnicalStatusChange/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ productionTreeData: [],
+ selectedRowData: {},
+ url: {
+ list: '/eam/eamTechnicalStatusChange/list',
+ submit: '/eam/eamTechnicalStatusChange/submit',
+ abolish: '/eam/eamTechnicalStatusChange/abolish',
+ getProductionTreeList: '/eam/BaseFactory/queryTreeList'
+ }
+ }
+ },
+ created() {
+ this.getProductionTreeDataByApi()
+ },
methods: {
-
+ // 鑾峰彇鐢宠鍗曚綅鏍�
+ getProductionTreeDataByApi() {
+ getAction(this.url.getProductionTreeList)
+ .then(res => {
+ if (res.success) {
+ this.productionTreeData = res.result
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
+
+ /**
+ * 鎻愪氦鏃惰Е鍙�
+ * @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()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loading = false
+ }
+ })
+ },
+
+ /**
+ * 浣滃簾鏃惰Е鍙�
+ * @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.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusChangeApprovalModal.title = '璇︽儏'
+ this.$refs.technicalStatusChangeApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusChangeApprovalModal.visible = true
+ this.$refs.technicalStatusChangeApprovalModal.handleDetail(record)
+ },
+
+ customRow(record) {
+ return {
+ style: {
+ cursor: 'pointer'
+ },
+ on: {
+ click: event => {
+ this.onSelectChange([record.id], [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