From f88d2029c7b2c66fcf0a9dffdc55da75b939c2ea Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 12 Aug 2025 10:55:54 +0800
Subject: [PATCH] 修改
---
src/views/hazardousChemicals/finishedBasicInfo/index.vue | 144 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 132 insertions(+), 12 deletions(-)
diff --git a/src/views/hazardousChemicals/finishedBasicInfo/index.vue b/src/views/hazardousChemicals/finishedBasicInfo/index.vue
index dc13a2e..23f2c50 100644
--- a/src/views/hazardousChemicals/finishedBasicInfo/index.vue
+++ b/src/views/hazardousChemicals/finishedBasicInfo/index.vue
@@ -1,13 +1,21 @@
<template>
<div class="app-container">
<div style="display: flex;flex-direction: column">
- <el-button
- type="primary"
- plain
- icon="Plus"
- style="width: 70px;margin-bottom: 10px"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex">
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ style="width: 70px;margin-bottom: 10px"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ <el-button
+ type="primary"
+ plain
+ style="width: 80px;margin-bottom: 10px"
+ @click="exportData"
+ >批量导入</el-button>
+ </div>
<el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
<el-form-item label="名称:" >
<el-input v-model="data.queryParams.name" placeholder="请输入危化品名称"></el-input>
@@ -62,6 +70,13 @@
<el-table-column label="CAS" prop="cas" align="center"/>
<el-table-column label="试剂类型" prop="productType" align="center"/>
<el-table-column label="危险性质" prop="productCharacter" align="center"/>
+<!-- <el-table-column label="危化品特性" prop="peculiarityType" align="center" width="140"/>-->
+ <el-table-column label="危险性类别" prop="riskType" align="center" width="140">
+ <template #default="scope">
+ <div v-html="scope.row.riskType"></div>
+ </template>
+ </el-table-column>
+ <el-table-column label="危化品分类编号" prop="peculiarityNumber" align="center" />
<el-table-column label="供应商" prop="supplier" align="center"/>
<el-table-column label="厂家" prop="manufacturer" align="center"/>
<el-table-column label="规格" prop="productFormat" align="center"/>
@@ -71,14 +86,17 @@
</template>
</el-table-column>
<el-table-column label="含税售价" prop="price" align="center"/>
- <el-table-column label="每箱数量" prop="perBox" align="center"/>
+ <el-table-column label="每箱数量" prop="perBox" align="center">
+ <template #default="scope">
+ <span>{{scope.row.perBox === 0 || scope.row.perBox === null ? '--' : scope.row.perBox}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="最小包装类型" prop="minPackage" align="center">
<template #default="scope">
<span>{{scope.row.minPackage == 0 ? '瓶' :scope.row.minPackage == 1?'袋':scope.row.minPackage == 2?'桶 ':scope.row.minPackage == 3?'盒':scope.row.minPackage == 4?'箱':'其他'}}</span>
</template>
</el-table-column>
-<!-- <el-table-column label="安全库存" prop="safeNum" align="center"/>-->
-<!-- <el-table-column label="超期阈值(小时)" prop="threshold" align="center"/>-->
+ <el-table-column label="单次入库最大数量" prop="maxEntry" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>
@@ -96,6 +114,45 @@
/>
<basic-dialog ref="dialogRef" @getList=getList></basic-dialog>
+ <el-dialog
+ v-model="exportDialog"
+ title="批量导入成品"
+ width="500px"
+ :before-close="handleClose"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ >
+ <el-form size="default" ref="busRef" label-width="150px" >
+ <el-form-item label="成品表格模板:">
+ <el-button type="primary" plain @click="downloadFile">下载模板</el-button>
+ </el-form-item>
+ <div style="color: #ed5565;margin-left: 33px;margin-top: -8px;margin-bottom: 18px">
+ 导入成品基础数据须依据此模板
+ </div>
+ <el-form-item label="成品表格文件:">
+ <el-upload
+ :auto-upload="false"
+ action="#"
+ :file-list="data.fileList"
+ :remove="handleRemove"
+ :on-change="handleChange"
+ accept=".xlsx,.xls"
+ :limit="data.limit"
+ style="width: 230px"
+ >
+ <el-button type="primary"> 点击上传 </el-button>
+ </el-upload>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="handleClose" size="default">取 消</el-button>
+ <el-button type="primary" @click="onUpload" size="default" v-preReClick>确认</el-button>
+ </span>
+ </template>
+
+
+ </el-dialog>
</div>
</template>
@@ -104,11 +161,13 @@
import {ElMessage, ElMessageBox} from "element-plus";
import {delCompany, getCompany} from "@/api/hazardousChemicals/company";
import basicDialog from "./components/finishedBasicDialog.vue";
-import {delBasic, getBasicList} from "@/api/hazardousChemicals/basicInfo";
+import {delBasic, exportBasicInfo, getBasicList} from "@/api/hazardousChemicals/basicInfo";
import {delFinishBasic, getFinishBasicList} from "@/api/hazardousChemicals/finishedBasicInfo";
+import {exportProductInfo} from "@/api/hazardousChemicals/productRecord";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const dialogRef = ref();
+const exportDialog = ref(false)
const data = reactive({
queryParams: {
pageNum: 1,
@@ -142,7 +201,9 @@
id: 4,
name: '其他'
},
- ]
+ ],
+ fileList: [],
+ limit: 1
});
const { queryParams, total, dataList } = toRefs(data);
@@ -204,5 +265,64 @@
})
}
+const handleClose = () => {
+ data.fileList = []
+ exportDialog.value = false
+}
+const exportData = () => {
+ exportDialog.value = true
+}
+const downloadFile = () => {
+ const link = document.createElement('a')
+ link.href = 'files/product.xls'
+ link.target = '_blank'
+ link.download = '成品基础信息模板.xls'
+ link.click()
+}
+const f = ref()
+const handleChange = (file,fileList) => {
+ console.log('file',file)
+ let fileExtension = file.name.split('.').pop();
+ if(fileExtension == 'xls' || fileExtension == 'xlsx'){
+ f.value = file.raw
+ }else {
+ data.fileList = []
+ ElMessage.warning('仅可上传Execl文件')
+ }
+}
+const handleRemove = (file) => {
+ const index = data.fileList.indexOf(file)
+ const newFileList = data.fileList.slice()
+ newFileList.splice(index, 1)
+ data.fileList = newFileList;
+}
+const onUpload = async () => {
+
+ if(!f.value){
+ ElMessage.warning('请先上传成品表格')
+ return;
+ }else{
+ const formData = new FormData();
+ formData.append('file', f.value)
+
+ const res = await exportProductInfo(formData)
+ if(res.code == 200){
+ ElMessage.success('上传成功')
+ data.fileList = []
+ exportDialog.value = false
+ await getList()
+ }else{
+ ElMessage.warning(res.message)
+ }
+ }
+}
</script>
+<style scoped lang="scss">
+.app-container{
+ :deep(.el-form .el-form-item__label) {
+ font-size: 15px;
+ }
+}
+</style>
+
--
Gitblit v1.9.2