From e9c91586c0847fb0530fbf2d0c89381b92d99680 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 12 七月 2023 14:50:26 +0800
Subject: [PATCH] 扭矩配置和假期管理的删除和批量删除
---
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue | 4 +-
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue | 4 +-
src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue | 54 +++++++++++++++++++++++++-
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue | 54 +++++++++++++++++++++++++-
4 files changed, 106 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
index bddc15c..5a3ffa2 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -39,6 +39,17 @@
<!--<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 -->
@@ -147,7 +158,7 @@
{
title: '绫诲瀷',
align: 'center',
- dataIndex: 'type'
+ dataIndex: 'vacationType'
},
{
title: '澶囨敞',
@@ -164,6 +175,7 @@
],
url: {
list: '/mdc/mdcVacationManagement/pageList',
+ delete: '/mdc/mdcVacationManagement/deleteBatchVacation',
deleteBatch: '/mdc/mdcVacationManagement/deleteBatchVacation',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
@@ -461,12 +473,12 @@
this.selectedRowKeys = []
},
handleDelete: function (id) {
- if(!this.url.deleteBatch){
+ if(!this.url.delete){
this.$message.error("璇疯缃畊rl.delete灞炴��!")
return
}
var that = this;
- deleteAction(that.url.deleteBatch, {id: id}).then((res) => {
+ deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
@@ -477,6 +489,42 @@
}
});
},
+ batchDel: function () {
+ if(!this.url.deleteBatch){
+ this.$message.error("璇疯缃畊rl.deleteBatch灞炴��!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ return;
+ } 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;
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ that.$message.success(res.message);
+ that.loadData();
+ that.onClearSelected();
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.loading = false;
+ });
+ }
+ });
+ }
+ },
handleAdd() {
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板'
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
index e1c5651..6779340 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
@@ -21,7 +21,7 @@
<a-col :span="12">
<a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ョ被鍨�"
- v-decorator="['type', validatorRules.type]"/>
+ v-decorator="['vacationType', validatorRules.vacationType]"/>
</a-form-item>
</a-col>
</a-row>
@@ -201,7 +201,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'type', 'notes',
+ this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'vacationType', 'notes',
))
})
},
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
index 7e3e6bc..f5d2f56 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
@@ -22,7 +22,7 @@
<a-col :span="12">
<a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ョ被鍨�"
- v-decorator="['type', validatorRules.type]"/>
+ v-decorator="['vacationType', validatorRules.vacationType]"/>
</a-form-item>
</a-col>
<a-col :span="12">
@@ -228,7 +228,7 @@
// this.editStart = (this.model.startTime).replace(/:/g,'');
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','vacationDate', 'type','notes'
+ this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','vacationDate', 'vacationType','notes'
))
})
},
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
index ac0161a..d86c1d4 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
@@ -39,6 +39,17 @@
<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 -->
@@ -169,7 +180,8 @@
],
url: {
list: '/mdc/MdcTorqueConfig/pageList',
- deleteBatch: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
+ delete: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
+ deleteBatch: '/mdc/MdcTorqueConfig/deleteBatchMdcTorqueConfig',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
@@ -501,12 +513,12 @@
this.selectedRowKeys = []
},
handleDelete: function (id) {
- if(!this.url.deleteBatch){
+ if(!this.url.delete){
this.$message.error("璇疯缃畊rl.delete灞炴��!")
return
}
var that = this;
- deleteAction(that.url.deleteBatch, {id: id}).then((res) => {
+ deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
@@ -517,6 +529,42 @@
}
});
},
+ batchDel: function () {
+ if(!this.url.deleteBatch){
+ this.$message.error("璇疯缃畊rl.deleteBatch灞炴��!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ return;
+ } 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;
+ deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ that.$message.success(res.message);
+ that.loadData();
+ that.onClearSelected();
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.loading = false;
+ });
+ }
+ });
+ }
+ },
handleAdd() {
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板'
--
Gitblit v1.9.3