diff --git a/src/components/MyComponents/PackageSelect/index.vue b/src/components/MyComponents/PackageSelect/index.vue new file mode 100644 index 0000000..3eacd18 --- /dev/null +++ b/src/components/MyComponents/PackageSelect/index.vue @@ -0,0 +1,55 @@ + + + + diff --git a/src/components/MyComponents/index.js b/src/components/MyComponents/index.js index fdc8f68..5582f68 100644 --- a/src/components/MyComponents/index.js +++ b/src/components/MyComponents/index.js @@ -18,6 +18,7 @@ import MarkdownEdit from "./MarkdownEdit/index.vue"; import FileUpload from "./FileUpload/index.vue"; import Date from "./Date/index.vue"; import Empty from "./Empty/index.vue"; +import PackageSelect from "./PackageSelect/index.vue"; export { AddressSelect, FrameWork, @@ -38,5 +39,6 @@ export { MarkdownEdit, FileUpload, Date, - Empty + Empty, + PackageSelect }; diff --git a/src/components/flowPath/SelectingPeople.vue b/src/components/flowPath/SelectingPeople.vue index 1bbb3d6..45f491a 100644 --- a/src/components/flowPath/SelectingPeople.vue +++ b/src/components/flowPath/SelectingPeople.vue @@ -26,14 +26,14 @@
-
+
{{ item.nodeName }} - + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/DetailDialog.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/DetailDialog.vue new file mode 100644 index 0000000..317e269 --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/DetailDialog.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelApproveDialog.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelApproveDialog.vue new file mode 100644 index 0000000..3a28312 --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelApproveDialog.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelDetailDialog.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelDetailDialog.vue new file mode 100644 index 0000000..19ab5b5 --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelDetailDialog.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelReview.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelReview.vue new file mode 100644 index 0000000..0f951a2 --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/LabelReview.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/NormalReview.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/NormalReview.vue new file mode 100644 index 0000000..107dfca --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/NormalReview.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/TempReview.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/TempReview.vue new file mode 100644 index 0000000..7b2ab4a --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/components/TempReview.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/index.vue new file mode 100644 index 0000000..d91726b --- /dev/null +++ b/src/views/backOfficeSystem/IntelligentControl/ReviewListControl/index.vue @@ -0,0 +1,37 @@ + + diff --git a/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue index 8f4ea71..68aaca4 100644 --- a/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue +++ b/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue @@ -24,9 +24,13 @@ + @@ -56,7 +60,7 @@ import SubmissionProcess from '@/components/flowPath/submissionProcess.vue' import { qcckGet, qcckPost } from "@/api/qcckApi.js"; import { reactive, ref, onMounted, getCurrentInstance } from "vue"; const { proxy } = getCurrentInstance(); -const {D_GS_SSYJ} = proxy.$dict("D_GS_SSYJ"); //获取字典数据 +const {D_GS_SSYJ,D_GS_BK_ZT} = proxy.$dict("D_GS_SSYJ","D_GS_BK_ZT"); //获取字典数据 const searchBox = ref(); const addForm = ref() const searchConfiger = ref([ @@ -92,8 +96,9 @@ const pageData = reactive({ tableColumn: [ { label: "布控标签", prop: "bqmc" }, { label: "标签代码", prop: "bqdm" }, - { label: "标签颜色", prop: "bqys", showSolt: true }, + { label: "标签颜色", prop: "bqys", showSolt: true }, { label: "标签描述", prop: "bqsm" }, + { label: "审核状态", prop: "shzt", showSolt: true } ] }); onMounted(() => { @@ -170,6 +175,25 @@ const createProcess = (row) => { showSp.value = true; rowData.value = row } + +function handleSS (row) { + proxy.$confirm('确认送审吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + qcckGet({}, "/mosty-gsxt/gsxt/bqbk/submitApproval/"+row.id).then((res) => { + proxy.$message({ + message: '送审成功', + type: 'success' + }); + getList(); + + }).catch(() => { + pageData.tableConfiger.loading = false; + }); + }) +} // 表格高度计算 const tabHeightFn = () => { pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 220; diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue index b130b70..b66e415 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue @@ -10,8 +10,13 @@
- +