Merge branch 'dev'

@@ -466,7 +466,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -474,10 +474,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -486,7 +486,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -366,7 +366,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -374,10 +374,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -386,7 +386,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -402,7 +402,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -410,10 +410,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -422,7 +422,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -252,7 +252,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -260,10 +260,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -272,7 +272,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -348,7 +348,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -356,10 +356,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -368,7 +368,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -407,7 +407,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -415,10 +415,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -427,7 +427,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -328,7 +328,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -336,10 +336,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -348,7 +348,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -316,10 +316,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -328,7 +328,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -157,12 +157,13 @@ export default {
           this.tableData.forEach((item) => {
             item.show = true;
             if (this.$parent.dqhj == item.jddm) {
+              item["stepid"] = this.$route.query.bestepid;
+              item.shjssj = getNewDatesh();
+              item.shkssj = getNewDatesh();
+              item["shryxm"] = this.userInfo.name;
+              item["userid"] = this.userInfo.id;
               item.show = false;
             }
-            item.shjssj = getNewDatesh();
-            item.shkssj = getNewDatesh();
-            item["shryxm"] = this.userInfo.name;
-            item["userid"] = this.userInfo.id;
           });
         }
       });
@@ -180,7 +181,6 @@ export default {
     onSubmit() {
       this.tableData.forEach((item, index) => {
         item["bsmBusiness"] = this.propsParam.bsmBusiness;
-        item["stepid"] = this.$route.query.bestepid;
         item["czjg"] = "1";
       });
       saveSpyjBySlsq(this.tableData).then((res) => {