Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -101,6 +101,8 @@ export default {
     this.paiArr = ['收起', '展开']
     this.type = 0
     this.productList = this.planList
+    console.log(this.productList, '<=== 数据来源')
+    console.log(this.planList, '<=== 数据来源')
    },
   methods: {
     workShowHide(index) {

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/todayPlan.vue

@@ -48,26 +48,26 @@ export default {
           res.data.records.forEach(item => { item.flg = false })
           // this.planList = res.data.records;
           this.planList = []
-          res.data.records.forEach((item => {
-            const newProgress = item.progress.split('%')[0]
-            const progressFlag = newProgress ? (newProgress > 0 && newProgress < 100) ? true : false : false
-            if(item.progress) {
-              item.newProgress = newProgress
-            }
-            const { hasAllocation, hasAllAllocation } = item
-            if(hasAllocation && !hasAllAllocation) {
-              item.backgroundClass = 'blues'
-              return
-            }
-            if(progressFlag) {
-              item.backgroundClass = 'reds'
-              return
-            }
-            if(hasAllocation && hasAllAllocation) {
-              item.backgroundClass = 'greens'
-              return
-            }
-          }))
+          // res.data.records.forEach((item => {
+          //   const newProgress = item.progress && item.progress.split('%')[0]
+          //   const progressFlag = newProgress ? (newProgress > 0 && newProgress < 100) ? true : false : false
+          //   if(item.progress) {
+          //     item.newProgress = newProgress
+          //   }
+          //   const { hasAllocation, hasAllAllocation } = item
+          //   if(hasAllocation && !hasAllAllocation) {
+          //     item.backgroundClass = 'blues'
+          //     return
+          //   }
+          //   if(progressFlag) {
+          //     item.backgroundClass = 'reds'
+          //     return
+          //   }
+          //   if(hasAllocation && hasAllAllocation) {
+          //     item.backgroundClass = 'greens'
+          //     return
+          //   }
+          // }))
           setTimeout(() => {
             this.$set(this, 'planList', res.data.records)
           }, 100)