From 668f251a5c8099d7edec59f40d1311a6785ef10c Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 21 五月 2024 14:40:58 +0800
Subject: [PATCH] 新增线索结论修改功能
---
src/views/overlay-clue/report/components/ClueReportConclusion.vue | 41 ++++++++++++-----------------------------
src/api/index.js | 2 +-
src/views/overlay-clue/report/ClueReport.vue | 8 +++++---
src/api/config.js | 2 +-
src/views/overlay-clue/ClueLayout.vue | 1 +
5 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/src/api/config.js b/src/api/config.js
index c322f3f..ff28cae 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -58,7 +58,7 @@
return Promise.reject(response.data.message);
}
} else {
- return response;
+ return response.data;
}
} else {
return Promise.reject(response);
diff --git a/src/api/index.js b/src/api/index.js
index 0ff0550..e42338e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
import { setInterceptors } from "./config";
const url = 'http://47.100.191.150:9031/';
-// const url = 'http://192.168.1.9:8080/';
+// const url = 'http://192.168.0.138:8083/';
const imgUrl = 'http://47.100.191.150:9031/images/';
//椋炵窘鐩戠
diff --git a/src/views/overlay-clue/ClueLayout.vue b/src/views/overlay-clue/ClueLayout.vue
index be9e728..4b786b6 100644
--- a/src/views/overlay-clue/ClueLayout.vue
+++ b/src/views/overlay-clue/ClueLayout.vue
@@ -7,6 +7,7 @@
<ClueReport
v-model:show="show"
:clueData="selectedClue"
+ @pushed="(e) => (selectedClue.cuploaded = e)"
></ClueReport>
</el-col>
</el-row>
diff --git a/src/views/overlay-clue/report/ClueReport.vue b/src/views/overlay-clue/report/ClueReport.vue
index 97f98d4..564199a 100644
--- a/src/views/overlay-clue/report/ClueReport.vue
+++ b/src/views/overlay-clue/report/ClueReport.vue
@@ -42,7 +42,7 @@
import ClueReportConclusion from './components/ClueReportConclusion.vue';
import ClueReportQuestion from './components/ClueReportQuestion.vue';
import { useMessageBoxTip } from '@/composables/messageBox';
-import clueApi from "@/api/clue/clueApi";
+import clueApi from '@/api/clue/clueApi';
export default {
components: {
@@ -59,7 +59,7 @@
},
show: Boolean
},
- emits: ['update:show'],
+ emits: ['update:show', 'pushed'],
data() {
return {};
},
@@ -77,7 +77,9 @@
});
},
pushClue() {
- return clueApi.pushClue(this.clueData.cid)
+ return clueApi.pushClue(this.clueData.cid).then((res) => {
+ this.$emit('pushed', res);
+ });
}
}
};
diff --git a/src/views/overlay-clue/report/components/ClueReportConclusion.vue b/src/views/overlay-clue/report/components/ClueReportConclusion.vue
index 31634b2..f62719f 100644
--- a/src/views/overlay-clue/report/components/ClueReportConclusion.vue
+++ b/src/views/overlay-clue/report/components/ClueReportConclusion.vue
@@ -1,18 +1,15 @@
<template>
- <div class="fy-h2">绾跨储缁撹</div>
- <DescriptionsList v-if="conclusion">
- <!-- <template #extra>
+ <!-- <div class="fy-h2">绾跨储缁撹</div> -->
+ <DescriptionsList v-if="conclusion" title="绾跨储缁撹">
+ <template #extra>
<el-button
- v-if="conclusion"
- type="warning"
+ type="primary"
size="small"
- plain
- icon="Upload"
- @click="pushConclusion"
- :disabled="pushing ? true : conclusion.ccUploaded"
- >{{ pushing ? '鎺ㄩ�佷腑' : pushText }}</el-button
+ :disabled="conclusion.ccUploaded"
+ @click="openDialog"
+ >淇敼缁撹</el-button
>
- </template> -->
+ </template>
<DescriptionsListItem
label="闂绫诲瀷"
:content="conclusion.ccQuestionType"
@@ -78,6 +75,7 @@
<script setup>
import { reactive, ref, watch, computed } from 'vue';
+import { useCloned } from '@vueuse/core';
import { useFormConfirm } from '@/composables/formConfirm';
import clueConclusionApi from '@/api/clue/clueConclusionApi';
@@ -91,9 +89,6 @@
getConclusion();
}
);
-
-// 鎺ㄩ�佺姸鎬�
-const pushing = ref(false);
// 绾跨储缁撹
const conclusion = ref({});
@@ -171,21 +166,9 @@
function getConclusion() {
clueConclusionApi.getConclusion(props.clueId).then((res) => {
conclusion.value = res;
+ formObj.value = res == null ? {} : res;
+ // formObj.value = useCloned(res, { manual: true });
});
}
-
-function pushConclusion() {
- clueConclusionApi
- .pushConclusion([conclusion.value.ccId])
- .then(() => {
- pushing.value = true;
- });
-}
-
-const pushText = computed(() => {
- return conclusion.value.ccUploaded ? '宸叉帹閫�' : '鎺ㄩ�侀棶棰�';
-});
</script>
-<style scoped>
-
-</style>
+<style scoped></style>
--
Gitblit v1.9.3