From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 88 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index da74220..0557b03 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -25,6 +25,22 @@
</a-form-item>
</a-col>
</a-row>
+
+ <a-row :gutter="24" >
+ <a-col :span="24">
+ <a-form-item label="缁翠慨绫诲瀷" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-radio-group v-decorator="['mdcRepairType', validatorRules.mdcRepairType]">
+ <a-radio :value="1">
+ 缁翠慨
+ </a-radio>
+ <a-radio :value="2">
+ 浼戠彮
+ </a-radio>
+ </a-radio-group>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -39,15 +55,15 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-item v-show="this.mesag == 1" label="缁翠慨绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="璇烽�夋嫨璁惧绫诲瀷"
- :triggerChange="true"
- v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>
- </a-form-item>
- </a-col>
- </a-row>
+ <!--<a-row :gutter="24">-->
+ <!--<a-col :span="12">-->
+ <!--<a-form-item v-show="this.mesag == 1" label="缁翠慨绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="璇烽�夋嫨璁惧绫诲瀷"-->
+ <!--:triggerChange="true"-->
+ <!--v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--</a-row>-->
</a-form>
</a-spin>
<device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>
@@ -68,10 +84,11 @@
import {
duplicateCheck
} from '@/api/api'
+ import AFormItem from 'ant-design-vue/es/form/FormItem'
export default {
name: 'DeviceRepairModel',
- components: {DeviceRepairListModel,JDate},
+ components: { AFormItem, DeviceRepairListModel,JDate},
props: {},
data() {
return {
@@ -119,11 +136,11 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- equipmentId:{
+ equipmentIds:{
rules:[
{
required:true,
- message: ""
+ message: "璇烽�夋嫨璁惧"
},
],
},
@@ -143,7 +160,23 @@
},
],
initialValue: 1
- }
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
},
url: {
@@ -153,8 +186,9 @@
disableSubmit: true,
partCategoryCascade: [],
- cascadeDefaultValue: []
+ cascadeDefaultValue: [],
}
+
},
created() {
},
@@ -260,11 +294,19 @@
let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
let dataStart = stertDate.replace(/:/g,'');
if(startOne < dataStart){
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -279,11 +321,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(res.message)
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
@@ -331,7 +381,7 @@
},
checkboxChange(e) {
this.checked = e.target.checked
- }
+ },
}
}
</script>
--
Gitblit v1.9.3