Compare commits

..

No commits in common. '4ded4ec7240a7f7d253aa7c39d2e2a4efef48feb' and '60140e6b40da57b95eea2b9103d85d9ed8b113b5' have entirely different histories.

  1. 2
      src/components/data/complaint_detail.vue
  2. 17
      src/views/data/ComplaintCollection.vue
  3. 27
      src/views/work/Confinement.vue

2
src/components/data/complaint_detail.vue

@ -93,7 +93,7 @@
<span>{{ getDictLabel(dict?.accountabilityTarget, base.accountabilityTarget) }}</span>
</div>
<div class="col col-24">
<div class="col col-12">
<label>问题核查情况
</label>
<span>{{ base.checkStatusDesc }}</span>

17
src/views/data/ComplaintCollection.vue

@ -147,7 +147,7 @@
</el-form>
<div class="mb-25 flex between">
<div>
<el-button type="primary" :disabled="!canAdd" @click="add()">添加</el-button>
<el-button type="primary" @click="add()">添加</el-button>
<el-button type="primary" @click="handleExport">数据导出</el-button>
</div>
<div>
@ -364,12 +364,11 @@ import {
updateComplaintCollection
} from "@/api/data/complaintCollection.ts";
import Complaint_detail from "@/components/data/complaint_detail.vue";
import useUserStore from "@/stores/modules/user.ts";
const route = useRoute()
const catchStore = useCatchStore();
const show = ref(false);
const userStore = useUserStore();
// region
@ -404,7 +403,6 @@ const list = ref([]);
const total = ref(0);
const loading = ref(false)
const getList = async () => {
hasPermission()
console.log("===============xxx==================")
console.log(dict.value.sfssSourceTable)
loading.value = true;
@ -442,17 +440,6 @@ onMounted(() => {
// endregion
// region
//
function hasPermission() {
console.log("=================userStore===================")
console.log(userStore.user)
return userStore.user.roleCodes.includes('admin_1')
}
const canAdd = computed(() => hasPermission())
const createEmptyAddForm = () => ({
//
sourcePath: [],

27
src/views/work/Confinement.vue

@ -307,14 +307,7 @@ function getDaysBetweenDates(date1, date2) {
return diffDays;
}
//
const show = ref(false);
const activeNegativeId = ref("");
function handleAction(row) {
show.value = true;
activeNegativeId.value = row.negativeId;
}
onMounted(() => {
@ -469,11 +462,6 @@ onMounted(() => {
</div>
</template>
</el-table-column>
<el-table-column label="是否关联问题" width="120">
<template #default="{ row }">
<span>{{ row.negativeId ? '是' : '/' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" min-width="180">
<template #default="{ row }">
<div class="flex v-center">
@ -498,14 +486,6 @@ onMounted(() => {
>
删除
</el-button>
<el-button
v-if="row.negativeId"
type="primary"
link
@click="handleAction(row)"
>
问题详情
</el-button>
</div>
</template>
</el-table-column>
@ -935,13 +915,6 @@ onMounted(() => {
</footer>
</el-dialog>
<!-- 问题详情 -->
<negative-dialog
v-model="show"
:id="activeNegativeId"
@close="show = false"
ref="negativeDialogRef"
/>
</div>
</template>

Loading…
Cancel
Save