Merge remote-tracking branch 'origin/dev-yqLive-20200611' into dev-yqLive-20200611

src/components/yqrange/organzation.vue

@@ -103,6 +103,7 @@
         totalOrganization: 10,
         pageSizeOrganization: 2,
         activeName:"",
+        selectionList:"",
         formOrganization: {
           name: "",
           administrativeId: "0",
@@ -186,6 +187,7 @@
       },
       //机构table中勾选一个
       selectOrganization(selection, row) {
+        this.selectionList = selection;
         console.log("select", selection, row);
         let flag = false;
         for (let i = 0; i < selection.length; i++) {
@@ -212,6 +214,7 @@
       },
       //机构table中勾选一排
       selectAllOrganization(selection) {
+        this.selectionList = selection;
         let setList = [];
         let selectList = [];
         for (let i = 0; i < vm.tableOrganization.length; i++) {

src/views/yqrange/create-range.vue

@@ -22,7 +22,7 @@
         </base-info>
       </div>
       <div class="second-step" v-else-if="active === 1">
-        <organzation :formData="formData"></organzation>
+        <organzation :formData="formData" ref="org"></organzation>
       </div>
     </div>
   </div>
@@ -85,6 +85,10 @@
 
       //完成
       complete() {
+        if(this.$refs.org.selectionList == null || this.$refs.org.selectionList == ""){
+          this.$message.warning('请选择机构');
+          return;
+        }
         console.log(this.formData.id);
         let req = {
           circleId: this.formData.id,
@@ -140,8 +144,8 @@
             vm.formData.id = res.data;
             this.active = 1;
             this.stepData = [false, true];
-         
-          
+
+
           } else {
             //
           }
@@ -203,4 +207,4 @@
       }
     }
   }
-</style>
+</style>
\ No newline at end of file