提交代码

src/views/mediaLibrary/components/accessControlPrice.vue

@@ -29,7 +29,7 @@
         <el-table-column label="总曝光/人次" align="center" prop="totalExposure" width="130" />
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true"/>
         <el-table-column label="AB面划分" align="center" prop="ab" width="150" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->

src/views/mediaLibrary/components/barrierGatePrice.vue

@@ -26,7 +26,7 @@
         <el-table-column label="总曝光/人次" align="center" prop="totalExposure" width="130" />
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" /> 
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
        <template v-if="showOptionColumn">

src/views/mediaLibrary/components/competitiveOffer.vue

@@ -25,7 +25,7 @@
         <el-table-column label="单日覆盖人流量" align="center" prop="dailyAvgPeopleFlow" width="150" />
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true"/>
         <el-table-column label="是否框内" align="center" prop="hasInBox" width="150" />
         <el-table-column label="成本" align="center" prop="cost" width="150" />
         <el-table-column label="制作成本" align="center" prop="makeCost" width="150" />

src/views/mediaLibrary/components/garageLightBox.vue

@@ -28,7 +28,7 @@
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
         <el-table-column label="成本折扣" align="center" prop="costDiscount" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
         <template v-if="showOptionColumn">

src/views/mediaLibrary/components/highSpeedRailway.vue

@@ -27,7 +27,7 @@
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
         <el-table-column label="成本折扣" align="center" prop="costDiscount" width="150" />
         <el-table-column label="成本" align="center" prop="cost" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
        <template v-if="showOptionColumn">

src/views/mediaLibrary/components/officeBuilding.vue

@@ -28,7 +28,7 @@
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
         <el-table-column label="成本折扣" align="center" prop="costDiscount" width="150" /> 
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
         <template v-if="showOptionColumn">
