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

@@ -477,13 +477,29 @@
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-          ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "blur" }],
+        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "change" }],
          djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
          djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
          ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
          ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
       },
       },
-        ableOperation: false,
+      ableOperation:false,
     };
     };
   },
   },
+  created() {
+    this.loadData();
+  },
+  mounted() {
+      this.ableOperation=this.$parent.ableOperation
+  },
+  methods: {
+    /**
+     * @description: ssQlxxchange
+     * @param {*} val
+     * @author: renchao
+     */
+              ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+     this.ruleForm.qlxx.ssywh = val.ywh;
+    },
     created () {
     created () {
       this.loadData();
       this.loadData();
     },
     },
@@ -645,7 +661,8 @@
         });
         });
       },
       },
     },
     },
-  };
+  }
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
   @import "~@/styles/public.scss";
   @import "~@/styles/public.scss";

@@ -22,7 +22,7 @@
                 @change="changeSelectItem(item)"></el-radio>
                 @change="changeSelectItem(item)"></el-radio>
             </p>
             </p>
             <p>{{ item.activityName }}</p>
             <p>{{ item.activityName }}</p>
-            <p v-for="(child, childIndex) in item.userInfos" :key="childIndex">
+            <p v-for="(child, childIndex) in item.assignee" :key="childIndex">
               {{ child.name }}
               {{ child.name }}
             </p>
             </p>
           </li>
           </li>
@@ -113,6 +113,7 @@
         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;
+            console.log("this.dataList",this.dataList);
             if (res.result) {
             if (res.result) {
               this.selectActivity = res.result[0].activityId;
               this.selectActivity = res.result[0].activityId;
               this.selectItem = res.result[0];
               this.selectItem = res.result[0];