Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/SyCarryList.vue

@@ -84,6 +84,9 @@
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-if="record.state == '0'">
                   <a>删除</a>
                 </a-popconfirm>
+                <a-popconfirm title="确定计划员取消提交吗?" @confirm="() => plannerSubmit(record,-1)"  v-if="record.state == '1' || record.state == '2'">
+                  <a >计划员取消提交</a>
+                </a-popconfirm>
                 <a-popconfirm title="确定计划员提交吗?" @confirm="() => plannerSubmit(record,1)" v-if="record.state == '0'">
                   <a >计划员提交</a>
                 </a-popconfirm>