From 823380611206cb386c1aa6233adecc7387d8a8be Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Wed, 10 Sep 2025 20:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mediaLibrary/abolishDialog.vue | 60 ++++++++++++++++++++++++
 src/views/mediaLibrary/index.vue         | 53 ++++-----------------
 src/views/mediaLibrary/mediaDetail.vue   |  6 +--
 src/views/mediaLibrary/mediaForm.vue     | 38 ++++++++-------
 src/views/outdoorMedia/index.vue         | 13 +----
 src/views/supplier/supplierForm.vue      |  4 +-
 6 files changed, 96 insertions(+), 78 deletions(-)
 create mode 100644 src/views/mediaLibrary/abolishDialog.vue

diff --git a/src/views/mediaLibrary/abolishDialog.vue b/src/views/mediaLibrary/abolishDialog.vue
new file mode 100644
index 0000000..6d4e54e
--- /dev/null
+++ b/src/views/mediaLibrary/abolishDialog.vue
@@ -0,0 +1,60 @@
+<template>
+    <!-- 废除对话框 -->
+    <el-dialog title="废除" v-model="abolishOpen" width="650px" class="my_dialog" align-center :destroy-on-close="true"
+        :close-on-click-modal="false">
+        <el-form ref="abolishRef" :model="abolishForm" :rules="abolishRules" label-width="120px" label-position="top"
+            class="myFeedBackForm">
+            <el-form-item label="输入废除原因" prop="invalidReason">
+                <el-input v-model="abolishForm.invalidReason" style="width: 100%" :rows="5" type="textarea" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button class="my-cancel-btn" @click="abolishOpen = false">取 消</el-button>
+                <el-button class="my-confirm-btn" type="primary" @click="handleSubmitAbolish">确 定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script setup>
+import { onMounted, defineExpose, ref } from 'vue';
+import { mediaCancel } from "@/api/mediaLibrary"
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['handleReloadList']);
+const abolishOpen = ref(false)
+
+const data = reactive({
+    abolishForm: {},
+    abolishRules: {
+        invalidReason: [{ required: true, message: "请输入废除原因", trigger: "blur" }],
+    }
+})
+const { abolishForm, abolishRules } = toRefs(data)
+
+const openDialog = (_mediaId) => {
+    abolishForm.value = {
+        mediaId: _mediaId,
+        invalidReason: undefined
+    }
+    abolishOpen.value = true
+}
+
+// 提交废除
+const handleSubmitAbolish = () => {
+    proxy.$refs["abolishRef"].validate(valid => {
+        if (valid) {
+            mediaCancel(abolishForm.value).then(response => {
+                proxy.$modal.msgSuccess("操作成功")
+                abolishOpen.value = false
+                abolishForm.value = {}
+                emit('handleReloadList')
+            })
+        }
+    })
+}
+
+// 暴露方法\属性给父组件
+defineExpose({
+    openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/mediaLibrary/index.vue b/src/views/mediaLibrary/index.vue
index 2bb80cf..9296d9c 100644
--- a/src/views/mediaLibrary/index.vue
+++ b/src/views/mediaLibrary/index.vue
@@ -161,7 +161,8 @@
                             <el-popover popper-class="myImg_popover" placement="right-start">
                                 <img :src="otherbg" />
                                 <template #reference>
-                                    <span class="mediaNameLabel" @click="handleOpenDetail(scope.row.id)">{{ scope.row.mediaName
+                                    <span class="mediaNameLabel" @click="handleOpenDetail(scope.row.id)">{{
+                                        scope.row.mediaName
                                     }}</span>
                                 </template>
                             </el-popover>
@@ -238,27 +239,11 @@
         <media-form ref="mediaFormRef" v-if="showForm" @handleShowList="handleShowList" />
         <media-detail ref="mediaDetailRef" v-if="showDetail" @handleShowList="handleCloseDetail" />
         <media-logs ref="mediaLogsRef" v-if="showLogs" @handleShowList="handleCloseLogs" />
+        <abolish-dialog ref="abolishRef" @handleReloadList="getMediaPageList" /> 
         <history-data ref="historyDataRef" />
         <down-files ref="downFileRef" />
         <view-file-dialog ref="viewFileRef" />
         <export-dialog ref="exportDialogRef" />
-
-        <!-- 废除对话框 -->
-        <el-dialog title="废除" v-model="abolishOpen" width="650px" class="my_dialog" align-center
-            :destroy-on-close="true" :close-on-click-modal="false">
-            <el-form ref="abolishRef" :model="abolishForm" :rules="abolishRules" label-width="120px"
-                label-position="top" class="myFeedBackForm">
-                <el-form-item label="输入废除原因" prop="content">
-                    <el-input v-model="abolishForm.content" style="width: 100%" :rows="5" type="textarea" />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button class="my-cancel-btn" @click="abolishOpen = false">取 消</el-button>
-                    <el-button class="my-confirm-btn" type="primary" @click="handleSubmitAbolish">确 定</el-button>
-                </div>
-            </template>
-        </el-dialog>
         <!-- 导入对话框 -->
         <el-dialog title="导入" v-model="uploadOpen" width="650px" class="my_dialog" align-center :destroy-on-close="true"
             :close-on-click-modal="false">
@@ -335,7 +320,7 @@ import { listBusSupplier } from "@/api/supplier"
 import { sysRegionListByPid } from "@/api/system/administrativeRegion"
 import { sysMediaTypeListByPid } from "@/api/system/mediaType"
 import { busTradingAreaPage } from "@/api/system/businessArea"
-import { mediaPageList, mediaCancel } from "@/api/mediaLibrary"
+import { mediaPageList } from "@/api/mediaLibrary"
 import { listDept } from "@/api/system/dept"
 // 注入组件
 import mediaForm from "./mediaForm.vue";
@@ -345,6 +330,7 @@ import historyData from "./historyData.vue"
 import downFiles from './downFiles.vue';
 import viewFileDialog from '@/components/ViewFile/index.vue'
 import exportDialog from './exportDialog.vue';
+import abolishDialog from './abolishDialog.vue';
 import { useBackgroundStore } from '@/store/modules/background'
 
 const router = useRouter()
@@ -380,8 +366,6 @@ const mediaList = ref([])
 const loading = ref(true)
 const total = ref(0)
 const data = reactive({
-    abolishForm: {},
-    form: {},
     queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -400,11 +384,8 @@ const data = reactive({
         townCode: undefined,
         businessDistrictId: undefined
     },
-    abolishRules: {
-        content: [{ required: true, message: "请输入废除原因", trigger: "blur" }],
-    }
 })
-const { queryParams, form, abolishForm, abolishRules } = toRefs(data)
+const { queryParams } = toRefs(data)
 // 表单
 const showForm = ref(false)
 const mediaFormRef = ref(null)
@@ -418,7 +399,7 @@ const mediaLogsRef = ref(null)
 
 const uploadOpen = ref(false)
 const docUploadList = ref([])
-const abolishOpen = ref(false)
+const abolishRef = ref(null)
 const historyDataRef = ref(null)
 const downFileRef = ref(null)
 const viewFileRef = ref(null)
@@ -575,7 +556,7 @@ const handleQuery = () => {
 }
 
 /** 重置按钮操作 */
-const resetQuery = () => { 
+const resetQuery = () => {
     handleQuery()
 }
 
@@ -633,23 +614,7 @@ const handleCloseLogs = () => {
 }
 // 打开废除
 const handleAbolish = (row) => {
-    abolishOpen.value = true
-}
-// 提交废除
-const handleSubmitAbolish = () => {
-    proxy.$refs["abolishRef"].validate(valid => {
-        if (valid) {
-            //   addSysReaddBusProblemFeedbackgion(form.value).then(response => {
-            //     proxy.$modal.msgSuccess("反馈成功")
-            //     openFeedBack.value = false
-            //     form.value = {
-            //       feedbackUser: undefined,
-            //       content: undefined
-            //     }
-            //     proxy.resetForm("feedBackRef")
-            //   })
-        }
-    })
+    abolishRef.value.abolishOpen.openDialog(row.id)
 }
 // 打开历史数据
 const handleHistoryChart = (row) => {
diff --git a/src/views/mediaLibrary/mediaDetail.vue b/src/views/mediaLibrary/mediaDetail.vue
index 715a4b5..5d61c06 100644
--- a/src/views/mediaLibrary/mediaDetail.vue
+++ b/src/views/mediaLibrary/mediaDetail.vue
@@ -46,17 +46,17 @@
                     <el-row :gutter="30" class="my_form_row">
                         <el-col :span="6">
                             <el-form-item label="媒体类型" prop="business_department">
-                                {{ detailForm.mediaType }}
+                                {{ detailForm.mediaTypeStr }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="媒体大类" prop="business_department">
-                                {{ detailForm.mediaCategory }}
+                                {{ detailForm.mediaCategoryStr }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="展示形式" prop="business_department">
-                                {{ detailForm.displayForm }}
+                                {{ detailForm.displayFormStr }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="6" v-if="detailForm.business == '优势媒体部门'">
diff --git a/src/views/mediaLibrary/mediaForm.vue b/src/views/mediaLibrary/mediaForm.vue
index a854c63..01e970e 100644
--- a/src/views/mediaLibrary/mediaForm.vue
+++ b/src/views/mediaLibrary/mediaForm.vue
@@ -16,8 +16,8 @@
                             <el-form-item label="业务部门" prop="businessType">
                                 <el-select v-model="ruleForm.businessType" placeholder="请选择" @change="handleChangeDept"
                                     clearable style="min-width: 30px;">
-                                    <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
-                                        :value="item.deptId" />
+                                    <el-option v-for="item in deptList" :key="item.value" :label="item.label"
+                                        :value="item.value" />
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -523,7 +523,7 @@ import { Close, LocationInformation } from '@element-plus/icons-vue'
 import { listBusSupplier } from "@/api/supplier"
 import { sysRegionListByPid } from "@/api/system/administrativeRegion"
 import { sysMediaTypeListByPid } from "@/api/system/mediaType"
-import { listDept } from "@/api/system/dept"
+// import { listDept } from "@/api/system/dept"
 import { busTradingAreaPage } from "@/api/system/businessArea"
 import { addMedia, updateMedia, mediaDetail } from "@/api/mediaLibrary"
 
@@ -605,7 +605,10 @@ const city = ref([])
 const county = ref([])
 const town = ref([])
 // 业务部门
-const deptList = ref([])
+const deptList = ref([
+    { value: 1, label: '优势媒体部' },
+    { value: 2, label: '网络媒体部' }
+])
 // 归属选项
 const supplierList = ref([])
 const selectLoading = ref(false)
@@ -658,9 +661,10 @@ const handleClosePickLat = (backValue) => {
 // 业务部门切换
 const businessTypeName = ref('优势媒体部')
 const handleChangeDept = (val) => {
-    const choseDep = deptList.value.filter(item => item.deptId == val)[0]
-    ruleForm.value.businessType = choseDep?.deptId
-    businessTypeName.value = choseDep?.deptName
+    const choseDep = deptList.value.filter(item => item.value == val)[0]
+    console.log('部门', choseDep)
+    ruleForm.value.businessType = choseDep?.value
+    businessTypeName.value = choseDep?.label
     nextTick(() => {
         if (businessTypeName.value == '优势媒体部' && competitiveOfferRef.value) competitiveOfferRef.value.getMediaPrice(ruleForm.value.id, true)
         if (businessTypeName.value == '网络媒体部' && activePriceType.value == '门禁') accessControlPriceRef.value.getMediaPrice(ruleForm.value.id, true)
@@ -707,11 +711,11 @@ const getMediaTypeThree = (value) => {
     })
 }
 // 获取业务部门
-const getDepList = () => {
-    listDept({ businessFlag: 1 }).then(response => {
-        deptList.value = response.data
-    })
-}
+// const getDepList = () => {
+//     listDept({ businessFlag: 1 }).then(response => {
+//         deptList.value = response.data
+//     })
+// }
 // 查询条件获取供应商
 const getSupplierList = (queryText) => {
     if (queryText) {
@@ -763,7 +767,7 @@ const getCityList = (value) => {
 const getCountyList = (value) => {
     var choseCity = city.value.filter(item => item.id == value)[0]
     if (choseCity) {
-        ruleForm.value.mediaCity = ruleForm.value.mediaCity + '/' + choseCity.name
+        ruleForm.value.mediaCity = ruleForm.value.provinceName + '/' + choseCity.name
         ruleForm.value.cityName = choseCity.name
     } else {
         ruleForm.value.cityCode = undefined
@@ -786,7 +790,7 @@ const getCountyList = (value) => {
 const getTownList = (value) => {
     var choseCounty = county.value.filter(item => item.id == value)[0]
     if (choseCounty) {
-        ruleForm.value.mediaCity = ruleForm.value.mediaCity + '/' + choseCounty.name
+        ruleForm.value.mediaCity = ruleForm.value.provinceName + '/' + ruleForm.value.cityName + '/' + choseCounty.name
         ruleForm.value.areaName = choseCounty.name
     } else {
         ruleForm.value.areaCode = undefined
@@ -805,7 +809,7 @@ const getTownList = (value) => {
 const setTown = (value) => {
     var choseTown = town.value.filter(item => item.id == value)[0]
     if (choseTown) {
-        ruleForm.value.mediaCity = ruleForm.value.mediaCity + '/' + choseTown.name
+        ruleForm.value.mediaCity = ruleForm.value.provinceName + '/' + ruleForm.value.cityName + '/' + ruleForm.value.areaName + '/' + choseTown.name
         ruleForm.value.townName = choseTown.name
     }
     getbusinessAreaList()
@@ -895,7 +899,7 @@ const getMediaInfo = () => {
     mediaDetail(ruleForm.value.id).then(res => {
         ruleForm.value = res.data
         handleChangeDept(res.data.businessType)
-        if (ruleForm.value.mediaFile && ruleForm.value.mediaFile.length > 0) {  
+        if (ruleForm.value.mediaFile && ruleForm.value.mediaFile.length > 0) {
             if (approvalDocumentRef.value) {
                 const fileList = ruleForm.value.mediaFile.filter(item => item.fileType == 1)
                 approvalDocumentRef.value.setFileInfo(fileList)
@@ -972,7 +976,7 @@ async function handleResponse(response) {
 const initForm = (_formTitle, _ruleForm) => {
     formTitle.value = _formTitle
     ruleForm.value = _ruleForm
-    getDepList()
+    // getDepList()
     getMediaTypeOne()
     getProvinceList()
     if (ruleForm.value.id) getMediaInfo()
diff --git a/src/views/outdoorMedia/index.vue b/src/views/outdoorMedia/index.vue
index 737e48e..7096e46 100644
--- a/src/views/outdoorMedia/index.vue
+++ b/src/views/outdoorMedia/index.vue
@@ -112,18 +112,7 @@
                                 <img :src="otherbg" fit="fill" style="width: 138px;height: 78px; border-radius: 4px" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="媒体名称" align="left" prop="mediaName" width="150">
-                            <template #default="scope">
-                                <el-popover popper-class="myImg_popover" placement="right-start">
-                                    <img :src="otherbg" />
-                                    <template #reference>
-                                        <span class="mediaNameLabel" @click="handleOpenDetail">{{ scope.row.mediaName
-                                        }}</span>
-                                    </template>
-                                </el-popover>
-
-                            </template>
-                        </el-table-column>
+                        <el-table-column label="媒体名称" align="left" prop="mediaName" width="150" />
                         <el-table-column label="商圈" align="left" prop="postCode" width="150" />
                         <el-table-column label="媒体大类" align="left" prop="postCode" width="150" />
                         <el-table-column label="展示形式" align="left" prop="postCode" width="150" />
diff --git a/src/views/supplier/supplierForm.vue b/src/views/supplier/supplierForm.vue
index c55e137..471a9a8 100644
--- a/src/views/supplier/supplierForm.vue
+++ b/src/views/supplier/supplierForm.vue
@@ -417,7 +417,7 @@ const getCityList2 = (value) => {
 // 获取区/县数据
 const getCountyList = (value) => {
     var choseCity = city.value.filter(item => item.id == value)[0]
-    if (choseCity) ruleForm.value.supplierCity = ruleForm.value.supplierCity + '/' + choseCity.name
+    if (choseCity) ruleForm.value.supplierCity = ruleForm.value.provinceName + '/' + choseCity.name
     sysRegionListByPid({ parentId: value }).then(res => {
         ruleForm.value.countyId = undefined
         county.value = res.data
@@ -427,7 +427,7 @@ const getCountyList = (value) => {
 // 设置末级供应商城市
 const setCounty = (value) => {
     var choseCounty = county.value.filter(item => item.id == value)[0]
-    if (choseCounty) ruleForm.value.supplierCity = ruleForm.value.supplierCity + '/' + choseCounty.name
+    if (choseCounty) ruleForm.value.supplierCity =ruleForm.value.provinceName+ '/' + ruleForm.value.cityName + '/' + choseCounty.name
 }
 
 // 详情信息联动 设置区/县数据