Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -6,7 +6,7 @@
         <ul style="margin-bottom:15px">
         <ul style="margin-bottom:15px">
           <li v-for="(item,index) in dataList" class="listDetail" :key="index">
           <li v-for="(item,index) in dataList" class="listDetail" :key="index">
             <p class="icon">
             <p class="icon">
-              <i class="el-icon-circle-check"></i>
+              <el-radio v-model="radio"></el-radio>
             </p>
             </p>
             <p>{{item.activityName}}</p>
             <p>{{item.activityName}}</p>
             <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
             <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
@@ -35,16 +35,16 @@ export default {
       outstepopinion: ''
       outstepopinion: ''
     }
     }
   },
   },
-  created() {
+  created () {
     this.getBackNode();
     this.getBackNode();
   },
   },
   methods: {
   methods: {
     childFn () {
     childFn () {
       console.log(1111);
       console.log(1111);
     },
     },
-    getBackNode() {
+    getBackNode () {
       getTaskBackNode(this.formData).then(res => {
       getTaskBackNode(this.formData).then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.dataList = res.result
           this.dataList = res.result
         }
         }
       })
       })

@@ -164,7 +164,6 @@
   background-color: #3498db;
   background-color: #3498db;
   color: #ffffff;
   color: #ffffff;
   justify-content: space-between;
   justify-content: space-between;
-  padding-left: 15px;
   position: sticky;
   position: sticky;
   top: 0;
   top: 0;
   z-index: 100;
   z-index: 100;

@@ -203,7 +203,8 @@ export default {
           ...res.result.zdjbxxdatas,
           ...res.result.zdjbxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.jsydsyqdatas,
           ...res.result.jsydsyqdatas,
-        };
+        }
+        console.log(this.ruleForm, 'this.ruleFormthis.ruleFormthis.ruleForm');
       }
       }
     });
     });
   },
   },

@@ -177,7 +177,7 @@ import InformationTable from "@/views/workflow/components/InformationTable";
 import { Init } from "@/api/fwsyqFlow.js";
 import { Init } from "@/api/fwsyqFlow.js";
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 export default {
 export default {
-  async created () {
+  created () {
     this.propsParam = this.$attrs;
     this.propsParam = this.$attrs;
     var formdata = new FormData();
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
@@ -188,7 +188,7 @@ export default {
           ...res.result.zdjbxxdatas,
           ...res.result.zdjbxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.jsydsyqdatas,
           ...res.result.jsydsyqdatas,
-        };
+        }
       }
       }
     });
     });
   },
   },

@@ -173,24 +173,28 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import InformationTable from "@/views/workflow/components/InformationTable";
-import { Init, fristReg } from "@/api/jsydsyqFlow.js";
-import { mapGetters } from "vuex";
+import { mapGetters } from "vuex"
+import { Init, fristReg } from "@/api/jsydsyqFlow.js"
+import InformationTable from "@/views/workflow/components/InformationTable"
 export default {
 export default {
-  async created () {
+  created () {
     this.propsParam = this.$attrs;
     this.propsParam = this.$attrs;
     var formdata = new FormData();
     var formdata = new FormData();
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     formdata.append("bsmSldy", this.propsParam.bsmSldy);
     Init(formdata).then((res) => {
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
       if (res.code === 200 && res.result) {
+        this.ruleForm = {}
         this.ruleForm = {
         this.ruleForm = {
           ...res.result,
           ...res.result,
           ...res.result.zdjbxxdatas,
           ...res.result.zdjbxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.qlxxdatas,
           ...res.result.jsydsyqdatas,
           ...res.result.jsydsyqdatas,
-        };
+        }
+        if (this.ruleForm.gyfs == '1') {
+          this.ruleForm.qlrxx = [{}]
+        }
       }
       }
-    });
+    })
   },
   },
   components: { InformationTable },
   components: { InformationTable },
   computed: {
   computed: {