From 6b24c28ba8a418c1efb46ed0576c9d6c3f5ab82c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 12 十二月 2023 17:28:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReport.vue | 137 +++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 66 deletions(-)
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReport.vue
index c086628..c530e59 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReport.vue
@@ -18,12 +18,9 @@
slot-scope='text, record, index'
>
<div :key='col.dataIndex'>
- <a-input-search
- v-if="col.dataIndex == 'username'"
- enter-button
- @search='onSearchUser(index)'
+ <a-input
+ v-if="col.dataIndex == 'userId'"
:value='text'
- :read-only='true'
@change='(e) => handleChange(e, record.key, col, index)'
:disabled="repairOrderStatus=='4'"
/>
@@ -40,12 +37,13 @@
<!-- v-if="col.dataIndex == 'principalContractor'" />-->
<a-select default-value='0' :value='text' :disabled="repairOrderStatus=='4'"
v-if="col.dataIndex == 'principalContractor'"
+ style="width: 100%;"
@change='(e)=>handleChange(e, record.key, col, index)'>
<a-select-opt-group>
- <a-select-option value='1'>
+ <a-select-option value='1' style="width: 100%;">
鏄�
</a-select-option>
- <a-select-option value='0'>
+ <a-select-option value='0' style="width: 100%;">
鍚�
</a-select-option>
</a-select-opt-group>
@@ -111,13 +109,13 @@
>
鍙栨秷
</a-button>
- <a-button
+ <!-- <a-button
@click='handleOk(1)'
type='primary'
:style="{marginRight: '8px'}"
:disabled="this.repairOrderStatus=='4' || this.repairOrderStatus=='2'"
>鏆傚瓨
- </a-button>
+ </a-button> -->
<a-button
@click='handleOk(0)'
type='primary'
@@ -161,7 +159,6 @@
repairOrderId: {
type: String,
required: false,
- default: '-1'
},
repairOrderStatus: {
type: String,
@@ -198,7 +195,7 @@
validatorRules: {
userId: {
rules: [
- { required: true, message: '璇烽�夋嫨浜哄憳!' }
+ { required: true, message: '璇峰～鍐欎汉鍛�!' }
]
},
actual_hour: {
@@ -233,25 +230,20 @@
}
},
{
- title: '*浜哄憳缂栫爜',
- dataIndex: 'username',
+ title: '*浜哄憳鍚嶇О',
+ dataIndex: 'userId',
align: 'center',
- scopedSlots: { customRender: 'username' },
+ scopedSlots: { customRender: 'userId' },
className: 'red',
- width: 250
+ width: 200
},
{
- title: '浜哄憳鍚嶇О',
- dataIndex: 'realname',
- align: 'center',
- width: 150
- },
- {
- title: '涓绘壙淇汉',
+ title: '*涓绘壙淇汉',
dataIndex: 'principalContractor',
align: 'center',
scopedSlots: { customRender: 'principalContractor' },
- width: 100
+ className: 'red',
+ width: 150
},
{
title: '*瀹為檯宸ユ椂',
@@ -259,19 +251,22 @@
align: 'center',
className: 'red',
scopedSlots: { customRender: 'actualHour' },
- width: 120
+ width: 150
},
{
title: '寮�濮嬫椂闂�',
dataIndex: 'startTime',
scopedSlots: { customRender: 'startTime' },
- align: 'center'
+ align: 'center',
+ width: 200
},
{
title: '缁撴潫鏃堕棿',
dataIndex: 'endTime',
align: 'center',
- scopedSlots: { customRender: 'endTime' }
+ scopedSlots: { customRender: 'endTime' },
+ width: 200
+
},
{
@@ -279,12 +274,14 @@
dataIndex: 'theoreticalTime',
align: 'center'
// scopedSlots: { customRender: 'theoreticalTime' },
+ ,
+ width: 150
},
{
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- width: 250,
+ width: 150,
scopedSlots: { customRender: 'action' }
}
],
@@ -300,9 +297,11 @@
repairOrderId: {
immediate: true,
handler(val) {
- this.clearList()
- this.queryParam['repairOrderId'] = val
- this.loadData(1)
+ if(this.repairOrderId){
+ this.clearList()
+ this.queryParam['repairOrderId'] = val
+ this.loadData(1)
+ }
}
}
},
@@ -332,7 +331,8 @@
this.disableSubmit = false
this.visible = false
},
- handleDelete(text, record, index) {
+ handleDelete(index) {
+ console.log(index)
this.dataSource.splice(index, 1)
},
@@ -390,12 +390,18 @@
const temp = [...that.dataSource]
const target = temp[index]
if (target) {
- target[column.dataIndex] = value
if ('userId' == column.dataIndex) {
- target['userId'] = value
+ target['userId'] = value.target.value
}
if ('principalContractor' == column.dataIndex) {
target['principalContractor'] = value
+ if(value==='1'){
+ for(var i = 0;i<temp.length;i++){
+ if(i!==index){
+ temp[i]['principalContractor']='0';
+ }
+ }
+ }
}
if ('actualHour' == column.dataIndex) {
@@ -417,56 +423,55 @@
if (target['endTime'] == null) {
target['startTime'] = value
- } else if (target['startTime'] != null && target['endTime'] != null) {
- const diffInHours = this.getTimeDiff(target['startTime'], target['endTime'])
- if (diffInHours < 0) {
- target['startTime'] = ''
- target['theoreticalTime'] = ''
- that.$message.error('璇锋鏌ョ' + (index + 1) + '琛屽紑濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
- } else {
- target['startTime'] = value
- target['theoreticalTime'] = diffInHours
- }
- } else if (target['startTime'] == null && target['endTime'] != null) {
+ } else {
const diffInHours = this.getTimeDiff(value, target['endTime'])
if (diffInHours < 0) {
target['startTime'] = ''
target['theoreticalTime'] = ''
- that.$message.error('璇锋鏌ョ' + (index + 1) + '琛屽紑濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
-
+ that.$message.error('寮�濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
} else {
- target['startTime'] = value
- target['theoreticalTime'] = diffInHours
+ if(target['actualHour']!==null){
+ if(diffInHours<target['actualHour']){
+ target['startTime'] = ''
+ target['theoreticalTime'] = ''
+ that.$message.error('瀹為檯宸ユ椂涓嶈兘灏忎簬鐞嗚宸ユ椂,璇烽噸鏂板～鍐�')
+ }else{
+ target['startTime'] = value
+ target['theoreticalTime'] = diffInHours
+ }
+ }else{
+ target['startTime'] = value
+ target['theoreticalTime'] = diffInHours
+ }
}
- }
-
+ }
}
if ('endTime' == column.dataIndex) {
if (target['startTime'] == null) {
target['endTime'] = value
- } else if (target['startTime'] != null && target['endTime'] != null) {
- const diffInHours = this.getTimeDiff(target['startTime'], target['endTime'])
- if (diffInHours < 0) {
- target['endTime'] = ''
- target['theoreticalTime'] = ''
- that.$message.error('璇锋鏌ョ' + (index + 1) + '琛屽紑濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
- } else {
- target['endTime'] = value
- target['theoreticalTime'] = diffInHours
- }
-
- } else if (target['startTime'] != null && target['endTime'] == null) {
+ } else {
const diffInHours = this.getTimeDiff(target['startTime'], value)
if (diffInHours < 0) {
target['endTime'] = ''
target['theoreticalTime'] = ''
- that.$message.error('璇锋鏌ョ' + (index + 1) + '琛屽紑濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
-
+ that.$message.error('寮�濮嬫椂闂翠笉鑳藉皬浜庣粨鏉熸椂闂�,璇烽噸鏂伴�夋嫨')
} else {
- target['endTime'] = value
- target['theoreticalTime'] = diffInHours
+ if(target['actualHour']!==null){
+ if(diffInHours<target['actualHour']){
+ target['endTime'] = ''
+ target['theoreticalTime'] = ''
+ that.$message.error('瀹為檯宸ユ椂涓嶈兘灏忎簬鐞嗚宸ユ椂,璇烽噸鏂板～鍐�')
+ }else{
+ target['endTime'] = value
+ target['theoreticalTime'] = diffInHours
+ }
+ }else{
+ target['endTime'] = value
+ target['theoreticalTime'] = diffInHours
+ }
}
+
}
}
that.dataSource = temp
--
Gitblit v1.9.3