Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -505,7 +505,7 @@ export default {
         feedReady() {
             // 准备上料
             if (this.sectionid == 0) {
-                this.$Message.error("请选择工位");
+                this.$Message.error("请选择生产线、工位");
                 return false;
             }
             let data = {

Html/src/view/fml/statistical_analysis/taskList.vue

@@ -10,6 +10,7 @@
                         class="searchSelect"
                         :data="datalevel"
                         :value="leveldata"
+                        @on-change="getSectionId"
                     ></Cascader>
                 </div>
                 <div class="filter">
@@ -300,6 +301,7 @@ export default {
             startTime: [],
             endTime: [],
             detailobj: {},
+            sectionid:0
         };
     },
     created() {
@@ -311,7 +313,7 @@ export default {
     methods: {
         search(page, pagesize) {
             let params = {
-                section: this.sectionId,
+                section: this.sectionid,
                 tasktype: this.taskType,
                 productCode: this.productCode,
                 sn: this.sn,
@@ -340,6 +342,13 @@ export default {
                     this.total = res.data.data.total;
                 });
         },
+        getSectionId(val) {
+            this.leveldata = val;
+            this.sectionid =
+                this.leveldata.length > 0
+                    ? this.leveldata[this.leveldata.length - 1]
+                    : 0;
+        },
         cancel() {
             console.log(this.detailobj);
             if (!this.detailobj.id) {