Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier

.env.production

@@ -3,6 +3,6 @@ VUE_APP_ENV = 'Prod'
 NODE_ENV = 'production'
 # base api
 #广州线上
-#VUE_APP_BASE_API = 'http://10.122.64.94:8093'
+VUE_APP_BASE_API = 'http://10.122.64.94:8093'
 #广州供应商门户线上
-VUE_APP_BASE_API = 'http://8.134.64.94:8097'
+#VUE_APP_BASE_API = 'http://8.134.64.94:8097'

src/views/productplan/workbench/schedule.vue

@@ -822,9 +822,9 @@
           gantt.parse({
             data: data
           })
-          // data.forEach((item) => {
-          //   gantt.getAnothersStore().addItem(item)
-          // })
+          data.forEach((item) => {
+            gantt.getAnothersStore().addItem(item)
+          })
           if (code === 200) {
             // 通过WorLineId 动态取值
             this.addMarker(WorklineDict[this.parms['WorkLine-WorkLineid']] || {})