@@ -257,10 +257,13 @@ const handleSubmit = () => {
 }
 // 获取历史报价
 const getMediaPrice = (_mediaId, _showOptionColumn) => {
+            console.log('走了这里？')
     showOptionColumn.value = _showOptionColumn
     if (_mediaId) {
         mediaPrice({ mediaId: _mediaId }).then(res => { 
+            console.log('查询到报价', res.data)
             quotationList.value = res.data.filter(item => item.mediaType == 6)
+            console.log('过滤后数据', quotationList.value)
             quotationList.value.forEach(element => {
                 element.currentImageSrc = defaultImageSrc.value
             });

src/views/mediaLibrary/components/subwayPrice.vue

@@ -42,7 +42,7 @@
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" /> 
         <el-table-column label="覆盖热区" align="center" prop="coverHotZone" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
         <template v-if="showOptionColumn">

src/views/mediaLibrary/components/waitingHallPrice.vue

@@ -32,15 +32,10 @@
         <el-table-column label="总曝光/人次" align="center" prop="totalExposure" width="130" />
         <el-table-column label="SOV" align="center" prop="sov" width="150" />
         <el-table-column label="CPM" align="center" prop="cpm" width="150" />
-        <el-table-column label="是否亮灯" align="center" prop="hasLighting" width="150">
+        <el-table-column label="是否亮灯" align="center" prop="hasLighting" width="150" />
-            <template #default="scope">
-                <span v-if="scope.row.hasLighting == 0">否</span>
-                <span v-if="scope.row.hasLighting == 1">是</span>
-            </template>
-        </el-table-column>
         <el-table-column label="单面/双面" align="center" prop="oddEven" width="150" />
         <el-table-column label="中途换画制作费" align="center" prop="changeDrawMakeFee" width="150" />
-        <el-table-column label="备注" align="center" prop="remark" width="150" />
+        <el-table-column label="备注" align="center" prop="remark" width="230" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="录入人员" align="center" prop="postCode" width="150" />
         <el-table-column label="录入时间" align="center" prop="postCode" width="150" /> -->
         <template v-if="showOptionColumn">

src/views/mediaLibrary/importPrice.vue

@@ -87,32 +87,32 @@ const downloadImportTemplate = () => {
             link.download = '优势媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 1:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/门禁媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '门禁媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 2:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/候车厅媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '候车厅媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 3:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/道闸媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '道闸媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 4:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/地铁媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '地铁媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 5:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/高铁媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '高铁媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 6:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/写字楼媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '写字楼媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         case 7:
-            link.href = '/ES任职资格表.docx'
+            link.href = '/车库灯箱媒体报价导入模板.xlsx'
-            link.download = 'ES任职资格表.docx' // 设置下载文件名
+            link.download = '车库灯箱媒体报价导入模板.xlsx' // 设置下载文件名
             break;
         default:
             break;

src/views/mediaLibrary/mediaDetail.vue

@@ -517,12 +517,19 @@ const handleClose = () => {
     emit('handleShowList')
 }
 // 折叠面板点击
-const handleChange = (val) => { 
+const handleChange = (val) => {
     activeNames.value = val
 }
 // 报价类型切换
-const handlePriceTypeClick = (tab, event) => { 
+const handlePriceTypeClick = (tab, event) => {
-    activePriceType.value = tab
+    activePriceType.value = tab.props.name
+    if (activePriceType.value == '门禁') accessControlPriceRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '候车厅') waitingHallPriceRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '道闸') barrierGatePriceRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '地铁') subwayPriceRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '高铁') highSpeedRailwayRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '写字楼') officeBuildingRef.value.getMediaPrice(detailForm.value.id, false)
+    if (activePriceType.value == '车库灯箱') garageLightBoxRef.value.getMediaPrice(detailForm.value.id, false)
 }
 // 初始化
 const handleChangeDept = (val) => {

src/views/mediaLibrary/mediaForm.vue

@@ -643,7 +643,14 @@ const handleChange = (val) => {
 }
 // 报价类型切换
 const handlePriceTypeClick = (tab, event) => {
-    activePriceType.value = tab
+    activePriceType.value = tab.props.name
+    if (activePriceType.value == '门禁') accessControlPriceRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '候车厅') waitingHallPriceRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '道闸') barrierGatePriceRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '地铁') subwayPriceRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '高铁') highSpeedRailwayRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '写字楼') officeBuildingRef.value.getMediaPrice(ruleForm.value.id, true)
+    if (activePriceType.value == '车库灯箱') garageLightBoxRef.value.getMediaPrice(ruleForm.value.id, true)
 }
 // 打开拾取经纬度弹窗
 const handlePickLat = () => {

src/views/pitchPrice/index.vue

@@ -35,11 +35,13 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column label="供应商" align="left" prop="supplierName" width="180" :show-overflow-tooltip="true"/>
+                <el-table-column label="供应商" align="left" prop="supplierName" width="180"
+                    :show-overflow-tooltip="true" />
                 <el-table-column label="城市" align="center" prop="city" width="130" />
                 <el-table-column label="场站" align="center" prop="station" width="100" />
-                <el-table-column label="媒体位置" align="center" prop="mediaPlacement" min-width="260" :show-overflow-tooltip="true"/>
+                <el-table-column label="媒体位置" align="center" prop="mediaPlacement" min-width="260"
-                <el-table-column label="频次" align="center" prop="frequency" width="150" :show-overflow-tooltip="true"/>
+                    :show-overflow-tooltip="true" />
+                <el-table-column label="频次" align="center" prop="frequency" width="150" :show-overflow-tooltip="true" />
                 <el-table-column label="刊例价" align="center" prop="subscriptionPrice" width="120" />
                 <el-table-column label="单位" align="center" prop="unit" width="100" />
                 <el-table-column label="折扣" align="center" prop="discount" width="100" />
@@ -61,9 +63,11 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column label="供应商" align="left" prop="supplierName" width="180" :show-overflow-tooltip="true"/>
+                <el-table-column label="供应商" align="left" prop="supplierName" width="180"
+                    :show-overflow-tooltip="true" />
                 <el-table-column label="城市" align="center" prop="city" width="130" />
-                <el-table-column label="资源描述" align="center" prop="resourceDesc" min-width="160" :show-overflow-tooltip="true"/>
+                <el-table-column label="资源描述" align="center" prop="resourceDesc" min-width="160"
+                    :show-overflow-tooltip="true" />
                 <el-table-column label="刊例价" align="center" prop="subscriptionPrice" width="130" />
                 <el-table-column label="单位" align="center" prop="unit" width="100" />
                 <el-table-column label="折扣" align="center" prop="discount" width="100" />
@@ -86,10 +90,12 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column label="供应商" align="left" prop="supplierName" width="180" :show-overflow-tooltip="true"/>
+                <el-table-column label="供应商" align="left" prop="supplierName" width="180"
+                    :show-overflow-tooltip="true" />
                 <el-table-column label="城市" align="center" prop="city" width="130" />
-                <el-table-column label="媒体名称" align="center" prop="mediaPlacement" min-width="260" :show-overflow-tooltip="true"/>
+                <el-table-column label="媒体名称" align="center" prop="mediaPlacement" min-width="260"
-                <el-table-column label="频次" align="center" prop="frequency" width="150" :show-overflow-tooltip="true"/>
+                    :show-overflow-tooltip="true" />
+                <el-table-column label="频次" align="center" prop="frequency" width="150" :show-overflow-tooltip="true" />
                 <el-table-column label="刊例价" align="center" prop="subscriptionPrice" width="120" />
                 <el-table-column label="单位" align="center" prop="unit" width="100" />
                 <el-table-column label="折扣" align="center" prop="discount" width="100" />
@@ -210,8 +216,21 @@
                 <template #tip>
                     <div class="el-upload__tip text-center">
                         <span>仅允许导入xls、xlsx格式文件。</span>
-                        <el-link type="primary" underline="never" style="font-size: 12px; vertical-align: baseline"
+                        <el-dropdown placement="bottom-start" style="margin-left: 12px;margin-top: 4px;">
-                            @click="importTemplate">下载示例模板</el-link>
+                            <el-link type="primary" underline="never"
+                                style="font-size: 12px; vertical-align: baseline">下载示例模板</el-link>
+                            <template #dropdown>
+                                <el-dropdown-menu>
+                                    <el-dropdown-item class="dropItem"
+                                        @click="importTemplate('gt')">下载高铁比稿价模板</el-dropdown-item>
+                                    <el-dropdown-item class="dropItem"
+                                        @click="importTemplate('hct')">下载候车厅比稿价模板</el-dropdown-item>
+                                    <el-dropdown-item class="dropItem"
+                                        @click="importTemplate('mjdz')">下载门禁道闸比稿价模板</el-dropdown-item>
+                                </el-dropdown-menu>
+                            </template>
+                        </el-dropdown>
+
                     </div>
                 </template>
             </el-upload>
@@ -384,13 +403,13 @@ const requestDocUpload = (options) => {
     const { file } = options
     var formData = new FormData();
     formData.append('file', file);
-    importSupplierComparePrice(formData).then(res => { 
+    importSupplierComparePrice(formData).then(res => {
         if (res.code == 200) {
             proxy.$modal.msgSuccess("导入成功")
             proxy.$modal.closeLoading()
             uploadOpen.value = false
             getPitchPricePage()
-        } else { 
+        } else {
             proxy.$modal.closeLoading()
             proxy.$modal.msgError(res.msg);
         }
@@ -416,10 +435,24 @@ const removeDocUpload = (file, fileList) => {
     );
 }
 // 下载导入示例模板操作
-const importTemplate = () => {
+const importTemplate = (_type) => {
-    const link = document.createElement('a') 
+    const link = document.createElement('a')
-    link.href = '/比稿价导入示例模板.xlsx'
+    switch (_type) {
-    link.download = '比稿价导入示例模板.xlsx' // 设置下载文件名 
+        case 'gt':
+            link.href = '/高铁比稿价导入示例模板.xlsx'
+            link.download = '高铁比稿价导入示例模板.xlsx' // 设置下载文件名 
+            break;
+        case 'hct':
+            link.href = '/候车厅比稿价导入示例模板.xlsx'
+            link.download = '候车厅比稿价导入示例模板.xlsx' // 设置下载文件名 
+            break;
+        case 'mjdz':
+            link.href = '/门禁道闸比稿价导入示例模板.xlsx'
+            link.download = '门禁道闸比稿价导入示例模板.xlsx' // 设置下载文件名 
+            break;
+        default:
+            break;
+    }
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)