Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev

src/views/modules/plugins/change/changewelfare.vue

@@ -289,6 +289,13 @@
 				:rules="dataRule"
 				class="form"
 			>
+				<el-form-item
+					label="姓名	"
+					label-width="150px"
+					style="display: block"
+				>
+					<div>{{ rowData.name }}</div>
+				</el-form-item>
 				<el-form-item
 					label="福利发放标识	"
 					prop="grantFlag"
@@ -308,7 +315,7 @@
 					style="display: block"
 				>
 					<el-input
-						maxlength="50"
+						maxlength="100"
 						style="width: 300px"
 						show-word-limit
 						placeholder="请输入福利类别	"
@@ -326,7 +333,7 @@
 					<el-input
 						type="textarea"
 						style="width: 300px"
-						maxlength="1000"
+						maxlength="200"
 						show-word-limit
 						:rows="3"
 						placeholder="请输入添加福利人员的原因"

src/views/modules/plugins/change/resiwelfare.vue

@@ -314,6 +314,14 @@
 				:rules="dataRule"
 				class="form"
 			>
+				<el-form-item
+					label="姓名	"
+					label-width="150px"
+					style="display: block"
+				>
+					<div>{{ rowData.NAME }}</div>
+				</el-form-item>
+
 				<el-form-item
 					label="福利发放标识	"
 					prop="grantFlag"
@@ -333,7 +341,7 @@
 					style="display: block"
 				>
 					<el-input
-						maxlength="50"
+						maxlength="100"
 						style="width: 300px"
 						show-word-limit
 						placeholder="请输入福利类别	"
@@ -351,7 +359,7 @@
 					<el-input
 						type="textarea"
 						style="width: 300px"
-						maxlength="1000"
+						maxlength="200"
 						show-word-limit
 						:rows="3"
 						placeholder="请输入添加福利人员的原因"
@@ -550,7 +558,7 @@ export default {
 			this.rowData = { ...row };
 		},
 
-    // 新增-验证表单后提交
+		// 新增-验证表单后提交
 		async handleComfirmJoinForm() {
 			this.$refs["joinForm"].validate((valid, messageObj) => {
 				if (!valid) {
@@ -561,7 +569,7 @@ export default {
 			});
 		},
 
-    // 新增-提交
+		// 新增-提交
 		submitJoinForm() {
 			const { joinForm } = this;
 			const params = {