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

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

@@ -39,7 +39,8 @@
                       <span>{{ second_item.user.name }}</span>
                       <span>{{ second_item.status==0?"待接收":second_item.status==1?"进行中":second_item.status==2?"已完工":second_item.status==3?"已中止":"已换人"}}</span>
                       <span class="" v-if="second_item.status==3" @click.stop="distributionProp(planList.planProcedureTotals[0],'change', second_item)"  style="color: #1989fa;">换人</span>
-                      <span class="" v-if="second_item.status==0&&second_item.isChange==1" @click.stop="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
+                      <!-- <span class="" v-if="second_item.status==0&&second_item.isChange==1" @click.stop="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span> -->
+                      <span class="" v-if="second_item.status==0" @click.stop="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
                 </div>
                 <p style="margin-top:20px;">
                   <span class="" v-if="beDeptList" @click.stop="distributionProp(planList.planProcedureTotals[0],'add')"  style="color: #1989fa;">新增</span>

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

@@ -51,7 +51,8 @@
                             <span>{{ second_item.user.name }}</span>
                             <span>{{ second_item.status==0?"待接收":second_item.status==1?"进行中":second_item.status==2?"已完工":second_item.status==3?"已中止":"已换人"}}</span>
                             <span class="" v-if="second_item.status==3&&beDeptList" @click="distributionProp(item,index,'change', second_item)"  style="color: #1989fa;">换人</span>
-                            <span class="" v-if="second_item.status==0&&second_item.isChange==1&&beDeptList" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
+                            <!-- <span class="" v-if="second_item.status==0&&second_item.isChange==1&&beDeptList" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span> -->
+                            <span class="" v-if="second_item.status==0&&beDeptList" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
                       </div>
                       <p style="margin-top:20px;">
                         <span class="" v-if="beDeptList" @click="distributionProp(item,index,'add')"  style="color: #1989fa;">新增</span>