From a751e547d67c4f8e2c6fddf958c1559f792515bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 16:11:50 +0800
Subject: [PATCH] 添加工作流
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 765e195..64f0cbd 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -19,7 +19,7 @@
<!--</a-form-item>-->
<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-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
<!--v-decorator="['equipmentId',validatorRules.equipmentId]"/>-->
</a-form-item>
@@ -44,20 +44,22 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
</a-row>
@@ -72,17 +74,13 @@
<!--</a-row>-->
</a-form>
</a-spin>
- <device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"
- :selectedEquipmentIds="selectedEquipmentIds"
- ></device-repair-list-model>
-
+ <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-modal>
</template>
<script>
import moment from 'moment'
import pick from 'lodash.pick'
- import DeviceRepairListModel from './DeviceRepairListModel'
import JDate from './JDate'
import {
getAction,
@@ -92,12 +90,12 @@
import {
duplicateCheck
} from '@/api/api'
- import AFormItem from 'ant-design-vue/es/form/FormItem'
import Vue from 'vue'
+ import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'
export default {
name: 'DeviceRepairModel',
- components: { AFormItem, DeviceRepairListModel, JDate },
+ components: { SelectDeviceDrawer, JDate },
props: {
equipmentId: {
type: String
@@ -226,7 +224,7 @@
disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+2, 'day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
@@ -275,9 +273,10 @@
// })
},
deviceSearch() {
- this.$refs.deviceRepairListModel.openPage()
- this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
- this.$refs.deviceRepairListModel.disableSubmit = false
+ this.$refs.selectDeviceDrawer.visible = true
+ this.$refs.selectDeviceDrawer.selectedRowKeys = []
+ this.$refs.selectDeviceDrawer.selectedRows = []
+ this.$refs.selectDeviceDrawer.checkedKeys = this.form.getFieldValue('equipmentIds') ? this.form.getFieldValue('equipmentIds').split(',') : []
},
//绾ц仈妗唎nChange浜嬩欢
// onChange(value) {
@@ -460,14 +459,37 @@
checkboxChange(e) {
this.checked = e.target.checked
},
+ range(start, end) {
+ const result = []
+ for (let i = start; i < end; i++) {
+ result.push(i)
+ }
+ return result
+ },
/**
* 绂佺敤鏃ユ湡閫夋嫨鍣ㄤ腑鐨勬椂闂撮�夋嫨
- * @returns {{disabledSeconds: (function(): number[])}}
+ * @returns {{disabledSeconds: (function(): number[])}} 杩斿洖鍊间负涓�涓璞★紝鍙互绂佹灏忔椂銆佸垎閽熴�佺锛岀洰鍓嶄粎绂佹鎵�鏈夌鏁�,鏈�浣庝粠1寮�濮嬶紝浠�0寮�濮嬬‘瀹氭寜閽皢琚鐢�
*/
disabledDateTime() {
return {
- disabledSeconds: () => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+ disabledSeconds: () => this.range(1, 60)
}
+ },
+
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @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(',')
+ })
}
}
}
@@ -492,4 +514,6 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+
</style>
--
Gitblit v1.9.3