调整

src/views/dashboard/widgets/components/MyNoticePageList.vue

@@ -64,6 +64,26 @@
 		</vxe-pager>
 	</el-card>
 	<WareHouseHistoryPopup ref="wareHouseHistoryPopup"></WareHouseHistoryPopup>
+	<el-dialog
+		:title="title"
+		:close-on-click-modal="false"
+		draggable
+		append-to-body
+		width="1300px"
+		@close="close"
+		@keyup.enter.native="doSubmit"
+		v-model="visible">
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method === 'view'"
+				 label-width="160px" @submit.native.prevent>
+			<a style="font-size: 16px;color: red">{{inputForm.title}}</a>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="visible = false" icon="el-icon-circle-close">关闭</el-button>
+				<!--			  <el-button type="primary" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>-->
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script>
@@ -100,7 +120,10 @@ export default {
 			loading: false,
 			visible: false,
 			currentTask: null,
-			processInstanceId: ''
+			processInstanceId: '',
+			inputForm:{
+				title:''
+			},
 		};
 	},
 	mounted() {
@@ -113,7 +136,11 @@ export default {
 	methods: {
 		todo (row) {
 			// console.log('row', row)
-			if (row.taskName === '库存提醒') {
+			if (row.taskName === '月报还未提交'){
+				this.visible = true
+				this.inputForm.title = row.title
+
+			}else if (row.taskName === '库存提醒') {
 				// console.log('测试进来了')
 				this.$refs.wareHouseHistoryPopup.init(row.defId)
 				this.inputForm = {

src/views/jy/holiday/HolidayForm.vue

@@ -23,7 +23,7 @@
 				<el-col :span="12">
 					<el-form-item prop="type" label="请假类型"
 								  :rules="[ {required: true, message:'请假类型不能为空', trigger:'blur'}]">
-						<el-select v-model="inputForm.type" placeholder="请选择" style="width:100%;">
+						<el-select v-model="inputForm.type" placeholder="请选择" style="width:100%;" @change="checkType">
 							<el-option
 								v-for="item in $dictUtils.getDictList('jy_holiday_type')"
 								:key="item.value"