From e2dde7449df00d3260b3fc721dd229ea47596f56 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 16 七月 2024 10:31:47 +0800
Subject: [PATCH] 小修改
---
src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue | 261 +++++++++++++++++++++++++++------------------------
1 files changed, 138 insertions(+), 123 deletions(-)
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
index 6de1c7b..301703c 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -42,18 +43,36 @@
slot='action'
slot-scope='text, record'
>
- <a-popconfirm title="纭閿佹枡鍚�?" @confirm="() => handleLock(record)">
- <a v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'">閿佹枡</a>
+ <a-popconfirm
+ title="纭閿佹枡鍚�?"
+ @confirm="() => handleLock(record)"
+ >
+ <a
+ v-has="'specialtyMaintenanceOrder:actualMaterialLock'"
+ v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'"
+ >閿佹枡</a>
</a-popconfirm>
<a-divider
- v-if="record.isLock=='no'"
- type="vertical"
- />
- <a-popconfirm title="瑙ｉ攣鍚庝細鑷姩閲婃斁搴撳瓨锛岀‘璁よВ閿佸悧?" @confirm="() => handleUnLock(record)">
- <a v-if="record.isLock=='yes'&&specialyMaintenanceOrderStatus=='4'">瑙ｉ攣</a>
+ v-if="record.isLock=='no'"
+ type="vertical"
+ />
+ <a-popconfirm
+ title="瑙ｉ攣鍚庝細鑷姩閲婃斁搴撳瓨锛岀‘璁よВ閿佸悧?"
+ @confirm="() => handleUnLock(record)"
+ >
+ <a
+ v-has="'specialtyMaintenanceOrder:actualMaterialLock'"
+ v-if="record.isLock=='yes'&&specialyMaintenanceOrderStatus=='4'"
+ >瑙ｉ攣</a>
</a-popconfirm>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'">鍒犻櫎</a>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ >
+ <a
+ v-has="'specialtyMaintenanceOrder:actualMaterialDelete'"
+ v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'"
+ >鍒犻櫎</a>
</a-popconfirm>
</span>
</a-table>
@@ -63,6 +82,7 @@
icon="plus"
@click="addMaterial"
:disabled="specialyMaintenanceOrderStatus!='4'"
+ v-has="'specialtyMaintenanceOrder:actualMaterialAdd'"
>娣诲姞瀹為檯鐢ㄦ枡</a-button>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
<a-row :style="{textAlign:'right'}">
@@ -86,13 +106,10 @@
</a-row>
<!-- :disabled="false" -->
</div>
- <actual-material-select
- ref="actualMaterialSelect"
- @sendMaterialRecord="sendMaterialRecord"
- >
+ <actual-material-select ref="actualMaterialSelect" >
+ <!-- @sendMaterialRecord="sendMaterialRecord" -->
</actual-material-select>
- <j-select-spare-part-modal
- ref='JSelectSparePartModal'></j-select-spare-part-modal>
+ <j-select-spare-part-modal ref='JSelectSparePartModal' @getSelectRows="getSelectRows"></j-select-spare-part-modal>
</a-card>
</template>
<script>
@@ -175,7 +192,7 @@
loading: false,
dataSource: [],
columns: [
- {
+ {
title: '棰嗘枡鍑哄簱鍗�',
dataIndex: 'num',
align: "center",
@@ -244,11 +261,12 @@
list: "/eam/maintenanceOrderActualMaterial/getMaintenanceOrderActualMaterialList",
confirmMaterial: "/eam/maintenanceOrderActualMaterial/add",
delete: "/eam/maintenanceOrderActualMaterial/delete",
- addInit:"/eam/maintenanceOrderActualMaterial/addInit",
- lock:"/eam/maintenanceOrderActualMaterial/lock",
- unLock:"/eam/maintenanceOrderActualMaterial/unLock"
+ addInit: "/eam/maintenanceOrderActualMaterial/addInit",
+ lock: "/eam/maintenanceOrderActualMaterial/lock",
+ unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false,
}
},
watch: {
@@ -256,26 +274,26 @@
immediate: true,
handler(val) {
this.clearList();
- this.queryParam['maintenanceOrderId'] = val
- this.queryParam['equipmentId'] = this.equipmentId
+ // this.queryParam['maintenanceOrderId'] = val
+ // this.queryParam['equipmentId'] = this.equipmentId
this.loadData(1);
}
},
- equipmentId: {
- immediate: true,
- handler(val) {
- this.clearList();
- this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderIdmaintenanceOrderId
- this.queryParam['equipmentId'] = val
- this.loadData(1);
- }
- }
+ // equipmentId: {
+ // immediate: true,
+ // handler(val) {
+ // this.clearList();
+ // this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderIdmaintenanceOrderId
+ // this.queryParam['equipmentId'] = val
+ // this.loadData(1);
+ // }
+ // }
},
- created() {
- this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderId;
- this.queryParam['equipmentId'] = this.equipmentId
- this.loadData(1);
- },
+ // created() {
+ // this.queryParam['maintenanceOrderId'] = this.specialyMaintenanceOrderId;
+ // this.queryParam['equipmentId'] = this.equipmentId
+ // this.loadData(1);
+ // },
methods: {
addMaterial() {
let ids = [];
@@ -347,7 +365,7 @@
const target = temp[index]
let availableQuantity = target['availableQuantity']
if (target) {
- if (value!=undefined&& value!=null&& value!=''&&availableQuantity < value) {
+ if (value != undefined && value != null && value != '' && availableQuantity < value) {
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!')
} else {
}
@@ -360,66 +378,66 @@
this.$refs.actualMaterialSelect.list()
this.$refs.actualMaterialSelect.title = '鐗╂枡閫夋嫨'
},
- sendMaterialRecord(data, val) {
- let record = data.record
- const temp = [...this.dataSource]
- const target = temp[this.recordIndex]
- if (target) {
- target.materialId = record.id;
- target.materialName = record.name;
- target.materialNum = record.num;
- target.materialModel = record.model;
- target.materialSpecification = record.specification;
- target.unitId_dictText = record.unitId_dictText;
- this.dataSource = temp
- }
- },
+ // sendMaterialRecord(data, val) {
+ // let record = data.record
+ // const temp = [...this.dataSource]
+ // const target = temp[this.recordIndex]
+ // if (target) {
+ // target.materialId = record.id;
+ // target.materialName = record.name;
+ // target.materialNum = record.num;
+ // target.materialModel = record.model;
+ // target.materialSpecification = record.specification;
+ // target.unitId_dictText = record.unitId_dictText;
+ // this.dataSource = temp
+ // }
+ // },
clearList() {
this.dataSource = [];
this.ipagination.current = 1
},
- getUuiD(randomLength){
- return Number(
- Math.random()
- .toString()
- .substr(2, randomLength) + Date.now()
- ).toString(36)
- },
- handleLock(record){
+ // getUuiD(randomLength) {
+ // return Number(
+ // Math.random()
+ // .toString()
+ // .substr(2, randomLength) + Date.now()
+ // ).toString(36)
+ // },
+ handleLock(record) {
let that = this;
- if(record.quantity==null||record.quantity==undefined||record.quantity==''){
+ if (record.quantity == null || record.quantity == undefined || record.quantity == '') {
this.$message.error('璇峰厛濉啓鏁伴噺!');
return false
}
- if(record.availableQuantity<record.quantity){
+ if (record.availableQuantity < record.quantity) {
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!');
return false;
}
- this.confirmLoading = true;
- postAction(this.url.lock,record).then(res=>{
- if(res.success){
- this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
- }else{
- this.$message.error(res.message)
+ this.loading = true;
+ postAction(this.url.lock, record).then(res => {
+ if (res.success) {
+ this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
+ } else {
+ this.$message.error(res.message)
}
- }).finally(res=>{
- that.confirmLoading = false
- that.loadData();
+ }).finally(res => {
+ that.loading = false
+ that.loadData();
})
-
+
},
- handleUnLock(record){
+ handleUnLock(record) {
let that = this;
- this.confirmLoading = true;
- postAction(this.url.unLock,record).then(res=>{
- if(res.success){
- this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
- }else{
- this.$message.error(res.message)
+ this.loading = true;
+ postAction(this.url.unLock, record).then(res => {
+ if (res.success) {
+ this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
+ } else {
+ this.$message.error(res.message)
}
- }).finally(res=>{
- that.confirmLoading = false
- that.loadData();
+ }).finally(res => {
+ that.loading = false
+ that.loadData();
})
},
loadData(arg) {
@@ -454,50 +472,47 @@
this.loading = false
})
},
+ getSelectRows(data){
+ let newActualMaterials = [];
+ for (let i = 0; i < data.length; i++) {
+ newActualMaterials.push({
+ // id: this.getUuiD(16),
+ // num: data[i].num,
+ outboundOrderDetailId: data[i].id,
+ sparePartId: data[i].sparePartId,
+ // sparePartNum: data[i].spareNum,
+ // sparePartName: data[i].spareName,
+ // specification: data[i].specification,
+ // model: data[i].model,
+ // constructorName: data[i].constructorName,
+ // constructorId: data[i].constructorId,
+ // mainUnitName: data[i].mainUnitName,
+ // mainUnitId: data[i].mainUnitId,
+ mainQuantity: data[i].mainQuantity,
+ useQuantity: data[i].useQuantity,
+ availableQuantity: data[i].availableQuantity,
+ maintenanceOrderId: this.specialyMaintenanceOrderId,
+ equipmentId: this.equipmentId,
+ isLock: 'no'
+ })
+ }
+ let that = this
+ postAction(this.url.addInit, newActualMaterials).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(res => {
+ newActualMaterials = []
+ that.loadData();
+
+ })
+
+ }
},
mounted() {
- let newActualMaterials = [];
- this.$bus.$on('selectionRows', (data) => {
- for (let i = 0; i < data.length; i++) {
- var actualMaterial
- =
- {
- id: this.getUuiD(16),
- num: data[i].num,
- outboundOrderDetailId:data[i].id,
- sparePartId:data[i].sparePartId,
- sparePartNum: data[i].spareNum,
- sparePartName: data[i].spareName,
- specification: data[i].specification,
- model:data[i].model,
- constructorName:data[i].constructorName,
- constructorId:data[i].constructorId,
- mainUnitName:data[i].mainUnitName,
- mainUnitId:data[i].mainUnitId,
- mainQuantity:data[i].mainQuantity,
- useQuantity:data[i].useQuantity,
- availableQuantity:data[i].availableQuantity,
- maintenanceOrderId:this.specialyMaintenanceOrderId,
- equipmentId :this.equipmentId,
- isLock:'no'
- }
- newActualMaterials.push(actualMaterial);
- }
- let that = this
- let obj = obj = postAction(this.url.addInit, newActualMaterials)
- obj.then((res) => {
- if (res.success) {
- that.$message.success(res.message)
-
- that.$emit('ok')
- } else {
- that.$message.warning(res.message)
- }
- }).finally(res=>{
- that.loadData();
- newActualMaterials = []
- })
- })
},
}
--
Gitblit v1.9.3