wangchengming/YouKeChuanMei_VUE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangchengming:c024fc8ca2ea06986215b3727ed3d190148f4a1c
Branches Tags
wangchengming:master
wangchengming:dev
..
compare: wangchengming:ca707233fbd3b24b9b0e2f0eba7e01ba88106d96
Branches Tags
wangchengming:dev
wangchengming:master

No commits in common. "c024fc8ca2ea06986215b3727ed3d190148f4a1c" and "ca707233fbd3b24b9b0e2f0eba7e01ba88106d96" have entirely different histories.
c024fc8ca2 ... ca707233fb

3 changed files with 19 additions and 28 deletions
Show Stats Expand all files Collapse all files

2
src/views/mediaLibrary/importPrice.vue
View File

@ -31,7 +31,6 @@ import { onMounted, ref } from 'vue';
import { importPriceByExcel } from "@/api/mediaLibrary" import { importPriceByExcel } from "@/api/mediaLibrary"
const emit = defineEmits(['handleReloadList']);
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const title = ref('导入报价') const title = ref('导入报价')
const open = ref(false) const open = ref(false)
@ -55,7 +54,6 @@ const requestDocUpload = (options) => {
proxy.$modal.msgSuccess("导入成功") proxy.$modal.msgSuccess("导入成功")
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
open.value = false open.value = false
emit('handleReloadList')
} else { } else {
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
proxy.$modal.msgError(res.msg); proxy.$modal.msgError(res.msg);

4
src/views/mediaLibrary/index.vue
View File

@ -267,13 +267,13 @@
<media-form ref="mediaFormRef" v-if="showForm" @handleShowList="handleShowList" /> <media-form ref="mediaFormRef" v-if="showForm" @handleShowList="handleShowList" />
<media-detail ref="mediaDetailRef" v-if="showDetail" @handleShowList="handleCloseDetail" /> <media-detail ref="mediaDetailRef" v-if="showDetail" @handleShowList="handleCloseDetail" />
<media-logs ref="mediaLogsRef" v-if="showLogs" @handleShowList="handleCloseLogs" /> <media-logs ref="mediaLogsRef" v-if="showLogs" @handleShowList="handleCloseLogs" />
<abolish-dialog ref="abolishRef" @handleReloadList="handleQuery" /> <abolish-dialog ref="abolishRef" @handleReloadList="getMediaPageList" />
<history-data ref="historyDataRef" /> <history-data ref="historyDataRef" />
<down-files ref="downFileRef" @downBack="handleDownBack" /> <down-files ref="downFileRef" @downBack="handleDownBack" />
<view-file-dialog ref="viewFileRef" /> <view-file-dialog ref="viewFileRef" />
<export-dialog ref="exportDialogRef" /> <export-dialog ref="exportDialogRef" />
<export-p-p-t-dialog ref="exportPPTDialogRef" /> <export-p-p-t-dialog ref="exportPPTDialogRef" />
<importPrice ref="importPriceRef" @handleReloadList="handleQuery"/> <importPrice ref="importPriceRef" />
<down-records ref="downRecordsRef" /> <down-records ref="downRecordsRef" />
</div> </div>
</template> </template>

41
src/views/supplier/index.vue
View File

@ -4,7 +4,7 @@
<div class="searchPanel"> <div class="searchPanel">
<div class="more-search-pane"> <div class="more-search-pane">
<div class="search-where-container"> <div class="search-where-container">
<el-form :inline="true" class="searchPanelForm"> <el-form :inline="true" class="searchPanelForm">
<el-form-item label="业务部门:"> <el-form-item label="业务部门:">
<el-select v-model="queryParams.yewuDept" placeholder="请选择" clearable <el-select v-model="queryParams.yewuDept" placeholder="请选择" clearable
style="min-width: 30px;"> style="min-width: 30px;">
@ -118,25 +118,18 @@
<el-col :span="12"> <el-col :span="12">
<el-form :inline="true" class="searchInputForm"> <el-form :inline="true" class="searchInputForm">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="queryParams.keyword" @keydown.enter.prevent="handleQuery" <el-input v-model="queryParams.keyword" @keydown.enter.prevent="handleQuery" placeholder="请输入供应商名称/集团公司名称/联系人/联系人电话"
placeholder="请输入供应商名称/集团公司名称/联系人/联系人电话" :prefix-icon="Search" :prefix-icon="Search" style="width: 500px;" />
style="width: 500px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="12" style="text-align: right;"> <el-col :span="12" style="text-align: right;">
<el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:query']" <el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:query']" @click="handleQuery">查询</el-button>
@click="handleQuery">查询</el-button> <el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:reset']" @click="resetQuery">重置</el-button>
<el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:reset']" <el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:add']" @click="handleOpenAddForm">新增</el-button>
@click="resetQuery">重置</el-button> <el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:import']" @click="handleImport">导入</el-button>
<el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:add']" <el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:export']" @click="handleExport">导出</el-button>
@click="handleOpenAddForm">新增</el-button> <el-button type="primary" class="primaryBtn" v-hasPermi="['pitchPrice:list']" @click="handleGoPitchPrice">比稿价管理</el-button>
<el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:import']"
@click="handleImport">导入</el-button>
<el-button type="primary" class="primaryBtn" v-hasPermi="['supplier:export']"
@click="handleExport">导出</el-button>
<el-button type="primary" class="primaryBtn" v-hasPermi="['pitchPrice:list']"
@click="handleGoPitchPrice">比稿价管理</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -152,7 +145,7 @@
<template #default="scope"> <template #default="scope">
<span class="supplierNameLabel" @click="handleOpenDetail(scope.row.supplierId)">{{ <span class="supplierNameLabel" @click="handleOpenDetail(scope.row.supplierId)">{{
scope.row.supplierName scope.row.supplierName
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="城市" align="left" prop="supplierCity" width="180" <el-table-column label="城市" align="left" prop="supplierCity" width="180"
@ -191,12 +184,12 @@
<el-table-column label="操作" width="58" align="center" fixed="right"> <el-table-column label="操作" width="58" align="center" fixed="right">
<template #default="scope"> <template #default="scope">
<el-popover popper-class="my_popover" placement="left-start"> <el-popover popper-class="my_popover" placement="left-start">
<div class="popBtns" @click="handleUpdate(scope.row)" v-hasPermi="['supplier:update']"> <div class="popBtns" @click="handleUpdate(scope.row)"
修改</div> v-hasPermi="['supplier:update']">修改</div>
<div class="popBtns" @click="handleDelete(scope.row)" v-hasPermi="['supplier:delete']"> <div class="popBtns" @click="handleDelete(scope.row)"
删除</div> v-hasPermi="['supplier:delete']">删除</div>
<div class="popBtns" @click="handleLogs(scope.row)" v-hasPermi="['supplier:log']">日志 <div class="popBtns" @click="handleLogs(scope.row)"
</div> v-hasPermi="['supplier:log']">日志</div>
<template #reference> <template #reference>
<img style="cursor: pointer;" :src="scope.row.currentImageSrc" <img style="cursor: pointer;" :src="scope.row.currentImageSrc"
@mouseenter="scope.row.currentImageSrc = hoverImageSrc" @mouseenter="scope.row.currentImageSrc = hoverImageSrc"
@ -407,8 +400,8 @@ const requestDocUpload = (options) => {
uploadOpen.value = false uploadOpen.value = false
getSupplierPageList() getSupplierPageList()
} else { } else {
proxy.$modal.msgError(res.msg);
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
proxy.$modal.msgError(res.msg);
} }
}) })
} }