Merge branch 'develop' into 'test'

Develop See merge request !64
2021-08-06 09:31:58 +00:00
parent eb0d227f21 16e221c5ca
commit 625cdd98d6
4 changed files with 7 additions and 5 deletions
@@ -190,7 +190,7 @@
          <p>点击或拖拽上传文件</p>
        </div>
      </el-upload>
-      <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>
+<!--      <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>-->
    </el-dialog>
  </div>
 </template>
@@ -597,13 +597,13 @@
                    //     this.form.itemsNum = bringData[0].showNumber
                    //     this.form.itemsName = bringData[0].standName
                    // }
-                    this.form.standId = bringData[0].id
+                    this.form.standId = bringData[0].standId
                    this.sarType = bringData[0].standType
                    this.standId = bringData[0].standId
                    this.listModel = false;
                    this.listModel2 = true
                    this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.standId,
+                        infoId: bringData[0].id,
                        page: 1,
                        pageSize: 9999
                    }, {
@@ -602,13 +602,13 @@
                    //     this.form.itemsNum = bringData[0].showNumber
                    //     this.form.itemsName = bringData[0].standName
                    // }
-                    this.form.standId = bringData[0].id
+                    this.form.standId = bringData[0].standId
                    this.sarType = bringData[0].standType
                    this.standId = bringData[0].standId
                    this.listModel = false;
                    this.listModel2 = true
                    this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.standId,
+                        infoId: bringData[0].id,
                        page: 1,
                        pageSize: 9999
                    }, {
@@ -281,6 +281,7 @@ export default {
        cid: '', // 编号
        endTime: '', // 结束日期
        cname: '', // 名称
+        standType: '',
      },
      formRules: {
        cid: [
@@ -454,6 +455,7 @@ export default {
        } else {
          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
        }
+        this.form.standType = bringData[0].standType
        this.form.cname = bringData[0].standName;
        this.listModel = false;
      } else if (this.selectedList.length > 1) {