学情报告修改

src/utils/operation.js

@@ -285,6 +285,7 @@ export function isOverlap(startA, endA, startB, endB) {
 }
 export function setRegionOption(data) {
   let option = [];
+  option[0] = {id: 0, value: 0, label: "全部", leaf: true};
   for (let i = 0; i < data.length; i++) {
     let obj = data[i];
     obj.label = data[i].provinceName;

src/views/learning/data-alignment.vue

@@ -54,6 +54,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="姓名:">
+        <el-input v-model="formData.name" placeholder="请输入人员名称"></el-input>
+      </el-form-item>
     </el-form>
     <div class="form-button">
       <el-button @click="searchData()" type="primary">查询</el-button>
@@ -137,6 +140,7 @@ export default {
       formData: {
         achievementStatus: "",
         status: 1,
+        name: '',
         pageNo: 1,
         pageSize: 20,
       },
@@ -317,6 +321,7 @@ export default {
         {
           achievementStatus: "",
           status: 1,
+          name: '',
           pageNo: 1,
           pageSize: 20,
         }

src/views/learning/item-list.vue

@@ -26,7 +26,7 @@
             @change="changeOrganization"
             multiple
             collapse-tags
-            :disabled="formInline.region.length !== 3"
+            :disabled="formInline.region.length < 3"
             style="width:330px"
           >
             <el-option
@@ -182,6 +182,15 @@ export default {
               console.log("newData", newData);
               resolve(newData);
             });
+          } else if (node.level == 3) {
+            let req = {
+              countyId: node.data.value
+            };
+            vm.GET("basic-data/position/towns", req).then(res => {
+              let newData = vm.setMoreOption(res.data.townList, "towns");
+              console.log("newData", newData);
+              resolve(newData);
+            });
           }
         }
       },
@@ -297,6 +306,10 @@ export default {
         } else if (type == "counties") {
           obj.label = data[i].countyName;
           obj.value = data[i].countyId;
+          // obj.leaf = true;
+        } else if (type == "towns") {
+          obj.label = data[i].townName;
+          obj.value = data[i].townId;
           obj.leaf = true;
         }
         option.push(obj);