代码更新:
1. 看板需求改动 2. 物料导入改动
This commit is contained in:
parent
3e58b8ff75
commit
f763fc7833
|
|
@ -18,6 +18,24 @@ const uploadExcelGoods = (data) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const uploadExcelBaseGoods = (data) => {
|
||||||
|
return request({
|
||||||
|
url: '/excel/uploadBaseGoods',
|
||||||
|
method: 'post',
|
||||||
|
data: data,
|
||||||
|
timeout: 600000
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const uploadExcelKanban = (data) => {
|
||||||
|
return request({
|
||||||
|
url: '/excel/uploadKanban',
|
||||||
|
method: 'post',
|
||||||
|
data: data,
|
||||||
|
timeout: 600000
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const uploadStationConfig = (data) => {
|
const uploadStationConfig = (data) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/excel/uploadStationConfig',
|
url: '/excel/uploadStationConfig',
|
||||||
|
|
@ -160,5 +178,7 @@ export {
|
||||||
uploadStationConfig,
|
uploadStationConfig,
|
||||||
queryUploadRecord,
|
queryUploadRecord,
|
||||||
downloadClcKanbanRequirementExcel,
|
downloadClcKanbanRequirementExcel,
|
||||||
downloadWorkSummaryExcel
|
downloadWorkSummaryExcel,
|
||||||
|
uploadExcelBaseGoods,
|
||||||
|
uploadExcelKanban
|
||||||
}
|
}
|
||||||
|
|
@ -104,6 +104,23 @@ const getWorkSummary = (params) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getClcKanbanByPage = (params) => {
|
||||||
|
return request({
|
||||||
|
url: '/kateWork/getClcKanbanByPage',
|
||||||
|
method: 'post',
|
||||||
|
data: params
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const genClcKanbanRequirement = (params) => {
|
||||||
|
return request({
|
||||||
|
url: '/kateWork/genClcKanbanRequirement',
|
||||||
|
method: 'post',
|
||||||
|
data: params,
|
||||||
|
timeout: 600000
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
getDbs,
|
getDbs,
|
||||||
deleteDbs,
|
deleteDbs,
|
||||||
|
|
@ -117,5 +134,7 @@ export {
|
||||||
getClcKanbanRequirement,
|
getClcKanbanRequirement,
|
||||||
getWorkFlows,
|
getWorkFlows,
|
||||||
updateWorkFlows,
|
updateWorkFlows,
|
||||||
getWorkSummary
|
getWorkSummary,
|
||||||
|
getClcKanbanByPage,
|
||||||
|
genClcKanbanRequirement
|
||||||
}
|
}
|
||||||
98
src/excel/UploadExcelBaseGoods.vue
Normal file
98
src/excel/UploadExcelBaseGoods.vue
Normal file
|
|
@ -0,0 +1,98 @@
|
||||||
|
<template>
|
||||||
|
<el-upload ref="uploadRef" :on-preview="previewFile" :limit="1" :on-change="changeFile" :auto-upload="false"
|
||||||
|
:data="uploadForm.data">
|
||||||
|
<template #trigger>
|
||||||
|
<el-button type="primary">选取基本信息文件</el-button>
|
||||||
|
</template>
|
||||||
|
<el-button style="margin-left: 10px;" type="success" @click="uploadBaseGoods">上传物料基本信息</el-button>
|
||||||
|
</el-upload>
|
||||||
|
</template>
|
||||||
|
<script setup>
|
||||||
|
import store from '@/store'
|
||||||
|
import { ref, reactive } from 'vue';
|
||||||
|
import { uploadExcelBaseGoods } from '@/api/excel.js'
|
||||||
|
import { ElMessage } from 'element-plus'
|
||||||
|
import { errorBox } from '@/utils/myMessageBox';
|
||||||
|
import { sizeFormatter } from '@/utils/formatter.js'
|
||||||
|
import loading from '@/utils/loading.js'
|
||||||
|
import { getHashString } from '@/utils/hashUtils.js'
|
||||||
|
var currentHash = ''
|
||||||
|
const file = ref()
|
||||||
|
const uploadForm = reactive({
|
||||||
|
data: {
|
||||||
|
fileId: '',
|
||||||
|
name: '',
|
||||||
|
type: '',
|
||||||
|
size: null,
|
||||||
|
hash: '',
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const changeFile = (uploadFile) => {
|
||||||
|
file.value = uploadFile
|
||||||
|
uploadForm.data = {
|
||||||
|
fileId: file.value.raw.uid,
|
||||||
|
name: file.value.raw.name,
|
||||||
|
type: file.value.raw.type,
|
||||||
|
size: sizeFormatter(file.value.raw.size),
|
||||||
|
hash: getHashString(uploadFile),
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const uploadRef = ref()
|
||||||
|
const uploadBaseGoods = () => {
|
||||||
|
if (uploadForm == undefined || file.value == undefined) {
|
||||||
|
errorBox('请选择文件之后再上传')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (currentHash != '' && currentHash == uploadForm.data.hash) {
|
||||||
|
errorBox('请勿重复上传')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
currentHash = uploadForm.data.hash
|
||||||
|
const jsonStr = JSON.stringify(uploadForm.data);
|
||||||
|
const blob = new Blob([jsonStr], {
|
||||||
|
type: 'application/json'
|
||||||
|
});
|
||||||
|
let formData = new FormData();
|
||||||
|
// 这里很重要 file.value.raw才是真实的file文件,file.value只是一个Proxy代理对象
|
||||||
|
formData.append("obj", blob);
|
||||||
|
formData.append("file", file.value.raw);
|
||||||
|
loading.open('导入中...')
|
||||||
|
uploadExcelBaseGoods(formData).then(res => {
|
||||||
|
loading.close()
|
||||||
|
currentHash = ''
|
||||||
|
if (res.data.code == 0) {
|
||||||
|
ElMessage({
|
||||||
|
message: '上传成功',
|
||||||
|
type: 'success',
|
||||||
|
})
|
||||||
|
clearFileInfos()
|
||||||
|
} else {
|
||||||
|
errorBox(res.data.message)
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
loading.close()
|
||||||
|
currentHash = ''
|
||||||
|
console.log(err)
|
||||||
|
errorBox('上传错误')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const clearFileInfos = () => {
|
||||||
|
// 清空选择的文件项
|
||||||
|
uploadRef.value.clearFiles()
|
||||||
|
uploadForm.data = {
|
||||||
|
fileId: '',
|
||||||
|
name: '',
|
||||||
|
type: '',
|
||||||
|
size: null,
|
||||||
|
hash: '',
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
file.value = undefined
|
||||||
|
}
|
||||||
|
const previewFile = () => {
|
||||||
|
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style scoped></style>
|
||||||
98
src/excel/UploadExcelKanban.vue
Normal file
98
src/excel/UploadExcelKanban.vue
Normal file
|
|
@ -0,0 +1,98 @@
|
||||||
|
<template>
|
||||||
|
<el-upload ref="uploadRef" :on-preview="previewFile" :limit="1" :on-change="changeFile" :auto-upload="false"
|
||||||
|
:data="uploadForm.data">
|
||||||
|
<template #trigger>
|
||||||
|
<el-button type="primary">选取看板文件</el-button>
|
||||||
|
</template>
|
||||||
|
<el-button style="margin-left: 10px;" type="success" @click="uploadKanban">上传看板</el-button>
|
||||||
|
</el-upload>
|
||||||
|
</template>
|
||||||
|
<script setup>
|
||||||
|
import store from '@/store'
|
||||||
|
import { ref, reactive } from 'vue';
|
||||||
|
import { uploadExcelKanban } from '@/api/excel.js'
|
||||||
|
import { ElMessage } from 'element-plus'
|
||||||
|
import { errorBox } from '@/utils/myMessageBox';
|
||||||
|
import { sizeFormatter } from '@/utils/formatter.js'
|
||||||
|
import loading from '@/utils/loading.js'
|
||||||
|
import { getHashString } from '@/utils/hashUtils.js'
|
||||||
|
var currentHash = ''
|
||||||
|
const file = ref()
|
||||||
|
const uploadForm = reactive({
|
||||||
|
data: {
|
||||||
|
fileId: '',
|
||||||
|
name: '',
|
||||||
|
type: '',
|
||||||
|
size: null,
|
||||||
|
hash: '',
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const changeFile = (uploadFile) => {
|
||||||
|
file.value = uploadFile
|
||||||
|
uploadForm.data = {
|
||||||
|
fileId: file.value.raw.uid,
|
||||||
|
name: file.value.raw.name,
|
||||||
|
type: file.value.raw.type,
|
||||||
|
size: sizeFormatter(file.value.raw.size),
|
||||||
|
hash: getHashString(uploadFile),
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const uploadRef = ref()
|
||||||
|
const uploadKanban = () => {
|
||||||
|
if (uploadForm == undefined || file.value == undefined) {
|
||||||
|
errorBox('请选择文件之后再上传')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (currentHash != '' && currentHash == uploadForm.data.hash) {
|
||||||
|
errorBox('请勿重复上传')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
currentHash = uploadForm.data.hash
|
||||||
|
const jsonStr = JSON.stringify(uploadForm.data);
|
||||||
|
const blob = new Blob([jsonStr], {
|
||||||
|
type: 'application/json'
|
||||||
|
});
|
||||||
|
let formData = new FormData();
|
||||||
|
// 这里很重要 file.value.raw才是真实的file文件,file.value只是一个Proxy代理对象
|
||||||
|
formData.append("obj", blob);
|
||||||
|
formData.append("file", file.value.raw);
|
||||||
|
loading.open('导入中...')
|
||||||
|
uploadExcelKanban(formData).then(res => {
|
||||||
|
loading.close()
|
||||||
|
currentHash = ''
|
||||||
|
if (res.data.code == 0) {
|
||||||
|
ElMessage({
|
||||||
|
message: '上传成功',
|
||||||
|
type: 'success',
|
||||||
|
})
|
||||||
|
clearFileInfos()
|
||||||
|
} else {
|
||||||
|
errorBox(res.data.message)
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
loading.close()
|
||||||
|
currentHash = ''
|
||||||
|
console.log(err)
|
||||||
|
errorBox('上传错误')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const clearFileInfos = () => {
|
||||||
|
// 清空选择的文件项
|
||||||
|
uploadRef.value.clearFiles()
|
||||||
|
uploadForm.data = {
|
||||||
|
fileId: '',
|
||||||
|
name: '',
|
||||||
|
type: '',
|
||||||
|
size: null,
|
||||||
|
hash: '',
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
file.value = undefined
|
||||||
|
}
|
||||||
|
const previewFile = () => {
|
||||||
|
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style scoped></style>
|
||||||
|
|
@ -1,339 +1,180 @@
|
||||||
<template>
|
<template>
|
||||||
|
<div style="margin-bottom: 10px; height: 100%; padding-left: 1%; padding-right: 1%;">
|
||||||
<el-config-provider :locale="zhCn">
|
<el-config-provider :locale="zhCn">
|
||||||
<el-container class="content">
|
<div style="display: flex;justify-content: space-between;">
|
||||||
<div class="work-area">
|
<el-row>
|
||||||
<fieldset class="title-area">
|
<el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
|
||||||
<legend>
|
:suffix-icon="Search" />
|
||||||
工作台
|
<el-date-picker v-model="pullDateQuery" type="date" placeholder="选择收货日期" :shortcuts="shortcuts"
|
||||||
</legend>
|
style="width: 158px; margin-right: 10px;" clearable />
|
||||||
<div class="title-div">
|
<el-select-v2 v-model="kanbanStatusQuery" style="width: 158px; margin-right: 10px;"
|
||||||
<span class="title-text">需求看板-CLC</span>
|
placeholder="请选择看板状态" :options="kanbanStatusOptions" @change="search()"></el-select-v2>
|
||||||
|
<el-button type="primary" @click="search()">搜索</el-button>
|
||||||
|
<el-button type="warning" @click="reset()">重置</el-button>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-button style="background-color: #20B2AA; color: #000;" @click="genKanban()">生成看板</el-button>
|
||||||
|
<el-button style="background-color: #32CD32; color: #000;" @click="exportExcel()">导出看板</el-button>
|
||||||
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
<div class="station-div">
|
<br />
|
||||||
<span class="station-text">工作站:</span>
|
<el-table :data="kanbanList" stripe border v-loading="loadingFlag" class="table-class"
|
||||||
</div>
|
highlight-current-row max-height="650px" @row-click="getCurrentRow"
|
||||||
<div class="station-no-div">
|
:header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
|
||||||
<span class="station-no-text">{{ standId }}</span>
|
<el-table-column width="65px" fixed="left">
|
||||||
</div>
|
<template v-slot="scope">
|
||||||
</fieldset>
|
<el-radio :label="scope.row.recordId" v-model="recordId"> </el-radio>
|
||||||
<fieldset class="main-area">
|
</template>
|
||||||
<legend>
|
</el-table-column>
|
||||||
CLC看板
|
<el-table-column prop="recordId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
|
||||||
</legend>
|
<el-table-column prop="goodsId" label="料号" show-overflow-tooltip min-width="120px" />
|
||||||
<el-form ref="workFormRef" :model="workFormEntity" :label-position="labelPosition"
|
<el-table-column prop="kanbanId" label="看板id" min-width="120px" show-overflow-tooltip />
|
||||||
label-width="150px" style="max-width: 100%;" :rules="rules" status-icon>
|
<el-table-column prop="kanbanStatus" label="看板状态" :formatter="kanbanStatusFormat" min-width="120px" show-overflow-tooltip />
|
||||||
<div style="display: flex;">
|
<el-table-column prop="lastPullTime" label="上次收货时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
|
||||||
<div style="display: block; margin: 5px;">
|
<el-table-column prop="lastPullUser" label="上次收货用户" min-width="120px" />
|
||||||
<div
|
<el-table-column prop="lastRequestTime" label="上次请求时间" :formatter="timeFormat" min-width="120px" />
|
||||||
style="display: inline-flex; justify-content: center; height: 60px; width: 910px; margin: 5px; padding: 5px; background-color: #00AAE8;">
|
<el-table-column prop="lastRequestUser" label="上次请求用户" min-width="120px" />
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 25px;">
|
</el-table>
|
||||||
按照计划和设置,CLC下次需要到货如下:
|
<br />
|
||||||
</span>
|
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
|
||||||
</div>
|
:small="false" :disabled="false" :background="false" :default-page-size="10"
|
||||||
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
|
||||||
<div
|
@current-change="search" />
|
||||||
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span
|
|
||||||
style="align-self: center; font-weight: bold;font-size: 20px;">总需求</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.TotalNumOfType }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">种</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.TotalNumOfPc }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">PC</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.TotalNumOfBox }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">盒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span
|
|
||||||
style="align-self: center; font-weight: bold;font-size: 20px;">#810</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfTypeOf810 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">种</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfPcOf810 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">PC</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfBoxOf810 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">盒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span
|
|
||||||
style="align-self: center; font-weight: bold;font-size: 20px;">#811</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfTypeOf811 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">种</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfPcOf811 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">PC</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfBoxOf811 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">盒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span
|
|
||||||
style="align-self: center; font-weight: bold;font-size: 20px;">#911</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfTypeOf911 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">种</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfPcOf911 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">PC</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfBoxOf911 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">盒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span
|
|
||||||
style="align-self: center; font-weight: bold;font-size: 20px;">#822</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfTypeOf822 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">种</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfPcOf822 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">PC</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 130px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
|
||||||
{{ workFormEntity.NumOfBoxOf822 }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
|
||||||
<span style="align-self: center; font-weight: bold;font-size: 20px;">盒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="margin: 10px;">
|
|
||||||
<div class="arrow" @click="exportExcel()">
|
|
||||||
<span
|
|
||||||
style="margin-left: 25px; align-self: center; font-weight: bold;font-size: 45px; writing-mode: vertical-lr;">确认导出</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</el-form>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
</el-container>
|
|
||||||
</el-config-provider>
|
</el-config-provider>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
import { getClcKanbanRequirement } from '@/api/kateWork'
|
import { getClcKanbanByPage, genClcKanbanRequirement } from '@/api/kateWork.js'
|
||||||
import { downloadClcKanbanRequirementExcel } from '@/api/excel'
|
import { downloadClcKanbanRequirementExcel } from '@/api/excel.js'
|
||||||
import { dateFormatter } from '@/utils/formatter.js'
|
import { successBox, errorBox } from '@/utils/myMessageBox.js'
|
||||||
import { errorBox } from '@/utils/myMessageBox.js'
|
import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
|
||||||
import { ElMessage } from 'element-plus'
|
import { Search } from '@element-plus/icons-vue'
|
||||||
import { reactive, ref } from 'vue'
|
import loading from '@/utils/loading.js'
|
||||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'clcKanban',
|
name: 'clcKanban',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
standId: store.getters.getStandId,
|
kanbanList: [],
|
||||||
// timer: '',
|
currentPage: 1,
|
||||||
labelPosition: 'top',
|
pageSize: 10,
|
||||||
workFormRef: ref(),
|
total: 0,
|
||||||
workFormEntity: reactive({
|
goodsIdQuery: '',
|
||||||
TotalNumOfType: 0,
|
pullDateQuery: null,
|
||||||
TotalNumOfPc: 0,
|
shortcuts: [
|
||||||
TotalNumOfBox: 0,
|
{
|
||||||
NumOfTypeOf810: 0,
|
text: '今天',
|
||||||
NumOfTypeOf811: 0,
|
value: new Date(),
|
||||||
NumOfTypeOf911: 0,
|
},
|
||||||
NumOfTypeOf822: 0,
|
{
|
||||||
NumOfPcOf810: 0,
|
text: '昨天',
|
||||||
NumOfPcOf811: 0,
|
value: () => {
|
||||||
NumOfPcOf911: 0,
|
const date = new Date()
|
||||||
NumOfPcOf822: 0,
|
date.setTime(date.getTime() - 3600 * 1000 * 24)
|
||||||
NumOfBoxOf810: 0,
|
return date
|
||||||
NumOfBoxOf811: 0,
|
},
|
||||||
NumOfBoxOf911: 0,
|
},
|
||||||
NumOfBoxOf822: 0,
|
],
|
||||||
}),
|
kanbanStatusQuery: -99,
|
||||||
rules: reactive({
|
loadingFlag: true,
|
||||||
}),
|
recordId: '',
|
||||||
|
kanbanStatusOptions: [
|
||||||
|
{
|
||||||
|
value: -99,
|
||||||
|
label: '全部'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: 0,
|
||||||
|
label: '空'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: 1,
|
||||||
|
label: '满'
|
||||||
|
}
|
||||||
|
],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getClcKanban()
|
this.search()
|
||||||
},
|
|
||||||
beforeUnmount() {
|
|
||||||
// clearInterval(this.timer)
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getClcKanban() {
|
search() {
|
||||||
|
this.loadingFlag = true
|
||||||
const request = {
|
const request = {
|
||||||
standId: this.standId,
|
pageNo: this.currentPage,
|
||||||
|
pageSize: this.pageSize,
|
||||||
|
goodsId: this.goodsIdQuery.trim(),
|
||||||
|
kanbanStatus: this.kanbanStatusQuery == -99 ? null : this.kanbanStatusQuery,
|
||||||
|
lastPullTime: timeFormatter(this.pullDateQuery),
|
||||||
userName: store.getters.getUserName
|
userName: store.getters.getUserName
|
||||||
}
|
}
|
||||||
getClcKanbanRequirement(request).then(res => {
|
getClcKanbanByPage(request).then(res => {
|
||||||
const response = res.data
|
const tableResponse = res.data
|
||||||
if (response.code == 0) {
|
if (tableResponse.code == 0) {
|
||||||
this.workFormEntity.TotalNumOfType = response.returnData.TotalNumOfType
|
this.kanbanList = tableResponse.returnData.lists
|
||||||
this.workFormEntity.TotalNumOfPc = response.returnData.TotalNumOfPc
|
this.total = tableResponse.returnData.total
|
||||||
this.workFormEntity.TotalNumOfBox = response.returnData.TotalNumOfBox
|
|
||||||
this.workFormEntity.NumOfTypeOf810 = response.returnData.NumOfTypeOf810
|
|
||||||
this.workFormEntity.NumOfTypeOf811 = response.returnData.NumOfTypeOf811
|
|
||||||
this.workFormEntity.NumOfTypeOf911 = response.returnData.NumOfTypeOf911
|
|
||||||
this.workFormEntity.NumOfTypeOf822 = response.returnData.NumOfTypeOf822
|
|
||||||
this.workFormEntity.NumOfPcOf810 = response.returnData.NumOfPcOf810
|
|
||||||
this.workFormEntity.NumOfPcOf811 = response.returnData.NumOfPcOf811
|
|
||||||
this.workFormEntity.NumOfPcOf911 = response.returnData.NumOfPcOf911
|
|
||||||
this.workFormEntity.NumOfPcOf822 = response.returnData.NumOfPcOf822
|
|
||||||
this.workFormEntity.NumOfBoxOf810 = response.returnData.NumOfBoxOf810
|
|
||||||
this.workFormEntity.NumOfBoxOf811 = response.returnData.NumOfBoxOf811
|
|
||||||
this.workFormEntity.NumOfBoxOf911 = response.returnData.NumOfBoxOf911
|
|
||||||
this.workFormEntity.NumOfBoxOf822 = response.returnData.NumOfBoxOf822
|
|
||||||
ElMessage.success("获取CLC看板需求成功。")
|
|
||||||
} else {
|
} else {
|
||||||
this.resetForms()
|
errorBox(tableResponse.message)
|
||||||
errorBox(response.message)
|
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
this.resetForms()
|
errorBox('查询看板错误')
|
||||||
errorBox('获取CLC看板需求错误')
|
|
||||||
})
|
})
|
||||||
|
this.loadingFlag = false
|
||||||
},
|
},
|
||||||
resetForms() {
|
dateFormat: (row, column, cellValue, index) => {
|
||||||
this.workFormEntity = reactive({
|
return dateFormatter(cellValue)
|
||||||
TotalNumOfType: 0,
|
},
|
||||||
TotalNumOfPc: 0,
|
timeFormat: (row, column, cellValue, index) => {
|
||||||
TotalNumOfBox: 0,
|
return timeFormatter(cellValue)
|
||||||
NumOfTypeOf810: 0,
|
},
|
||||||
NumOfTypeOf811: 0,
|
kanbanStatusFormat: (row, column, cellValue, index) => {
|
||||||
NumOfTypeOf911: 0,
|
switch (cellValue) {
|
||||||
NumOfTypeOf822: 0,
|
case 0:
|
||||||
NumOfPcOf810: 0,
|
return '空'
|
||||||
NumOfPcOf811: 0,
|
case 1:
|
||||||
NumOfPcOf911: 0,
|
return '满'
|
||||||
NumOfPcOf822: 0,
|
default:
|
||||||
NumOfBoxOf810: 0,
|
return '未知'
|
||||||
NumOfBoxOf811: 0,
|
}
|
||||||
NumOfBoxOf911: 0,
|
},
|
||||||
NumOfBoxOf822: 0,
|
reset() {
|
||||||
|
this.goodsIdQuery = ''
|
||||||
|
this.pullDateQuery = null
|
||||||
|
this.kanbanStatusQuery = -99
|
||||||
|
this.search()
|
||||||
|
},
|
||||||
|
getCurrentRow(row) {
|
||||||
|
this.recordId = row.recordId
|
||||||
|
},
|
||||||
|
genKanban() {
|
||||||
|
const request = {
|
||||||
|
userName: store.getters.getUserName
|
||||||
|
}
|
||||||
|
loading.open('生成中...')
|
||||||
|
genClcKanbanRequirement(request).then(res => {
|
||||||
|
loading.close()
|
||||||
|
const response = res.data
|
||||||
|
if (response.code == 0) {
|
||||||
|
successBox('生成看板需求成功。')
|
||||||
|
} else {
|
||||||
|
errorBox(response.message)
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
loading.close()
|
||||||
|
console.log(err)
|
||||||
|
errorBox('生成看板需求异常。')
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
exportExcel() {
|
exportExcel() {
|
||||||
const request = {
|
const request = {
|
||||||
standId: this.standId,
|
goodsId: this.goodsIdQuery.trim(),
|
||||||
|
kanbanStatus: this.kanbanStatusQuery == -99 ? null : this.kanbanStatusQuery,
|
||||||
|
lastPullTime: timeFormatter(this.pullDateQuery),
|
||||||
userName: store.getters.getUserName
|
userName: store.getters.getUserName
|
||||||
}
|
}
|
||||||
downloadClcKanbanRequirementExcel(request).then(res => {
|
downloadClcKanbanRequirementExcel(request).then(res => {
|
||||||
|
|
@ -342,7 +183,7 @@ export default {
|
||||||
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型,先定义成blob对象格式,该type导出为xls格式,
|
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型,先定义成blob对象格式,该type导出为xls格式,
|
||||||
let blob = res.data //如果后台返回的直接是blob对象类型,直接获取数据
|
let blob = res.data //如果后台返回的直接是blob对象类型,直接获取数据
|
||||||
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名,如果后端有给返回文件名的话
|
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名,如果后端有给返回文件名的话
|
||||||
let _fileName = "CLC看板需求" + dateFormatter(new Date) + ".xlsx"
|
let _fileName = "需求看板" + dateFormatter(new Date) + ".xlsx"
|
||||||
link.style.display = 'none'//隐藏
|
link.style.display = 'none'//隐藏
|
||||||
|
|
||||||
// 兼容不同浏览器的URL对象
|
// 兼容不同浏览器的URL对象
|
||||||
|
|
@ -359,34 +200,43 @@ export default {
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
errorBox('导出失败:')
|
errorBox('导出失败')
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.content {
|
.el-pagination {
|
||||||
display: flex;
|
padding-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-row .el-button {
|
||||||
|
width: 72px;
|
||||||
|
margin-left: 0px;
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table-class {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.work-area {
|
.el-row .el-form-item {
|
||||||
width: 100%;
|
width: 10% inherit;
|
||||||
/* padding: 5px; */
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-area {
|
.el-row .el-form-item .el-select-v2 {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-row .el-form-item .el-input-number {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-row .el-form-item .el-button {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
min-height: fit-content;
|
|
||||||
max-height: 90%;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
min-width: inherit;
|
|
||||||
border: solid 1px;
|
|
||||||
border-radius: 10px;
|
|
||||||
box-shadow: 0px 15px 10px -15px #000;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
|
|
@ -399,175 +249,7 @@ export default {
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
box-shadow: 0px 15px 10px -15px #000;
|
box-shadow: 0px 15px 10px -15px #000;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
flex-direction: column;
|
||||||
|
padding: 10px;
|
||||||
.arrow {
|
|
||||||
background: linear-gradient(-105deg,
|
|
||||||
transparent 50%,
|
|
||||||
#309330 50%,
|
|
||||||
#309330 100%) top right,
|
|
||||||
linear-gradient(-75deg,
|
|
||||||
transparent 50%,
|
|
||||||
#309330 50%,
|
|
||||||
#309330 100%) bottom right;
|
|
||||||
background-size: 100% 50%;
|
|
||||||
height: 376px;
|
|
||||||
width: 250px;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
display: inline-flex;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.el-input) {
|
|
||||||
height: 130px;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.el-input-number) {
|
|
||||||
height: 130px;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.title-div {
|
|
||||||
display: inline-flex;
|
|
||||||
width: -webkit-fill-available;
|
|
||||||
margin-right: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
background-color: #CCCCCC;
|
|
||||||
}
|
|
||||||
|
|
||||||
.title-text {
|
|
||||||
align-self: center;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.station-div {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 150px;
|
|
||||||
margin-left: 5px;
|
|
||||||
margin-right: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
background-color: #FFFAAA;
|
|
||||||
}
|
|
||||||
|
|
||||||
.station-text {
|
|
||||||
align-self: center;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.station-no-div {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 200px;
|
|
||||||
padding: 5px;
|
|
||||||
border: 5px double #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.station-no-text {
|
|
||||||
align-self: center;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-title-div {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 280px;
|
|
||||||
height: 80px;
|
|
||||||
margin: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
background-color: #FFFAAA;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-title-text {
|
|
||||||
align-self: center;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-form-div {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 270px;
|
|
||||||
margin: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
border: 5px double #000000;
|
|
||||||
margin-top: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-form-div-left {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 170px;
|
|
||||||
margin: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
border: 5px double #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-form-div-right {
|
|
||||||
display: inline-flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 80px;
|
|
||||||
margin: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
background-color: #CCCCCC;
|
|
||||||
}
|
|
||||||
|
|
||||||
.display-form-text-right {
|
|
||||||
align-self: center;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* @media print {
|
|
||||||
@page {
|
|
||||||
size: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
body,
|
|
||||||
html {
|
|
||||||
width: 90mm !important;
|
|
||||||
height: 25mm !important;
|
|
||||||
}
|
|
||||||
} */
|
|
||||||
|
|
||||||
.objectDialogFlowPrint {
|
|
||||||
width: 100% !important;
|
|
||||||
height: 100% !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.objectDialogFlowPrint .pageWarp {
|
|
||||||
/*这句话很重要,控制时候强制分页 https://www.w3school.com.cn/cssref/pr_page-break-after.asp*/
|
|
||||||
page-break-after: always;
|
|
||||||
width: 98%;
|
|
||||||
height: 98%;
|
|
||||||
/* margin: 5px; */
|
|
||||||
text-align: center;
|
|
||||||
padding: 0;
|
|
||||||
/* border: #000 solid 1px; */
|
|
||||||
display: flex;
|
|
||||||
print-color-adjust: exact;
|
|
||||||
}
|
|
||||||
|
|
||||||
.print-tab-left {
|
|
||||||
margin: 5px;
|
|
||||||
width: 50%;
|
|
||||||
border-right: #156082 dashed 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.print-tab-right {
|
|
||||||
margin: 5px;
|
|
||||||
width: 50%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.print-disp {
|
|
||||||
margin: 2px;
|
|
||||||
padding-left: 5px;
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-align: left;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -178,8 +178,12 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog v-model="uploadDialogVisible" title="导入物料" width="40%" draggable :show-close="true">
|
<el-dialog v-model="uploadDialogVisible" title="导入物料" width="40%" draggable :show-close="true">
|
||||||
<fieldset class="title-area">
|
<fieldset class="title-area">
|
||||||
<legend>导入物料</legend>
|
<legend>导入物料基本信息</legend>
|
||||||
<UploadExcelGoods></UploadExcelGoods>
|
<UploadExcelBaseGoods></UploadExcelBaseGoods>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset class="title-area">
|
||||||
|
<legend>导入看板</legend>
|
||||||
|
<UploadExcelKanban></UploadExcelKanban>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</el-config-provider>
|
</el-config-provider>
|
||||||
|
|
@ -194,7 +198,9 @@ import { ElMessageBox, ElMessage } from 'element-plus'
|
||||||
import { ref, reactive } from 'vue'
|
import { ref, reactive } from 'vue'
|
||||||
import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
|
import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
|
||||||
import { errorBox } from '@/utils/myMessageBox.js'
|
import { errorBox } from '@/utils/myMessageBox.js'
|
||||||
import UploadExcelGoods from '@/excel/UploadExcelGoods.vue'
|
// import UploadExcelGoods from '@/excel/UploadExcelGoods.vue'
|
||||||
|
import UploadExcelBaseGoods from '@/excel/UploadExcelBaseGoods.vue'
|
||||||
|
import UploadExcelKanban from '@/excel/UploadExcelKanban.vue'
|
||||||
import { downloadGoodsExcel } from '@/api/excel.js'
|
import { downloadGoodsExcel } from '@/api/excel.js'
|
||||||
import { Search } from '@element-plus/icons-vue'
|
import { Search } from '@element-plus/icons-vue'
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user