From 9603fd5d0d0aba2f4c83a0bcfcd4aea39ca644a3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 12 七月 2025 14:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 159 +++++++++++++++++++++--------------------------------
1 files changed, 63 insertions(+), 96 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index fc1b94d..be8ef7d 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -1,26 +1,17 @@
<template>
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div
- class="table-page-search-wrapper"
- v-if="isDisplayOperation"
- >
- <a-form
- layout="inline"
- @keyup.enter.native="searchQuery"
- >
+ <div class="table-page-search-wrapper" v-if="isDisplayOperation">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :xl="4" :lg="7" :md="8" :sm="24">
- <a-form-item label="宸ュ崟鍙�">
- <a-input
- placeholder="璇疯緭鍏ュ伐鍗曞彿"
- v-model="queryParam.orderNum"
- ></a-input>
- </a-form-item>
- </a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="缁熶竴缂栫爜">
<lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�">
+ <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -98,7 +89,7 @@
</a-menu-item>
<a-menu-item>
- <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleOrReceive(record.id)">
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
</a-menu-item>
@@ -118,22 +109,19 @@
</template>
<script>
-
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
import { deleteAction, getAction } from '@api/manage'
import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
- import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
export default {
name: 'EamInspectionOrderList',
- mixins: [JeecgListMixin, mixinDevice],
+ mixins: [JeecgListMixin],
components: {
+ LxSearchEquipmentSelect,
InspectionOrderHandle,
- EamInspectionOrderModal,
- LxSearchEquipmentSelect
+ EamInspectionOrderModal
},
props: {
isDisplayOperation: {
@@ -143,7 +131,7 @@
},
data() {
return {
- description: 'eam_inspection_order绠＄悊椤甸潰',
+ description: '鐐规宸ュ崟椤甸潰',
disableMixinCreated: true,
// 琛ㄥご
columns: [
@@ -219,7 +207,7 @@
dataIndex: 'operateTime'
},
{
- title: '绠＄悊鍛樼‘璁�',
+ title: '缁翠慨宸�',
align: 'center',
dataIndex: 'confirmUser_dictText'
},
@@ -269,8 +257,6 @@
}
},
methods: {
- initDictConfig() {
- },
//璇︽儏
handleDetail: function(record) {
this.selectInspectionOrderXqData = Object.assign({}, record)
@@ -280,6 +266,7 @@
this.$refs.modalFormXq.getAllApproveData(record)
this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
},
+
handleInspection(id) {
var that = this
this.loading = true
@@ -292,7 +279,6 @@
})
that.loadData()
} else {
- // that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -301,11 +287,8 @@
}
})
},
- handleOrReceive(id) {
- if (!this.url.cancelInspectionOrder) {
- this.$message.error('璇疯缃畊rl.cancelInspectionOrder!')
- return
- }
+
+ handleAbolish(id) {
var that = this
getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
if (res.success) {
@@ -315,7 +298,6 @@
})
that.loadData()
} else {
- // that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -324,62 +306,50 @@
})
},
batchZf(type) {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- } else {
- var ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- var that = this
- this.$confirm({
- title: '纭浣滃簾',
- content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?',
- onOk: function() {
- that.loading = true
- getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => {
- if (res.success) {
- that.$notification.success({
- message: '娑堟伅',
- description: res.message
- })
- that.loadData()
- that.onClearSelected()
- } else {
- // that.$message.warning(res.message);
- that.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- that.loading = false
- })
- }
- })
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
}
+ var that = this
+ this.$confirm({
+ title: '纭浣滃簾',
+ content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?',
+ onOk: function() {
+ that.loading = true
+ getAction(that.url.cancelOrReceive, { ids, type }).then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ that.onClearSelected()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
},
batchLq(type) {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- } else {
- var ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- var that = this
- this.$confirm({
- title: '纭棰嗗彇',
- content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?',
- onOk: function() {
- that.loading = true
- getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ var that = this
+ this.$confirm({
+ title: '纭棰嗗彇',
+ content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?',
+ onOk: function() {
+ that.loading = true
+ getAction(that.url.cancelOrReceive, { ids, type })
+ .then((res) => {
if (res.success) {
that.$notification.success({
message: '娑堟伅',
@@ -393,12 +363,12 @@
description: res.message
})
}
- }).finally(() => {
+ })
+ .finally(() => {
that.loading = false
})
- }
- })
- }
+ }
+ })
},
onInspectionDateChange: function(value, dateString) {
this.queryParam.inspectionDateBegin = dateString[0]
@@ -406,7 +376,4 @@
}
}
}
-</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