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

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

@@ -101,7 +101,7 @@ export default {
     teamAllocation(item, nameArr){
       let newPlanList = JSON.parse(JSON.stringify(this.planList))
       delete newPlanList.planProcedureTotals[0].prodProcedure
-      delete newPlanList.prodProcedureTeamList
+      delete newPlanList.planProcedureTotals[0].prodProcedureTeamList
       this.$axios.post('/plan/teamAllocation', {
         ...newPlanList.planProcedureTotals[0],
         teamIds: item.join(","),

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

@@ -40,7 +40,7 @@
             <span class="" v-if="item.teamNames">{{ item.teamNames }}</span>
             <span style="color: #1989fa;" v-if="!item.teamNames && beDeptList" @click="distributionProp(item,index,'add')">分配</span>
             <div>
-              <span style="color: #1989fa;" v-if="item.prodProcedureTeamList.length>0" @click="workShowHide(index)">{{ item.flg ? paiArr[0] : paiArr[1] }}</span>
+              <span style="color: #1989fa;"  @click="workShowHide(index)">{{ item.flg ? paiArr[0] : paiArr[1] }}</span>
             </div>
           </div>
           <div style="width: 100%">