From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 十二月 2023 13:35:36 +0800
Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空，现调整为首位数据，且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index f48a441..01f0c63 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -8,7 +8,7 @@
<a-col :span="24">
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
- @search="deviceSearch" enter-button/>
+ @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
</a-form-item>
</a-col>
</a-row>
@@ -44,6 +44,7 @@
</a-form>
</a-spin>
<device-calend-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-calend-list-model>
+ <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-modal>
</div>
</template>
@@ -62,10 +63,11 @@
} from '@/api/api'
import Calendar from 'vue-calendar-component';
+ import SelectDeviceModal from '../../../../system/modules/SelectDeviceModal'
export default {
name: 'ShiftInfoModel',
- components: {DeviceCalendListModel,Calendar},
+ components: { SelectDeviceModal, DeviceCalendListModel,Calendar},
props: {},
data() {
return {
@@ -239,9 +241,10 @@
this.value = value;
},
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('equipmentId') ? this.form.getFieldValue('equipmentId').split(',') : []
},
getDeviceRows(val) {
console.log("========",val);
@@ -342,6 +345,21 @@
this.close()
},
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @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({
+ equipmentId: data.join(',')
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3