Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/scheduling/schedulingPlan.vue

@@ -89,10 +89,10 @@
               <q-td v-else-if="col.name == 'Id'" style="width:200px;">
                 <div v-for="item in col.value">
                   <div class="border-bottom" style="border-bottom:0;">
-                    <q-btn v-if="props.row.DutyStatus==0||props.row.DutyStatus==1"  flat size="xs"  icon="edit"
+                    <q-btn v-if="item.DutyStatus==0||item.DutyStatus==1"  flat size="xs"  icon="edit"
                        style="font-weight:400;" color="edit"  class="q-mr-xs" label="修改"  @click="EditSchedu(props.row)"
                         />
-                    <q-btn v-if="props.row.DutyStatus==0"  flat size="xs"  icon="delete"  style="font-weight:400;"
+                    <q-btn v-if="item.DutyStatus==0"  flat size="xs"  icon="delete"  style="font-weight:400;"
                       color="negative"  class="q-mr-xs" label="删除"  @click="RemovePlan(props.row.Id)" />
                     <q-btn flat size="xs" icon="iconfont icon-View" style="font-weight:400;" class="q-mr-xs"  label="查看"
                        @click="GoToDutyInfo(item)"   />