Merge branch 'dev'

@@ -58,7 +58,7 @@
     <el-form-item label="备注" class="middle-margin-bottom">
       <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>
@@ -154,7 +154,7 @@
         zsrk(this.ruleForm).then(res => {
           if (res.code == 200) {
             this.$message.success('保存成功')
-            this.$emit("input", false);
+            this.$popupCacel()
             this.$refs['ruleForm'].resetFields();
             this.resetTableFields();
             this.$parent.queryClick();
@@ -163,7 +163,6 @@
           }
         })
       },
-      //序列号获取
       /**
        * @description: 序列号获取
        * @author: renchao
@@ -176,7 +175,6 @@
           }
         })
       },
-      //获取详情信息
       /**
        * @description: 获取详情信息
        * @param {*} bsmBatch
@@ -197,7 +195,6 @@
           }
         })
       },
-      //印刷序列号处理
       /**
        * @description: 印刷序列号处理
        * @param {*} item