Merge branch 'dev'

@@ -29,32 +29,38 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <div>
-      <el-table :data="tableForm" border style="width: 100%"
-        :header-cell-style="{ 'text-align': 'center', background: 'rgb(236, 245, 255)' }"
-        :cell-style="{ 'text-align': 'center' }">
-        <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
-        <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
-          <template slot-scope="scope">
+    <el-table :data="ruleForm.tableForm" border style="width: 100%"
+      :header-cell-style="{ 'text-align': 'center', background: 'rgb(236, 245, 255)' }"
+      :cell-style="{ 'text-align': 'center' }">
+      <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
+      <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'tableForm.' + scope.$index + '.ksysxlh'"
+            :rules="rules.ksysxlh">
             <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
               oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
-          <template slot-scope="scope">
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'tableForm.' + scope.$index + '.jsysxlh'"
+            :rules="rules.jsysxlh">
             <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
               oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column prop="bs" label="本数">
-          <template slot-scope="scope">
-            <span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
-            <span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
-            <span v-else>{{ scope.row.bs }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column prop="bs" label="本数">
+        <template slot-scope="scope">
+          <span v-if="scope.row.bs == 0" class="font-red">系统计算</span>
+          <span v-else-if="scope.row.bs < 0" class="font-red">印刷序列号有误</span>
+          <span v-else>{{ scope.row.bs }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <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>
@@ -92,25 +98,25 @@
           zsnum: '',
           zmstarno: '',
           zmendno: '',
-          zmnum: ''
+          zmnum: '',
+          //表格数据
+          tableForm: [
+            {
+              name: '不动产权证书',
+              ksysxlh: '',
+              jsysxlh: '',
+              bs: 0,
+              zslx: 1
+            },
+            {
+              name: '不动产登记证明',
+              ksysxlh: '',
+              jsysxlh: '',
+              bs: 0,
+              zslx: 2
+            }
+          ]
         },
-        //表格数据
-        tableForm: [
-          {
-            name: '不动产权证书',
-            ksysxlh: '',
-            jsysxlh: '',
-            bs: 0,
-            zslx: 1
-          },
-          {
-            name: '不动产登记证明',
-            ksysxlh: '',
-            jsysxlh: '',
-            bs: 0,
-            zslx: 2
-          }
-        ],
         //证书入库业务号参数
         ywhQueryForm: {
           serialtype: 'zsrkbh',
@@ -128,13 +134,19 @@
           rksj: [
             { required: true, message: '请选择入库时间', trigger: 'change' }
           ],
+          ksysxlh: [
+            { required: true, message: '开始印刷序列号不能为空', trigger: 'blur' }
+          ],
+          jsysxlh: [
+            { required: true, message: '结束印刷序列号不能为空', trigger: 'blur' }
+          ]
         },
       }
     },
     mounted () {
       if (this.formData.bsmBatch) {
-        this.tableForm[0].bs = null;
-        this.tableForm[1].bs = null;
+        this.ruleForm.tableForm[0].bs = null;
+        this.ruleForm.tableForm[1].bs = null;
         this.getDetailInfo(this.formData.bsmBatch);
       } else {
         this.ywhSerial();
@@ -146,21 +158,28 @@
        * @author: renchao
        */
       submitForm () {
-        this.tableForm.forEach((item, index) => {
-          if (item.bs < 0) {
-            return;
-          }
-        })
-        store.dispatch("user/refreshPage", false);
-        zsrk(this.ruleForm).then(res => {
-          if (res.code == 200) {
-            this.$message.success('保存成功')
-            this.$popupCacel()
-            this.$refs['ruleForm'].resetFields()
-            this.resetTableFields()
-            store.dispatch("user/refreshPage", true)
+        let that = this
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            let arr = this.ruleForm.tableForm.filter(item => item.bs > 0)
+            if (arr.length < 2) {
+              that.$message.error('本书必须大于0，请检查印刷序列号');
+              return
+            }
+            store.dispatch("user/refreshPage", false);
+            zsrk(this.ruleForm).then(res => {
+              if (res.code == 200) {
+                that.$message.success('保存成功')
+                that.$popupCacel()
+                that.$refs['ruleForm'].resetFields()
+                that.resetTableFields()
+                that.dispatch("user/refreshPage", true)
+              } else {
+                that.$message.error(res.message);
+              }
+            })
           } else {
-            this.$message.error(res.message);
+            return false;
           }
         })
       },
@@ -187,12 +206,12 @@
             this.ruleForm = res.result;
             this.$refs.ruleForm.resetFields()
             this.readOnly = false;
-            this.tableForm[0].ksysxlh = res.result.zsstarno;
-            this.tableForm[0].jsysxlh = res.result.zsendno;
-            this.tableForm[0].bs = res.result.zsnum;
-            this.tableForm[1].ksysxlh = res.result.zmstarno;
-            this.tableForm[1].jsysxlh = res.result.zmendno;
-            this.tableForm[1].bs = res.result.zmnum;
+            this.ruleForm.tableForm[0].ksysxlh = res.result.zsstarno;
+            this.ruleForm.tableForm[0].jsysxlh = res.result.zsendno;
+            this.ruleForm.tableForm[0].bs = res.result.zsnum;
+            this.ruleForm.tableForm[1].ksysxlh = res.result.zmstarno;
+            this.ruleForm.tableForm[1].jsysxlh = res.result.zmendno;
+            this.ruleForm.tableForm[1].bs = res.result.zmnum;
           }
         })
       },
@@ -243,7 +262,7 @@
        * @author: renchao
        */
       resetTableFields () {
-        this.tableForm = [
+        this.ruleForm.tableForm = [
           {
             name: '不动产权证书',
             ksysxlh: '',