Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
This commit is contained in:
zjf committed
commit
ae84ffef91
15 files changed
+428
-47
No files matched your search
+5
-5
@@ -8,18 +8,18 @@ VITE_OPEN = true
|
||||
ENV = 'development'
|
||||
|
||||
# ADMIN 服务地址
|
||||
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
|
||||
VITE_ADMIN_PROXY_PATH = http://47.96.250.9:8089/api/ # 测试线上
|
||||
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
|
||||
# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
|
||||
VITE_ADMIN_PROXY_PATH = http://192.168.101.64:9999/ # 邓-本地
|
||||
# VITE_ADMIN_PROXY_PATH = http://192.168.101.64:9999/ # 邓-本地
|
||||
# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
|
||||
|
||||
# 图片访问基础地址
|
||||
# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 测试线上
|
||||
# VITE_IMAGE_BASE_PATH = http://47.96.250.9:8089/api # 测试线上
|
||||
# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
|
||||
# VITE_IMAGE_BASE_PATH = http://localhost:9999
|
||||
VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地
|
||||
# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
|
||||
# VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地
|
||||
VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
|
||||
|
||||
# 代码生成服务地址
|
||||
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
|
||||
@@ -0,0 +1,27 @@
|
||||
import { defineStore } from "pinia"
|
||||
|
||||
export const usePurchase = defineStore("purchase", {
|
||||
state: () => ({
|
||||
smErpCgPlan: {
|
||||
id: "",
|
||||
disabled: false,
|
||||
},
|
||||
}),
|
||||
actions: {
|
||||
setSmErpCgPlanId(id: string) {
|
||||
this.smErpCgPlan.id = id
|
||||
},
|
||||
setSmErpCgPlanDisabled(disabled: boolean) {
|
||||
this.smErpCgPlan.disabled = disabled
|
||||
},
|
||||
},
|
||||
persist: {
|
||||
enabled: true,
|
||||
strategies: [
|
||||
{
|
||||
key: "smErpCgPlan", //自定义 Key值
|
||||
storage: localStorage, // 选择存储方式
|
||||
},
|
||||
],
|
||||
},
|
||||
})
|
||||
@@ -18,11 +18,11 @@
|
||||
<el-form-item label="经办人" prop="handlerUserId">
|
||||
<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="审批状态" prop="checkStatus">
|
||||
<el-form-item label="审批状态" prop="checkStatus">
|
||||
<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
|
||||
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
@@ -76,11 +76,11 @@
|
||||
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<dict-tag :options="check_status" :value="row.checkStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
|
||||
@@ -120,7 +120,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
|
||||
const router = useRouter()
|
||||
const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status")
|
||||
const { check_status } = useDict("check_status")
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
|
||||
@@ -76,11 +76,11 @@
|
||||
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="check_status" :value="scope.row.checkStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
|
||||
|
||||
@@ -165,7 +165,9 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan"
|
||||
import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
|
||||
import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
|
||||
import { formatDate } from "/@/utils/formatTime"
|
||||
import { usePurchase } from "/@/stores/purchase"
|
||||
|
||||
const purchaseStore = usePurchase()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
|
||||
@@ -212,7 +214,8 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
|
||||
// 初始化数据
|
||||
const getInitData = async () => {
|
||||
baseDataForm.id = undefined
|
||||
const id = route.query.id as string
|
||||
// const id = route.query.id as string
|
||||
const id = purchaseStore.smErpCgPlan.id
|
||||
if (id) {
|
||||
loading.value = true
|
||||
// 获取补货申请编号 & 获取简要商品列表
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="审批状态" prop="checkStatus">
|
||||
<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
|
||||
<el-option label="请选择" value="00" />
|
||||
<el-option v-for="(item, index) in check_status" :key="index" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@@ -64,7 +64,11 @@
|
||||
<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<dict-tag :options="check_status" :value="row.checkStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
@@ -93,7 +97,10 @@ import { useRouter } from "vue-router"
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { usePurchase } from "/@/stores/purchase"
|
||||
|
||||
const { check_status } = useDict("check_status")
|
||||
const router = useRouter()
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
@@ -101,6 +108,7 @@ const showSearch = ref(true)
|
||||
// 多选变量
|
||||
const selectObjs = ref([]) as any
|
||||
const multiple = ref(true)
|
||||
const purchaseStore = usePurchase()
|
||||
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
queryForm: {},
|
||||
@@ -130,9 +138,17 @@ const selectionChangHandle = (objs: { id: string }[]) => {
|
||||
}
|
||||
|
||||
// 点击创建采购清单
|
||||
const handleClickCreateCgPlan = () => router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
|
||||
const handleClickCreateCgPlan = () => {
|
||||
purchaseStore.setSmErpCgPlanId("")
|
||||
purchaseStore.setSmErpCgPlanDisabled(false)
|
||||
router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
|
||||
}
|
||||
// 点击编辑采购清单
|
||||
const handleClickEditCgPlan = (id: string) => router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form", query: { id } })
|
||||
const handleClickEditCgPlan = (id: string) => {
|
||||
purchaseStore.setSmErpCgPlanId(id)
|
||||
purchaseStore.setSmErpCgPlanDisabled(false)
|
||||
router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
|
||||
}
|
||||
|
||||
// 删除操作
|
||||
const handleDelete = async (ids: string[]) => {
|
||||
|
||||
@@ -117,7 +117,9 @@ import { useRouter } from "vue-router"
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
|
||||
const { check_status } = useDict("check_status")
|
||||
const router = useRouter()
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
|
||||
@@ -120,7 +120,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
|
||||
const router = useRouter()
|
||||
const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status")
|
||||
const { check_status } = useDict("check_status")
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
|
||||
@@ -128,6 +128,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import FormDialog from "./form.vue"
|
||||
import { getSupplierTypeSimpleAll } from "/@/api/supermarketerp/smErpSupplierType"
|
||||
import UploadExcel from "./upload-excel.vue"
|
||||
|
||||
const { status } = useDict("status")
|
||||
const formDialogRef = ref()
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
<!-- excel 导入组件 -->
|
||||
<template>
|
||||
<el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
|
||||
<el-upload
|
||||
v-loading="state.upload.isUploading"
|
||||
ref="uploadRef"
|
||||
:limit="1"
|
||||
accept=".xlsx, .xls"
|
||||
:headers="headers"
|
||||
:action="baseURL + other.adaptationUrl(url)"
|
||||
:disabled="state.upload.isUploading"
|
||||
:on-progress="handleFileUploadProgress"
|
||||
:on-success="handleFileSuccess"
|
||||
:on-error="handleFileError"
|
||||
:auto-upload="false"
|
||||
drag
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">
|
||||
{{ $t("excel.operationNotice") }}
|
||||
<em>{{ $t("excel.clickUpload") }}</em>
|
||||
</div>
|
||||
<template #tip>
|
||||
<div class="el-upload__tip text-center">
|
||||
<span>{{ $t("excel.fileFormat") }}</span>
|
||||
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="downExcelTemp" v-if="tempUrl"
|
||||
>{{ $t("excel.downloadTemplate") }}
|
||||
</el-link>
|
||||
</div>
|
||||
</template>
|
||||
</el-upload>
|
||||
<template #footer>
|
||||
<el-button type="primary" @click="submitFileForm" :disabled="state.upload.isUploading">
|
||||
{{ $t("common.confirmButtonText") }}
|
||||
</el-button>
|
||||
<el-button @click="state.upload.open = false">{{ $t("common.cancelButtonText") }}</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!--校验失败错误数据-->
|
||||
<el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible" :close-on-click-modal="false" draggable>
|
||||
<el-table :data="state.errorData">
|
||||
<el-table-column property="row" align="center" :label="$t('excel.lineNumbers')" width="100" />
|
||||
<el-table-column property="reasons" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
|
||||
<template v-slot="scope">
|
||||
<el-tag type="danger" v-for="error in scope.row.reasons" :key="error">{{ error }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="upload-excel">
|
||||
import { useMessage } from "/@/hooks/message"
|
||||
import other from "/@/utils/other"
|
||||
import { Session } from "/@/utils/storage"
|
||||
|
||||
const emit = defineEmits(["sizeChange", "refreshDataList"])
|
||||
const prop = defineProps({
|
||||
url: {
|
||||
type: String,
|
||||
},
|
||||
title: {
|
||||
type: String,
|
||||
},
|
||||
tempUrl: {
|
||||
type: String,
|
||||
},
|
||||
})
|
||||
|
||||
const uploadRef = ref()
|
||||
|
||||
const state = reactive({
|
||||
errorVisible: false,
|
||||
errorData: [],
|
||||
dialog: {
|
||||
title: "",
|
||||
isShowDialog: false,
|
||||
},
|
||||
upload: {
|
||||
open: false,
|
||||
isUploading: false,
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* 下载模板文件
|
||||
*/
|
||||
const downExcelTemp = async () => {
|
||||
try {
|
||||
await other.downBlobFile(other.adaptationUrl(prop.tempUrl), {}, "temp.xlsx")
|
||||
} catch (error) {
|
||||
useMessage().error("模板下载失败，请先维护模板文件")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传进度条变化事件
|
||||
*/
|
||||
const handleFileUploadProgress = () => {
|
||||
state.upload.isUploading = true
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传失败事件处理
|
||||
*/
|
||||
const handleFileError = () => {
|
||||
useMessage().error("上传失败,数据格式不合法!")
|
||||
state.upload.open = false
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传成功事件处理
|
||||
* @param {any} response - 上传成功的响应结果
|
||||
*/
|
||||
const handleFileSuccess = (response: any) => {
|
||||
state.upload.isUploading = false
|
||||
state.upload.open = false
|
||||
uploadRef.value.clearFiles()
|
||||
|
||||
// 校验失败
|
||||
if (response.code === 1) {
|
||||
useMessage().error(response.msg ? response.msg : "导入失败，以下数据不合法")
|
||||
state.errorVisible = true
|
||||
state.errorData = response.data?.errors
|
||||
uploadRef.value.clearFiles()
|
||||
// 刷新表格
|
||||
emit?.("refreshDataList")
|
||||
} else {
|
||||
useMessage().success(response.msg ? response.msg : "导入成功")
|
||||
// 刷新表格
|
||||
emit?.("refreshDataList")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交表单，触发上传
|
||||
*/
|
||||
const submitFileForm = () => {
|
||||
uploadRef.value.submit()
|
||||
}
|
||||
|
||||
/**
|
||||
* 显示上传文件对话框，并清除上传信息
|
||||
*/
|
||||
const show = () => {
|
||||
state.upload.isUploading = false
|
||||
state.upload.open = true
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算请求头部信息
|
||||
*/
|
||||
const headers = computed(() => {
|
||||
return {
|
||||
Authorization: "Bearer " + Session.getToken(),
|
||||
"TENANT-ID": Session.getTenant(),
|
||||
}
|
||||
})
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
show,
|
||||
})
|
||||
</script>
|
||||
@@ -18,11 +18,11 @@
|
||||
<el-form-item label="经办人" prop="handlerUserId">
|
||||
<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="审批状态" prop="checkStatus">-->
|
||||
<!-- <el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
|
||||
<!-- <el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="审批状态" prop="checkStatus">-->
|
||||
<!-- <el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
|
||||
<!-- <el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item>
|
||||
<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
@@ -56,20 +56,20 @@
|
||||
<el-table-column type="index" label="#" width="50" />
|
||||
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
|
||||
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="productName" label="入库商品" show-overflow-tooltip />-->
|
||||
<!-- <el-table-column prop="productName" label="入库商品" show-overflow-tooltip /> -->
|
||||
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column prop="supplierId" label="货商" show-overflow-tooltip />-->
|
||||
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<dict-tag :options="check_status" :value="row.checkStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
|
||||
<!-- <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip /> -->
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
<el-button icon="edit-pen" text type="primary" @click="handleClickEditStockTaking(scope.row.id)">编辑</el-button>
|
||||
<el-button icon="delete" text type="primary" @click="handleDelete([scope.row.id])"> 删除 </el-button>
|
||||
<el-button icon="delete" text type="primary" @click="handleDelete([scope.row.id])">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -83,10 +83,10 @@ import { useRouter } from "vue-router"
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { getStockTakingPage } from "/@/api/supermarketerp/stockTaking"
|
||||
import { fetchList } from "/@/api/supermarketerp/smErpCgDd"
|
||||
|
||||
const router = useRouter()
|
||||
const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status")
|
||||
const { check_status } = useDict("check_status")
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
@@ -96,9 +96,9 @@ const multiple = ref(true)
|
||||
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
queryForm: {
|
||||
inventoryType: "3",
|
||||
inventoryType: "7",
|
||||
},
|
||||
pageList: getStockTakingPage,
|
||||
pageList: fetchList,
|
||||
})
|
||||
|
||||
// table hook
|
||||
|
||||
@@ -109,7 +109,7 @@ export interface rowVU {
|
||||
packageNum: number
|
||||
purchasePrice: number
|
||||
retailPrice: number
|
||||
promotionPrice: number
|
||||
promotionPrice: number | null
|
||||
costPrice: number
|
||||
isNew?: boolean
|
||||
isBase?: boolean | null
|
||||
@@ -126,7 +126,7 @@ const packageUnitList = defineModel<rowVU[]>("modelValue", {
|
||||
packageNum: 0,
|
||||
purchasePrice: 0,
|
||||
retailPrice: 0,
|
||||
promotionPrice: 0,
|
||||
promotionPrice: null,
|
||||
costPrice: 0,
|
||||
},
|
||||
],
|
||||
@@ -141,7 +141,7 @@ const validRules = {
|
||||
packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
|
||||
retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
|
||||
purchasePrice: [{ required: true, message: "进价不能为空", trigger: "blur" }],
|
||||
promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
|
||||
// promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
|
||||
}
|
||||
|
||||
// 底部表格行新增
|
||||
@@ -155,7 +155,7 @@ const pushEvent = () => {
|
||||
packageNum: 0,
|
||||
purchasePrice: 0,
|
||||
retailPrice: 0,
|
||||
promotionPrice: 0,
|
||||
promotionPrice: null,
|
||||
costPrice: 0,
|
||||
isNew: true,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
<!-- excel 导入组件 -->
|
||||
<template>
|
||||
<el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
|
||||
<el-upload
|
||||
v-loading="state.upload.isUploading"
|
||||
ref="uploadRef"
|
||||
:limit="1"
|
||||
accept=".xlsx, .xls"
|
||||
:headers="headers"
|
||||
:action="baseURL + other.adaptationUrl(url)"
|
||||
:disabled="state.upload.isUploading"
|
||||
:on-progress="handleFileUploadProgress"
|
||||
:on-success="handleFileSuccess"
|
||||
:on-error="handleFileError"
|
||||
:auto-upload="false"
|
||||
drag
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">
|
||||
{{ $t("excel.operationNotice") }}
|
||||
<em>{{ $t("excel.clickUpload") }}</em>
|
||||
</div>
|
||||
<template #tip>
|
||||
<div class="el-upload__tip text-center">
|
||||
<span>{{ $t("excel.fileFormat") }}</span>
|
||||
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="downExcelTemp" v-if="tempUrl"
|
||||
>{{ $t("excel.downloadTemplate") }}
|
||||
</el-link>
|
||||
</div>
|
||||
</template>
|
||||
</el-upload>
|
||||
<template #footer>
|
||||
<el-button type="primary" @click="submitFileForm" :disabled="state.upload.isUploading">
|
||||
{{ $t("common.confirmButtonText") }}
|
||||
</el-button>
|
||||
<el-button @click="state.upload.open = false">{{ $t("common.cancelButtonText") }}</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!--校验失败错误数据-->
|
||||
<el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible" :close-on-click-modal="false" draggable>
|
||||
<el-table :data="state.errorData">
|
||||
<el-table-column property="row" align="center" :label="$t('excel.lineNumbers')" width="100" />
|
||||
<el-table-column property="reasons" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
|
||||
<template v-slot="scope">
|
||||
<el-tag type="danger" v-for="error in scope.row.reasons" :key="error">{{ error }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="upload-excel">
|
||||
import { useMessage } from "/@/hooks/message"
|
||||
import other from "/@/utils/other"
|
||||
import { Session } from "/@/utils/storage"
|
||||
|
||||
const emit = defineEmits(["sizeChange", "refreshDataList"])
|
||||
const prop = defineProps({
|
||||
url: {
|
||||
type: String,
|
||||
},
|
||||
title: {
|
||||
type: String,
|
||||
},
|
||||
tempUrl: {
|
||||
type: String,
|
||||
},
|
||||
})
|
||||
|
||||
const uploadRef = ref()
|
||||
|
||||
const state = reactive({
|
||||
errorVisible: false,
|
||||
errorData: [],
|
||||
dialog: {
|
||||
title: "",
|
||||
isShowDialog: false,
|
||||
},
|
||||
upload: {
|
||||
open: false,
|
||||
isUploading: false,
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* 下载模板文件
|
||||
*/
|
||||
const downExcelTemp = async () => {
|
||||
try {
|
||||
await other.downBlobFile(other.adaptationUrl(prop.tempUrl), {}, "temp.xlsx")
|
||||
} catch (error) {
|
||||
useMessage().error("模板下载失败，请先维护模板文件")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传进度条变化事件
|
||||
*/
|
||||
const handleFileUploadProgress = () => {
|
||||
state.upload.isUploading = true
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传失败事件处理
|
||||
*/
|
||||
const handleFileError = () => {
|
||||
useMessage().error("上传失败,数据格式不合法!")
|
||||
state.upload.open = false
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传成功事件处理
|
||||
* @param {any} response - 上传成功的响应结果
|
||||
*/
|
||||
const handleFileSuccess = (response: any) => {
|
||||
state.upload.isUploading = false
|
||||
state.upload.open = false
|
||||
uploadRef.value.clearFiles()
|
||||
|
||||
// 校验失败
|
||||
if (response.code === 1) {
|
||||
useMessage().error(response.msg ? response.msg : "导入失败，以下数据不合法")
|
||||
state.errorVisible = true
|
||||
state.errorData = response.data?.errors
|
||||
uploadRef.value.clearFiles()
|
||||
// 刷新表格
|
||||
emit?.("refreshDataList")
|
||||
} else {
|
||||
useMessage().success(response.msg ? response.msg : "导入成功")
|
||||
// 刷新表格
|
||||
emit?.("refreshDataList")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交表单，触发上传
|
||||
*/
|
||||
const submitFileForm = () => {
|
||||
uploadRef.value.submit()
|
||||
}
|
||||
|
||||
/**
|
||||
* 显示上传文件对话框，并清除上传信息
|
||||
*/
|
||||
const show = () => {
|
||||
state.upload.isUploading = false
|
||||
state.upload.open = true
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算请求头部信息
|
||||
*/
|
||||
const headers = computed(() => {
|
||||
return {
|
||||
Authorization: "Bearer " + Session.getToken(),
|
||||
"TENANT-ID": Session.getTenant(),
|
||||
}
|
||||
})
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
show,
|
||||
})
|
||||
</script>
|
||||
@@ -172,7 +172,7 @@ const usePackageUnitList = () => {
|
||||
item.isBase = false
|
||||
}
|
||||
item.costPrice = storePrice(item.costPrice)
|
||||
item.promotionPrice = storePrice(item.promotionPrice)
|
||||
item.promotionPrice = item.promotionPrice ? storePrice(item.promotionPrice) : null
|
||||
item.purchasePrice = storePrice(item.purchasePrice)
|
||||
item.retailPrice = storePrice(item.retailPrice)
|
||||
if (item.isNew) {
|
||||
|
||||
@@ -135,6 +135,7 @@
|
||||
|
||||
<!-- 编辑、新增 -->
|
||||
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
|
||||
|
||||
<upload-excel
|
||||
ref="excelUploadRef"
|
||||
:title="$t('supermarket.importErpSpuTip')"
|
||||
@@ -149,6 +150,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import UploadExcel from "./components/upload-excel.vue"
|
||||
|
||||
// 引入组件
|
||||
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
|
||||
|
||||
Reference in new issue
Block a user