Merge branch 'master' of http://47.101.207.123:3000/gbtomr/cm-agric

src/views/xmfzsb/projectConstruction/Detail.vue

@@ -62,6 +62,11 @@
 										<span>上报时间：</span><span>2023-05-31 08:28:45</span>
 									</div>
 								</div>
+								<el-popconfirm title="确定删除此项上报?" @confirm="">
+									<template #reference>
+										<i class="delete-btn" @click="e => e.stopPropagation()"></i>
+									</template>
+								</el-popconfirm>
 							</template>
 							<el-row :gutter="24">
 								<el-col :span="7" class="card-descriptions">
@@ -166,6 +171,8 @@ const drawPosShow = ref(false)
 function handleGeoPreview() {
 	drawPosShow.value = true
 }
+
+
 </script>
 
 <style lang="scss" scoped>
@@ -234,4 +241,13 @@ function handleGeoPreview() {
 	}
 }
 
+.delete-btn {
+	display: inline-block;
+	width: 25px;
+	height: 25px;
+	background: url('../../../assets/imgs/pages/delete-btn.png');
+	background-size: cover;
+	margin: 0 10px;
+}
+
 </style>

src/views/xmfzsb/projectDeclare/Detail.vue

@@ -328,7 +328,7 @@ import { PostDsxmAdd, PostDsxmDetailAdd, PutDsxmEdit, GetDsxmDetail } from '../.
 const router = useRouter()
 const route = useRoute()
 
-const step = ref(1)
+const step = ref(2)
 
 onMounted(() => {
 	if(route.params.type==='edit') {