首页、工作台修改密码功能调整

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

@@ -155,7 +155,7 @@
 		></flow-chart>
 	</v-dialog>
 
-	<UpdatePassword :innerVisible="innerVisible" v-on:innerDialog="getInnerStatus($event)"></UpdatePassword>
+	<UpdatePassword ref="updatePassword" :innerVisible="innerVisible" v-on:innerDialog="getInnerStatus($event)"></UpdatePassword>
 </template>
 
 <script>
@@ -210,7 +210,7 @@
 						if (!data) {
 							// 如果没有修改过密码，则弹出密码修改窗口
 							this.innerVisible = true
-							// this.$refs.updatePassword.init(data)
+							this.$refs.updatePassword.init(!data)
 
 						}
 					})

src/views/home/components/TodoList2.vue

@@ -78,7 +78,7 @@
 		></flow-chart>
 	</v-dialog>
 
-	<UpdatePassword :innerVisible="innerVisible" v-on:innerDialog="getInnerStatus($event)"></UpdatePassword>
+	<UpdatePassword ref="updatePassword" :innerVisible="innerVisible" v-on:innerDialog="getInnerStatus($event)"></UpdatePassword>
 </template>
 
 <script>
@@ -128,8 +128,8 @@
 						if (!data) {
 							// 如果没有修改过密码，则弹出密码修改窗口
 							this.innerVisible = true
-							// this.$refs.updatePassword.init(data)
-
+							this.$refs.updatePassword.init(!data)
+						//
 						}
 					})
 				}

src/views/layout/UpdatePassword2.vue

@@ -7,7 +7,7 @@
 		width="70%"
 		height="600px"
 	>
-			<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+			<el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmit()"
 					 label-width="80px" @submit.native.prevent>
 				<div style="margin-bottom: 20px;" v-if="showTip">
 					<el-alert
@@ -33,7 +33,7 @@
 			</el-form>
 				<span slot="footer" class="dialog-footer" style="float: right">
 					<el-button size="large" @click="dialogVisible = false" icon="el-icon-circle-close">关闭</el-button>
-					<el-button size="large" type="primary" @click="dataFormSubmit()">确定</el-button>
+					<el-button size="large" type="primary" @click="dataFormSubmit()" icon="el-icon-circle-check">确定</el-button>
 				</span>
 	</v-dialog>
 </template>
@@ -46,7 +46,7 @@
 		props:{
 			innerVisible:{
 				type: Boolean,
-				default: true
+				default: false
 			}
 		},
 
@@ -96,21 +96,13 @@
 			}
 		},
 		methods: {
-			handleClose(done) {
-				this.$emit("innerDialog",false)
-			},
 			// 初始化
 			init (showTip) {
-				if (this.commonJS.isNotEmpty(showTip)) {
-					this.showTip = showTip
-				} else {
-					this.showTip = false
-				}
+				this.showTip = showTip
 				this.dialogVisible = true
-				// this.$nextTick(() => {
-				  this.$refs.dataForm.resetFields()
-				//   //this.$refs['dataForm'].resetFields()
-				// })
+				this.$nextTick(() => {
+				  	this.$refs.dataForm.resetFields()
+				})
 			},
 			// 表单提交
 			dataFormSubmit () {