Merge remote-tracking branch 'origin/develop' into develop

2021-06-22 13:39:07 +08:00
parent bb760d6bb4 21bc8229c5
commit 215ee4e324
1 changed files with 9 additions and 2 deletions
@@ -1098,8 +1098,15 @@ export default {
      this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
        _this: this, loading: 'loading'
      }, res => {
-        console.log(res.data)
-        this.localProTableList = res.data.Maintenance.records
+        // console.log(res.data)
+        if (this.localProTableSearch.prodectCode === 'Maintenance') {
+          this.localProTableList = res.data.Maintenance.records
+        }
+        else if (this.localProTableSearch.prodectCode === 'notMaintenance')
+        {
+          this.localProTableList = res.data.notMaintenance.records
+
+        }
        this.total = res.data.count
        // this.localProTableList.map((item) => {
        //   this.xmztOptions.map((opr) => {