Compare commits

..

No commits in common. "bd3c8717209f6aac3298d2d7a61fc18ad5cc6e09" and "d2eae2a288c271afaeb7bbff017f698ead8d8525" have entirely different histories.

2 changed files with 6 additions and 40 deletions

View File

@ -46,10 +46,6 @@
<el-table-column label="操作" align="center" width="150">
<template #default="scope">
<el-button type="primary" circle @click="handleEdit(scope.row)"><el-icon><Edit /></el-icon></el-button>
<el-tooltip effect="dark" content="上传商品到聚水潭" placement="top">
<el-button type="primary" circle @click="handleUpload(scope.row)"><el-icon><Upload /></el-icon></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@ -135,13 +131,13 @@
<script>
import { onMounted, reactive, toRefs } from "vue"
import { get, post } from "@/api/request"
import { Search, Plus, Edit, ZoomIn, Delete, Upload } from '@element-plus/icons'
import { Search, Plus, Edit, ZoomIn, Delete } from '@element-plus/icons'
import { ElMessage, ElMessageBox } from 'element-plus'
import { parseErrors } from 'components/common'
export default {
components: {
Search, Plus, Edit, ZoomIn, Delete, Upload
Search, Plus, Edit, ZoomIn, Delete
},
setup() {
const data = reactive({
@ -259,18 +255,6 @@ export default {
})
}
function handleUpload(row) {
ElMessageBox.confirm('确定操作上传吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
post(`/api/combination/goods/jstUpload/${row.id}`, {}, 'PUT').then(() => {
ElMessage({ type: 'success', message: '操作成功' })
})
})
}
onMounted(() => {
fetchData()
getSkusList()
@ -287,8 +271,7 @@ export default {
commitOpa,
handleSkuDelete,
toAddSku,
getSkusList,
handleUpload
getSkusList
}
}

View File

@ -66,10 +66,6 @@
<el-table-column label="操作" align="center" width="150">
<template #default="scope">
<el-button type="primary" circle @click="handleEdit(scope.row)"><el-icon><Edit /></el-icon></el-button>
<el-tooltip effect="dark" content="上传商品到聚水潭" placement="top">
<el-button type="primary" circle @click="handleUpload(scope.row)"><el-icon><Upload /></el-icon></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@ -149,13 +145,13 @@
<script>
import { onMounted, reactive, toRefs } from "vue"
import { get, post } from "@/api/request"
import { Search, Plus, Edit, ZoomIn, Delete, Upload } from '@element-plus/icons'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search, Plus, Edit, ZoomIn, Delete } from '@element-plus/icons'
import { ElMessage } from 'element-plus'
import { parseErrors } from 'components/common'
export default {
components: {
Search, Plus, Edit, ZoomIn, Delete, Upload
Search, Plus, Edit, ZoomIn, Delete
},
setup() {
const data = reactive({
@ -225,18 +221,6 @@ export default {
data.showDialog = true
}
function handleUpload(row) {
ElMessageBox.confirm('确定操作上传吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
post(`/api/goods/sku/jstUpload/${row.id}`, {}, 'PUT').then(() => {
ElMessage({ type: 'success', message: '操作成功' })
})
})
}
function commitOpa() {
data.opa_loading = true
let params = {
@ -307,7 +291,6 @@ export default {
fetchData,
handleAdd,
handleEdit,
handleUpload,
commitOpa,
getWarehouseList,
getGoodsList