From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
index 2a2ffdb..9b68f1e 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
@@ -7,7 +7,7 @@
<a-col :span="24">
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
- @search="deviceSearch" enter-button/>
+ @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
</a-form-item>
</a-col>
</a-row>
@@ -43,15 +43,13 @@
</a-row>
</a-form>
</a-spin>
- <plan-downtime-maintenance-modal-list ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></plan-downtime-maintenance-modal-list>
-
+ <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-modal>
</template>
<script>
import moment from 'moment'
import pick from 'lodash.pick'
- import PlanDowntimeMaintenanceModalList from './UnplannedDowntimemManagerModalList'
import JDate from '../deviceRepair/JDate'
import {
getAction,
@@ -61,10 +59,11 @@
import {
duplicateCheck
} from '@/api/api'
+ import SelectDeviceModal from '../../../../system/modules/SelectDeviceModal'
export default {
name: 'UnplannedDowntimemManagerModal',
- components: {PlanDowntimeMaintenanceModalList,JDate},
+ components: { SelectDeviceModal,JDate},
props: {},
data() {
return {
@@ -201,9 +200,10 @@
// })
},
deviceSearch() {
- this.$refs.deviceRepairListModel.openPage()
- this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
- this.$refs.deviceRepairListModel.disableSubmit = false
+ this.$refs.selectDeviceModal.visible = true
+ this.$refs.selectDeviceModal.selectedRowKeys = []
+ this.$refs.selectDeviceModal.selectedRows = []
+ this.$refs.selectDeviceModal.checkedKeys = this.form.getFieldValue('equipmentIds') ? this.form.getFieldValue('equipmentIds').split(',') : []
},
//绾ц仈妗唎nChange浜嬩欢
// onChange(value) {
@@ -336,6 +336,22 @@
},
checkboxChange(e) {
this.checked = e.target.checked
+ },
+
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @param data 宸查�夋嫨鐨勮澶�
+ */
+ selectOK(data) {
+ // let params = {}
+ // params.equipmentIdList = []
+ // for (var a = 0; a < data.length; a++) {
+ // params.equipmentIdList.push(data[a])
+ // }
+ console.log('data=', data)
+ this.form.setFieldsValue({
+ equipmentIds: data.join(',')
+ })
}
}
}
--
Gitblit v1.9.3