Merge branch 'dev'

@@ -51,7 +51,7 @@
       <el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
     </el-form-item>
 
-    <el-form-item v-if="readOnly">
+    <el-form-item v-if="readOnly" style="text-align:center">
       <el-button type="primary" @click="submitForm">保存</el-button>
       <el-button @click="closeDialog">取消</el-button>
     </el-form-item>
@@ -138,7 +138,6 @@
       this.getreceiver()
     },
     methods: {
-      //领取人列表
       /**
        * @description: 领取人列表
        * @author: renchao
@@ -151,7 +150,6 @@
           })
         })
       },
-      //表单提交
       /**
        * @description: 表单提交
        * @author: renchao
@@ -161,9 +159,9 @@
         zsff(this.ruleForm).then(res => {
           if (res.code == 200) {
             this.$message.success('保存成功')
-            this.$emit("input", false);
             this.$refs['ruleForm'].resetFields();
             this.resetTableFields();
+            this.$popupCacel()
             store.dispatch("user/refreshPage", true);
           } else {
             this.$message.error(res.message)
@@ -203,7 +201,6 @@
           }
         })
       },
-      //初始化开始序列号
       /**
        * @description: 初始化开始序列号
        * @author: renchao
@@ -241,7 +238,6 @@
           this.updateRuleForm('', 0, item);
         }
       },
-      //更新表单数据
       /**
        * @description: 更新表单数据
        * @param {*} endno
@@ -297,6 +293,9 @@
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";
   @import "~@/styles/dialogBoxheader.scss";
+  /deep/.cell .el-form-item {
+    margin-bottom: 0;
+  }
 
   .font-red {
     color: red;

@@ -294,7 +294,9 @@
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";
   @import "~@/styles/dialogBoxheader.scss";
-
+  /deep/.cell .el-form-item {
+    margin-bottom: 0;
+  }
   .font-red {
     color: red;
   }