cf_cloud/myERP
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'yyw提交' (#3) from yyw into master

Browse Source 
Reviewed-on: http://192.168.9.51:3001/cf_cloud/myERP/pulls/3
This commit is contained in:
vivanlina 2025-06-20 03:04:39 +00:00
commit bd3c871720
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/commodity/combination.vue
View File

@ -46,6 +46,10 @@
<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>
@ -131,13 +135,13 @@
<script>
import { onMounted, reactive, toRefs } from "vue"
import { get, post } from "@/api/request"
import { Search, Plus, Edit, ZoomIn, Delete } from '@element-plus/icons'
import { Search, Plus, Edit, ZoomIn, Delete, Upload } from '@element-plus/icons'
import { ElMessage, ElMessageBox } from 'element-plus'
import { parseErrors } from 'components/common'
export default {
components: {
Search, Plus, Edit, ZoomIn, Delete
Search, Plus, Edit, ZoomIn, Delete, Upload
},
setup() {
const data = reactive({
@ -255,6 +259,18 @@ 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()
@ -271,7 +287,8 @@ export default {
commitOpa,
handleSkuDelete,
toAddSku,
getSkusList
getSkusList,
handleUpload
}
}

23
src/views/commodity/sku.vue
View File

@ -66,6 +66,10 @@
<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>
@ -145,13 +149,13 @@
<script>
import { onMounted, reactive, toRefs } from "vue"
import { get, post } from "@/api/request"
import { Search, Plus, Edit, ZoomIn, Delete } from '@element-plus/icons'
import { ElMessage } from 'element-plus'
import { Search, Plus, Edit, ZoomIn, Delete, Upload } from '@element-plus/icons'
import { ElMessage, ElMessageBox } from 'element-plus'
import { parseErrors } from 'components/common'
export default {
components: {
Search, Plus, Edit, ZoomIn, Delete
Search, Plus, Edit, ZoomIn, Delete, Upload
},
setup() {
const data = reactive({
@ -221,6 +225,18 @@ 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 = {
@ -291,6 +307,7 @@ export default {
fetchData,
handleAdd,
handleEdit,
handleUpload,
commitOpa,
getWarehouseList,
getGoodsList