newCreateAndDistribute #2
|
|
@ -198,6 +198,16 @@ const downloadWorkFlowExcel = (data) => {
|
|||
})
|
||||
}
|
||||
|
||||
const downloadKateOrdersExcel = (data) => {
|
||||
return request({
|
||||
url: '/excel/downloadKateOrdersExcel',
|
||||
method: 'post',
|
||||
responseType: 'blob',
|
||||
data: data,
|
||||
timeout: 600000
|
||||
})
|
||||
}
|
||||
|
||||
export {
|
||||
uploadExcelStock,
|
||||
uploadExcelGoods,
|
||||
|
|
@ -219,5 +229,6 @@ export {
|
|||
uploadExcelKanban,
|
||||
uploadWorkFlow,
|
||||
uploadExcelWorkDate,
|
||||
downloadWorkFlowExcel
|
||||
downloadWorkFlowExcel,
|
||||
downloadKateOrdersExcel
|
||||
}
|
||||
|
|
@ -1,133 +1,157 @@
|
|||
import request from "@/http/request";
|
||||
|
||||
const getDbs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const deleteDbs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/deleteDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/deleteDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const updateDbs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/updateDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/updateDbs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getOrders = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const deleteOrders = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/deleteOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/deleteOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const updateOrders = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/updateOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/updateOrders',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getStationConfigs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const deleteStationConfigs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/deleteStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/deleteStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const updateStationConfigs = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/updateStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/updateStationConfigs',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getClcKanbanRequirement = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getClcKanbanRequirement',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getClcKanbanRequirement',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getWorkFlows = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getWorkFlows',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getWorkFlows',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const updateWorkFlows = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/updateWorkFlows',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/updateWorkFlows',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getWorkSummary = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getWorkSummary',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getWorkSummary',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const getClcKanbanByPage = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getClcKanbanByPage',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getClcKanbanByPage',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const genClcKanbanRequirement = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/genClcKanbanRequirement',
|
||||
method: 'post',
|
||||
data: params,
|
||||
timeout: 600000
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/genClcKanbanRequirement',
|
||||
method: 'post',
|
||||
data: params,
|
||||
timeout: 600000
|
||||
})
|
||||
}
|
||||
|
||||
const getBigBoxList = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/getBigBoxList',
|
||||
method: 'post',
|
||||
data: params,
|
||||
timeout: 10000
|
||||
})
|
||||
return request({
|
||||
url: '/kateWork/getBigBoxList',
|
||||
method: 'post',
|
||||
data: params,
|
||||
timeout: 10000
|
||||
})
|
||||
}
|
||||
|
||||
const queryWorkDate = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/queryWorkDate',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const addWorkDate = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/addWorkDate',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
const deleteWorkDate = (params) => {
|
||||
return request({
|
||||
url: '/kateWork/deleteWorkDate',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
export {
|
||||
|
|
@ -146,5 +170,8 @@ export {
|
|||
getWorkSummary,
|
||||
getClcKanbanByPage,
|
||||
genClcKanbanRequirement,
|
||||
getBigBoxList
|
||||
getBigBoxList,
|
||||
queryWorkDate,
|
||||
addWorkDate,
|
||||
deleteWorkDate
|
||||
}
|
||||
|
|
@ -10,9 +10,7 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-button style="background-color: #00CED1; color: #000; width: 120px;"
|
||||
@click="openUploadDialog(1)">导入DBS</el-button>
|
||||
<el-button style="background-color: #32CD32; color: #000; width: 120px;"
|
||||
@click="openUploadDialog(2)">导入工作日历</el-button>
|
||||
@click="openUploadDialog()">导入DBS</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
<br />
|
||||
|
|
@ -125,33 +123,6 @@
|
|||
<UploadExcelDbs></UploadExcelDbs>
|
||||
</fieldset>
|
||||
</el-dialog>
|
||||
<el-dialog v-model="uploadWorkDateDialogVisible" title="DBS" width="40%" draggable :show-close="true">
|
||||
<fieldset class="title-area">
|
||||
<legend>上次更新</legend>
|
||||
<div style="padding: 5px;">
|
||||
<div style="display: flex; margin-bottom: 10px;">
|
||||
<div style="display: flex; width: 100%;">
|
||||
<div style="width: 30%; align-content: center;">时间：</div>
|
||||
<el-input v-model="uploadRecord.uploadTime" readonly />
|
||||
</div>
|
||||
<div style="display: flex; width: 100%; margin-left: 5px;">
|
||||
<div style="width: 30%; align-content: center;">人员：</div>
|
||||
<el-input v-model="uploadRecord.uploadUser" readonly />
|
||||
</div>
|
||||
</div>
|
||||
<div style="display: flex; width: 100%;">
|
||||
<div style="width: 13%; align-content: center;">文件名：</div>
|
||||
<el-input type="textarea" :rows="1" v-model="uploadRecord.fileName" :maxlength="-1"
|
||||
:show-word-limit="false" :autosize="{ minRows: 1, maxRows: 4 }" readonly>
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="title-area">
|
||||
<legend>再次更新</legend>
|
||||
<UploadExcelWorkDate></UploadExcelWorkDate>
|
||||
</fieldset>
|
||||
</el-dialog>
|
||||
</el-config-provider>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -300,11 +271,11 @@ export default {
|
|||
getCurrentRow(row) {
|
||||
this.dbsId = row.dbsId
|
||||
},
|
||||
openUploadDialog(uploadType) {
|
||||
openUploadDialog() {
|
||||
// 请求上传记录
|
||||
const param = {
|
||||
userName: store.getters.getUserName,
|
||||
fileDescription: uploadType == 1 ? 'DBS' : 'WORK_DATE',
|
||||
fileDescription: 'DBS',
|
||||
isAsc: false,
|
||||
sortBy: 'upload_time'
|
||||
}
|
||||
|
|
@ -330,11 +301,7 @@ export default {
|
|||
console.log(err)
|
||||
errorBox('发生异常')
|
||||
})
|
||||
if (uploadType == 1) {
|
||||
this.uploadDialogVisible = true
|
||||
} else {
|
||||
this.uploadWorkDateDialogVisible = true
|
||||
}
|
||||
this.uploadDialogVisible = true
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<el-config-provider :locale="zhCn">
|
||||
<div style="display: flex;justify-content: space-between;">
|
||||
<el-row>
|
||||
<el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
|
||||
<el-input v-model="workOrderQuery" style="width: 158px; margin-right: 10px;" placeholder="工单"
|
||||
:suffix-icon="Search"/>
|
||||
<el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
|
||||
<el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号"
|
||||
:suffix-icon="Search"/>
|
||||
<el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
|
||||
<el-input v-model="smallBoxQuery" style="width: 158px; margin-right: 10px;" placeholder="小工位"
|
||||
:suffix-icon="Search"/>
|
||||
<el-date-picker v-model="planStartDateQuery" type="date" placeholder="计划开工日期" :shortcuts="shortcuts"
|
||||
style="width: 158px; margin-right: 10px;" clearable />
|
||||
|
|
@ -15,8 +15,11 @@
|
|||
<el-button type="warning" @click="reset()">重置</el-button>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-button style="background-color: #00CED1; color: #000;"
|
||||
@click="openUploadDialog()">导入
|
||||
<el-button style="background-color: #00CED1; color: #000; width: 120px"
|
||||
@click="exportUndoOrders()">导出未做工单
|
||||
</el-button>
|
||||
<el-button style="background-color: #00CED1; color: #000; width: 120px"
|
||||
@click="openUploadDialog()">导入工单
|
||||
</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
|
|
@ -192,6 +195,8 @@ import {queryUploadRecord} from '@/api/excel.js'
|
|||
import {Search} from '@element-plus/icons-vue'
|
||||
</script>
|
||||
<script>
|
||||
import {downloadKateOrdersExcel} from "@/api/excel";
|
||||
|
||||
export default {
|
||||
name: 'kateOrders',
|
||||
data() {
|
||||
|
|
@ -380,6 +385,43 @@ export default {
|
|||
})
|
||||
this.uploadDialogVisible = true
|
||||
},
|
||||
// 导出未做工单
|
||||
exportUndoOrders() {
|
||||
if (this.planStartDateQuery == null) {
|
||||
errorBox('请选择需求日期')
|
||||
return
|
||||
}
|
||||
const request = {
|
||||
planStartDate: dateFormatter(this.planStartDateQuery),
|
||||
orderStatus: 0,
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
downloadKateOrdersExcel(request).then(res => {
|
||||
const link = document.createElement('a');//创建a标签
|
||||
try {
|
||||
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
|
||||
let blob = res.data //如果后台返回的直接是blob对象类型，直接获取数据
|
||||
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
|
||||
let _fileName = "工单报表" + dateFormatter(new Date) + ".xlsx"
|
||||
link.style.display = 'none'//隐藏
|
||||
|
||||
// 兼容不同浏览器的URL对象
|
||||
const url = window.URL || window.webkitURL || window.moxURL
|
||||
link.href = url.createObjectURL(blob)
|
||||
link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link)
|
||||
url.revokeObjectURL(link.href)//移除url对象
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
errorBox('下载文件失败')
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('导出失败')
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
518
src/layout/stockForInv.vue
Normal file
518
src/layout/stockForInv.vue
Normal file
|
|
@ -0,0 +1,518 @@
|
|||
<template>
|
||||
<div style="margin-bottom: 10px">
|
||||
<el-config-provider :locale="zhCn">
|
||||
<div style="display: flex;justify-content: space-between;">
|
||||
<el-row>
|
||||
<el-autocomplete v-model="goodsIdQuery" :fetch-suggestions="filterGoodsId"
|
||||
popper-class="my-autocomplete" placeholder="料号" @select="handleSelectGoodsId"
|
||||
:suffix-icon="Search" style="width: 196px; margin-right: 10px;">
|
||||
<template #default="{ item }">
|
||||
<div>
|
||||
料号：<span class="goods_id">{{ item.goodsId }}</span>
|
||||
；
|
||||
名称：<span class="goods_name">{{ item.goodsName }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-autocomplete>
|
||||
<el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号"
|
||||
:suffix-icon="Search"/>
|
||||
<el-input v-model="locationIdQuery" style="width: 196px; margin-right: 10px;" placeholder="库位"
|
||||
:suffix-icon="Search"/>
|
||||
<el-select-v2 v-model="goodsTypeQuery" style="width: 158px; margin-right: 10px;" placeholder="物料类型"
|
||||
:options="goodsTypeOptions" @change="search()"></el-select-v2>
|
||||
<el-select-v2 v-model="stockStatusQuery" style="width: 158px; margin-right: 10px;" placeholder="库存状态"
|
||||
:options="stockStatusSearchOptions" @change="search()"></el-select-v2>
|
||||
<el-date-picker v-model="createTimeQuery" type="date" placeholder="选择上架日期" :shortcuts="shortcuts"
|
||||
style="width: 158px; margin-right: 10px;" clearable/>
|
||||
<el-button type="primary" @click="search()">搜索</el-button>
|
||||
<el-button type="warning" @click="reset()">重置</el-button>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-button type="success" @click="exportExcel()">导出</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
<br/>
|
||||
<el-table id="stock-table" :data="displayStocks" stripe border v-loading="loading" class="table-class"
|
||||
max-height="650px" highlight-current-row @row-click="getCurrentRow" :row-style="rowStyle"
|
||||
:header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
|
||||
@sort-change="handleSortChange">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.stockId" v-model="stockId"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="stockId" label="库存编号" fixed="left" min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column prop="vehicleId" label="箱号" fixed="left" min-width="120px" sortable="custom"
|
||||
show-overflow-tooltip/>
|
||||
<el-table-column prop="goodsId" label="物料号" fixed="left" min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column prop="goodsName" label="物料名称" min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column prop="goodsType" label="物料类型" :formatter="goodsTypeFormat"
|
||||
min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px"
|
||||
sortable="custom" show-overflow-tooltip/>
|
||||
<el-table-column prop="goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px"/>
|
||||
<el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right"
|
||||
min-width="120px"/>
|
||||
<el-table-column prop="isInventory" label="是否盘点" :formatter="yesOrNoFormat" min-width="120px"/>
|
||||
<el-table-column prop="inventoryTaskId" label="盘点任务号" min-width="120px"/>
|
||||
<el-table-column prop="noUseDays" label="未使用天数" min-width="120px"/>
|
||||
<el-table-column prop="createTime" label="上架时间" sortable="custom" :formatter="timeFormat"
|
||||
min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column prop="lastUpdateTime" label="最近更新时间" sortable="custom" :formatter="timeFormat"
|
||||
min-width="140px" show-overflow-tooltip/>
|
||||
<el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px"/>
|
||||
</el-table>
|
||||
<br/>
|
||||
<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
|
||||
:small="false" :disabled="false" :background="false" :default-page-size="10" @size-change="search"
|
||||
@current-change="search" layout="total, sizes, prev, pager, next, jumper" :total="total"/>
|
||||
</el-config-provider>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import store from '@/store'
|
||||
import {getAllStocks, updateStockInfo} from '@/api/stock.js'
|
||||
import {getGoodsInfoByGoodsId} from '@/api/goods.js'
|
||||
import {downloadStockExcel} from '@/api/excel.js'
|
||||
import {dateFormatter, locationFormatter, timeFormatter, yesOrNoFormatter} from '@/utils/formatter.js'
|
||||
import {toUnderScoreCase} from '@/utils/stringUtils.js'
|
||||
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
|
||||
import {Search} from '@element-plus/icons-vue'
|
||||
import {ref, reactive} from 'vue'
|
||||
import {errorBox} from '@/utils/myMessageBox.js'
|
||||
import {ElMessage} from 'element-plus'
|
||||
// import FileSaver from 'file-saver';
|
||||
// import * as XLSX from 'xlsx';
|
||||
</script>
|
||||
<script>
|
||||
export default {
|
||||
name: 'stockFroInv',
|
||||
props: ['selStock'],
|
||||
emits: ['update:selStock'],
|
||||
data() {
|
||||
return {
|
||||
displayStocks: [],
|
||||
currentPage: 1,
|
||||
pageSize: 10,
|
||||
total: 0,
|
||||
sortBy: '',
|
||||
isAsc: true,
|
||||
goodsIdQuery: '',
|
||||
vehicleIdQuery: '',
|
||||
locationIdQuery: '',
|
||||
goodsTypeQuery: '',
|
||||
stockStatusQuery: -99,
|
||||
createTimeQuery: null,
|
||||
shortcuts: [
|
||||
{
|
||||
text: '今天',
|
||||
value: new Date(),
|
||||
},
|
||||
{
|
||||
text: '昨天',
|
||||
value: () => {
|
||||
const date = new Date()
|
||||
date.setTime(date.getTime() - 3600 * 1000 * 24)
|
||||
return date
|
||||
},
|
||||
},
|
||||
],
|
||||
loading: true,
|
||||
stockId: '',
|
||||
stockFormRef: ref(),
|
||||
stockFormEntity: reactive({}),
|
||||
rules: reactive({}),
|
||||
labelPosition: 'top',
|
||||
dialogVisible: false,
|
||||
goodsStatusOptions: [
|
||||
{
|
||||
value: 0,
|
||||
label: '合格'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '不合格'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '延期'
|
||||
},
|
||||
{
|
||||
value: 3,
|
||||
label: '过期'
|
||||
},
|
||||
{
|
||||
value: 5,
|
||||
label: '长时间未使用'
|
||||
}
|
||||
],
|
||||
stockStatusOptions: [
|
||||
{
|
||||
value: 0,
|
||||
label: '库存正常'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '出库中'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '盘点中'
|
||||
},
|
||||
{
|
||||
value: 3,
|
||||
label: '移库中'
|
||||
},
|
||||
{
|
||||
value: 4,
|
||||
label: '拣选中'
|
||||
},
|
||||
{
|
||||
value: 5,
|
||||
label: '回库中'
|
||||
},
|
||||
{
|
||||
value: 9,
|
||||
label: '库存锁定'
|
||||
}
|
||||
],
|
||||
stockStatusSearchOptions: [
|
||||
{
|
||||
value: -99,
|
||||
label: '全部'
|
||||
},
|
||||
{
|
||||
value: 0,
|
||||
label: '库存正常'
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: '出库中'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '盘点中'
|
||||
},
|
||||
{
|
||||
value: 3,
|
||||
label: '移库中'
|
||||
},
|
||||
{
|
||||
value: 4,
|
||||
label: '拣选中'
|
||||
},
|
||||
{
|
||||
value: 5,
|
||||
label: '回库中'
|
||||
},
|
||||
{
|
||||
value: 6,
|
||||
label: '已出库'
|
||||
},
|
||||
{
|
||||
value: 9,
|
||||
label: '库存锁定'
|
||||
}
|
||||
],
|
||||
goodsList: [],
|
||||
goodsTypeOptions: [
|
||||
{
|
||||
value: "",
|
||||
label: '全部'
|
||||
},
|
||||
{
|
||||
value: "直接物料",
|
||||
label: '直接物料'
|
||||
},
|
||||
{
|
||||
value: "间接物料",
|
||||
label: '间接物料'
|
||||
}
|
||||
],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.search()
|
||||
this.loadAllGoodsInfo()
|
||||
},
|
||||
methods: {
|
||||
loadAllGoodsInfo() {
|
||||
const request = {
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
getGoodsInfoByGoodsId(request).then(res => {
|
||||
const tableResponse = res.data
|
||||
if (tableResponse.code == 0) {
|
||||
this.goodsList = tableResponse.returnData
|
||||
} else {
|
||||
errorBox(tableResponse.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('查询物料信息异常。')
|
||||
})
|
||||
},
|
||||
filterGoodsId(queryString, cb) {
|
||||
const results = queryString
|
||||
? this.goodsList.filter(this.createFilter(queryString))
|
||||
: this.goodsList
|
||||
// call callback function to return suggestion objects
|
||||
cb(results)
|
||||
},
|
||||
createFilter(queryString) {
|
||||
return (restaurant) => {
|
||||
return (
|
||||
restaurant.goodsId.toLowerCase().indexOf(queryString.toLowerCase()) != -1
|
||||
)
|
||||
}
|
||||
},
|
||||
handleSelectGoodsId(item) {
|
||||
this.goodsIdQuery = item.goodsId
|
||||
},
|
||||
locationFormat: (row, column, cellValue, index) => {
|
||||
return locationFormatter(cellValue)
|
||||
},
|
||||
dateFormat: (row, column, cellValue, index) => {
|
||||
return dateFormatter(cellValue)
|
||||
},
|
||||
timeFormat: (row, column, cellValue, index) => {
|
||||
return timeFormatter(cellValue)
|
||||
},
|
||||
goodsStatusFormat: (row, column, cellValue, index) => {
|
||||
if (cellValue === 0) {
|
||||
return '合格'
|
||||
} else if (cellValue === 1) {
|
||||
return '不合格'
|
||||
} else if (cellValue === 2) {
|
||||
return '延期'
|
||||
} else if (cellValue === 3) {
|
||||
return '过期'
|
||||
} else if (cellValue === 5) {
|
||||
return '长时间未使用'
|
||||
}
|
||||
},
|
||||
goodsTypeFormat: (row, column, cellValue, index) => {
|
||||
if (cellValue == "间接物料") {
|
||||
return '间接物料'
|
||||
} else {
|
||||
return '直接物料'
|
||||
}
|
||||
},
|
||||
stockStatusFormat: (row, column, cellValue, index) => {
|
||||
switch (cellValue) {
|
||||
case 0:
|
||||
return '库存正常'
|
||||
case 1:
|
||||
return '出库中'
|
||||
case 2:
|
||||
return '盘点中'
|
||||
case 3:
|
||||
return '移库中'
|
||||
case 4:
|
||||
return '拣选中'
|
||||
case 5:
|
||||
return '回库中'
|
||||
case 6:
|
||||
return '已出库'
|
||||
case 9:
|
||||
return '库存锁定'
|
||||
default:
|
||||
return '异常'
|
||||
}
|
||||
},
|
||||
yesOrNoFormat: (row, column, cellValue, index) => {
|
||||
return yesOrNoFormatter(cellValue)
|
||||
},
|
||||
rowStyle: ({row, rowIndex}) => {
|
||||
if (row.goodsStatus == 3) {
|
||||
return {"color": "red"}
|
||||
}
|
||||
if (row.goodsStatus == 5) {
|
||||
return {"color": "yellow"}
|
||||
}
|
||||
},
|
||||
handleSortChange(data) {
|
||||
this.sortBy = toUnderScoreCase(data.prop)
|
||||
this.isAsc = data.order == 'ascending'
|
||||
this.search()
|
||||
},
|
||||
search() {
|
||||
this.loading = true
|
||||
const request = {
|
||||
pageNo: this.currentPage,
|
||||
pageSize: this.pageSize,
|
||||
sortBy: this.sortBy,
|
||||
isAsc: this.isAsc,
|
||||
goodsId: this.goodsIdQuery.trim(),
|
||||
vehicleId: this.vehicleIdQuery.trim(),
|
||||
locationId: this.locationIdQuery.trim(),
|
||||
goodsType: this.goodsTypeQuery.trim(),
|
||||
stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery,
|
||||
createTime: timeFormatter(this.createTimeQuery),
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
getAllStocks(request).then(res => {
|
||||
const tableResponse = res.data
|
||||
if (tableResponse.code == 0) {
|
||||
this.displayStocks = tableResponse.returnData.lists
|
||||
this.total = tableResponse.returnData.total
|
||||
} else {
|
||||
errorBox(tableResponse.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('查询库存错误')
|
||||
})
|
||||
this.loading = false
|
||||
},
|
||||
reset() {
|
||||
this.goodsIdQuery = ''
|
||||
this.vehicleIdQuery = ''
|
||||
this.locationIdQuery = ''
|
||||
this.goodsTypeQuery = ''
|
||||
this.stockStatusQuery = -99
|
||||
this.createTimeQuery = null
|
||||
this.search()
|
||||
},
|
||||
getCurrentRow(row) {
|
||||
this.stockId = row.stockId
|
||||
this.$emit('update:selStock', row)
|
||||
},
|
||||
exportExcel() {
|
||||
const params = {
|
||||
goodsId: this.goodsIdQuery.trim(),
|
||||
vehicleId: this.vehicleIdQuery.trim(),
|
||||
locationId: this.locationIdQuery.trim(),
|
||||
goodsType: this.goodsTypeQuery.trim(),
|
||||
stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery,
|
||||
createTime: timeFormatter(this.createTimeQuery),
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
downloadStockExcel(params).then(res => {
|
||||
const link = document.createElement('a');//创建a标签
|
||||
try {
|
||||
// let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
|
||||
let blob = res.data //如果后台返回的直接是blob对象类型，直接获取数据
|
||||
// let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
|
||||
let _fileName = "库存报表" + dateFormatter(new Date) + ".xlsx"
|
||||
link.style.display = 'none'//隐藏
|
||||
|
||||
// 兼容不同浏览器的URL对象
|
||||
const url = window.URL || window.webkitURL || window.moxURL
|
||||
link.href = url.createObjectURL(blob)
|
||||
link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link)
|
||||
url.revokeObjectURL(link.href)//移除url对象
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
errorBox('下载文件失败')
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('导出失败')
|
||||
})
|
||||
},
|
||||
editCurrentRowStock(row) {
|
||||
this.stockFormEntity = {
|
||||
stockId: row.stockId,
|
||||
locationId: row.locationId,
|
||||
vehicleId: row.vehicleId,
|
||||
stockStatus: row.stockStatus,
|
||||
createTime: row.createTime,
|
||||
lastUpdateTime: row.lastUpdateTime,
|
||||
lastUpdateUser: row.lastUpdateUser,
|
||||
isInventory: row.isInventory,
|
||||
inventoryTaskId: row.inventoryTaskId,
|
||||
noUseDays: row.noUseDays,
|
||||
goodsId: row.goodsId,
|
||||
goodsName: row.goodsName,
|
||||
goodsStatus: row.goodsStatus,
|
||||
remainNum: row.remainNum,
|
||||
totalNum: row.totalNum,
|
||||
goodsType: row.goodsType == "间接物料" ? "间接物料" : "直接物料",
|
||||
}
|
||||
this.dialogVisible = true
|
||||
},
|
||||
submitStockInfo() {
|
||||
const request = {
|
||||
stockId: this.stockFormEntity.stockId,
|
||||
locationId: this.stockFormEntity.locationId,
|
||||
vehicleId: this.stockFormEntity.vehicleId,
|
||||
stockStatus: this.stockFormEntity.stockStatus,
|
||||
goodsId: this.stockFormEntity.goodsId,
|
||||
goodsStatus: this.stockFormEntity.goodsStatus,
|
||||
remainNum: this.stockFormEntity.remainNum,
|
||||
userName: store.getters.getUserName,
|
||||
goodsType: this.stockFormEntity.goodsType,
|
||||
}
|
||||
updateStockInfo(request).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
this.dialogVisible = false
|
||||
ElMessage.success('更新库存成功')
|
||||
this.search()
|
||||
} else {
|
||||
errorBox(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('更新库存失败')
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-pagination {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.el-row .el-button {
|
||||
width: 72px;
|
||||
margin-left: 0px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.table-class {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-select-v2 {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.el-row .el-form-item .el-input-number {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.my-autocomplete li {
|
||||
width: 196px;
|
||||
line-height: normal;
|
||||
padding: 7px;
|
||||
}
|
||||
|
||||
.my-autocomplete li .name {
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.my-autocomplete li .addr {
|
||||
font-size: 12px;
|
||||
color: #b4b4b4;
|
||||
}
|
||||
|
||||
.my-autocomplete li .highlighted .addr {
|
||||
color: #ddd;
|
||||
}
|
||||
|
||||
.my-autocomplete li .goods_id {
|
||||
color: brown;
|
||||
}
|
||||
|
||||
.my-autocomplete li .goods_name {
|
||||
color: cornflowerblue;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -6,13 +6,16 @@
|
|||
<el-select-v2 v-model="sourceQuery" style="width: 158px; margin-right: 10px;"
|
||||
placeholder="请选择查询来源" :options="sourceOptions" @change="search()"></el-select-v2>
|
||||
<el-date-picker v-model="workDateQuery" type="date" placeholder="日期" :shortcuts="shortcuts"
|
||||
style="width: 158px; margin-right: 10px;" clearable />
|
||||
style="width: 158px; margin-right: 10px;" clearable/>
|
||||
<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: #00CED1; color: #000;"
|
||||
@click="openUploadDialog()">导入
|
||||
<el-button style="background-color: #5A9CF8; color: #000; width: 120px"
|
||||
@click="dialogVisible = true">新增一个工作日
|
||||
</el-button>
|
||||
<el-button style="background-color: #00CED1; color: #000; width: 120px"
|
||||
@click="openUploadDialog()">导入工作日历
|
||||
</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
|
|
@ -22,7 +25,7 @@
|
|||
:cell-style="{ 'text-align': 'center' }">
|
||||
<el-table-column width="65px" fixed="left">
|
||||
<template v-slot="scope">
|
||||
<el-radio :label="scope.row.id" v-model="id"> </el-radio>
|
||||
<el-radio :label="scope.row.workDate" v-model="workDate"> </el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="id" label="id" fixed="left" min-width="120px" show-overflow-tooltip/>
|
||||
|
|
@ -30,7 +33,7 @@
|
|||
<el-table-column prop="remark" label="备注" min-width="120px" show-overflow-tooltip/>
|
||||
<el-table-column fixed="right" label="操作" width="240px">
|
||||
<template v-slot="scope">
|
||||
<el-button plain type="danger" @click="deleteCurrentRowOrders(scope.row)">删除</el-button>
|
||||
<el-button plain type="danger" @click="deleteCurrentRowWorkDate(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -39,10 +42,10 @@
|
|||
:small="false" :disabled="false" :background="false" :default-page-size="10"
|
||||
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
|
||||
@current-change="search"/>
|
||||
<el-dialog v-model="dialogVisible" title="工单信息" width="40%" draggable :show-close="false">
|
||||
<el-dialog v-model="dialogVisible" title="工作日信息" width="40%" draggable :show-close="false">
|
||||
<div
|
||||
style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
|
||||
<el-form ref="ordersFormRef" :model="workDateFormEntity" :label-position="labelPosition"
|
||||
<el-form ref="workDateFormRef" :model="workDateFormEntity" :label-position="labelPosition"
|
||||
label-width="100px" style="width: 95%;" :rules="rules" status-icon>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12" :offset="0">
|
||||
|
|
@ -57,8 +60,8 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="料号" prop="remark">
|
||||
<el-input v-model="workDateFormEntity.remark" clearable />
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="workDateFormEntity.remark" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -80,11 +83,11 @@
|
|||
<div style="display: flex; margin-bottom: 10px;">
|
||||
<div style="display: flex; width: 100%;">
|
||||
<div style="width: 30%; align-content: center;">时间：</div>
|
||||
<el-input v-model="uploadRecord.uploadTime" readonly />
|
||||
<el-input v-model="uploadRecord.uploadTime" readonly/>
|
||||
</div>
|
||||
<div style="display: flex; width: 100%; margin-left: 5px;">
|
||||
<div style="width: 30%; align-content: center;">人员：</div>
|
||||
<el-input v-model="uploadRecord.uploadUser" readonly />
|
||||
<el-input v-model="uploadRecord.uploadUser" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display: flex; width: 100%;">
|
||||
|
|
@ -118,6 +121,9 @@ import {Search} from '@element-plus/icons-vue'
|
|||
import UploadExcelWorkDate from "@/excel/UploadExcelWorkDate.vue";
|
||||
</script>
|
||||
<script>
|
||||
import {addWorkDate, deleteWorkDate, queryWorkDate} from "@/api/kateWork";
|
||||
import myLoading from '@/utils/loading'
|
||||
|
||||
export default {
|
||||
name: 'workDate',
|
||||
data() {
|
||||
|
|
@ -131,12 +137,12 @@ export default {
|
|||
}),
|
||||
pageSize: 10,
|
||||
total: 0,
|
||||
sourceQuery: '',
|
||||
workDateQuery: '',
|
||||
sourceQuery: 1,
|
||||
workDateQuery: null,
|
||||
loading: true,
|
||||
dialogVisible: false,
|
||||
uploadDialogVisible: false,
|
||||
id: '',
|
||||
workDate: '',
|
||||
workDateFormEntity: reactive({}),
|
||||
labelPosition: 'top',
|
||||
workDateFormRef: ref(),
|
||||
|
|
@ -156,14 +162,14 @@ export default {
|
|||
},
|
||||
],
|
||||
sourceOptions: [
|
||||
{
|
||||
value: 1,
|
||||
label: '当前使用'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '数据库'
|
||||
}
|
||||
{
|
||||
value: 1,
|
||||
label: '当前使用'
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: '数据库'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
@ -172,29 +178,28 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
search() {
|
||||
this.loading = true
|
||||
const request = {
|
||||
pageNo: this.currentPage,
|
||||
pageSize: this.pageSize,
|
||||
workOrder: this.workOrderQuery.trim(),
|
||||
goodsId: this.goodsIdQuery.trim(),
|
||||
supplyArea: this.smallBoxQuery.trim(),
|
||||
planStartDate: dateFormatter(this.planStartDateQuery),
|
||||
sourceType: this.sourceQuery,
|
||||
workDate: dateFormatter(this.workDateQuery),
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
getOrders(request).then(res => {
|
||||
this.loading = true
|
||||
queryWorkDate(request).then(res => {
|
||||
const tableResponse = res.data
|
||||
if (tableResponse.code == 0) {
|
||||
this.ordersList = tableResponse.returnData.lists
|
||||
if (tableResponse.code === 0) {
|
||||
this.workDateList = tableResponse.returnData.lists
|
||||
this.total = tableResponse.returnData.total
|
||||
} else {
|
||||
errorBox(tableResponse.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('查询工单错误')
|
||||
errorBox('查询工作日历错误')
|
||||
}).finally(() => {
|
||||
this.loading = false
|
||||
})
|
||||
this.loading = false
|
||||
},
|
||||
dateFormat: (row, column, cellValue, index) => {
|
||||
return dateFormatter(cellValue)
|
||||
|
|
@ -203,30 +208,13 @@ export default {
|
|||
return timeFormatter(cellValue)
|
||||
},
|
||||
reset() {
|
||||
this.workOrderQuery = ''
|
||||
this.goodsIdQuery = ''
|
||||
this.smallBoxQuery = ''
|
||||
this.workDateQuery = null
|
||||
this.search()
|
||||
},
|
||||
editCurrentRowOrders(row) {
|
||||
this.orderId = row.orderId
|
||||
this.ordersFormEntity = {
|
||||
orderId: row.orderId,
|
||||
workOrder: row.workOrder,
|
||||
goodsId: row.goodsId,
|
||||
supplyArea: row.supplyArea,
|
||||
requirementQuantity: row.requirementQuantity,
|
||||
orderStatus: row.orderStatus,
|
||||
lackQuantity: row.lackQuantity,
|
||||
pickedQuantity: row.pickedQuantity,
|
||||
planStartDate: row.planStartDate
|
||||
}
|
||||
this.dialogVisible = true
|
||||
},
|
||||
deleteCurrentRowOrders(row) {
|
||||
this.orderId = row.orderId
|
||||
deleteCurrentRowWorkDate(row) {
|
||||
this.workDate = row.workDate
|
||||
ElMessageBox.confirm(
|
||||
'该操作会删除选择的工单数据。\n是否继续',
|
||||
'该操作会删除选择的工作日。\n是否继续',
|
||||
'警告',
|
||||
{
|
||||
confirmButtonText: '确认',
|
||||
|
|
@ -235,19 +223,22 @@ export default {
|
|||
}
|
||||
).then(() => {
|
||||
const params = {
|
||||
orderId: this.orderId,
|
||||
workDate: this.workDate,
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
deleteOrders(params).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
ElMessage.success('删除工单信息成功。')
|
||||
myLoading.open("处理中...")
|
||||
deleteWorkDate(params).then(res => {
|
||||
if (res.data.code === 0) {
|
||||
ElMessage.success('删除工作日成功。')
|
||||
this.search()
|
||||
} else {
|
||||
errorBox(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('删除工单信息成功')
|
||||
errorBox('删除工作日成功')
|
||||
}).finally(() => {
|
||||
myLoading.close()
|
||||
})
|
||||
}).catch(() => {
|
||||
ElMessage.info('操作取消')
|
||||
|
|
@ -255,43 +246,40 @@ export default {
|
|||
},
|
||||
submitAdd(formData) {
|
||||
const params = {
|
||||
orderId: formData.orderId,
|
||||
workOrder: formData.workOrder,
|
||||
goodsId: formData.goodsId,
|
||||
supplyArea: formData.supplyArea,
|
||||
requirementQuantity: formData.requirementQuantity,
|
||||
orderStatus: formData.orderStatus,
|
||||
lackQuantity: formData.lackQuantity,
|
||||
pickedQuantity: formData.pickedQuantity,
|
||||
planStartDate: formData.planStartDate,
|
||||
workDate: formData.workDate,
|
||||
remark: formData.remark,
|
||||
userName: store.getters.getUserName
|
||||
}
|
||||
updateOrders(params).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
myLoading.open("处理中...")
|
||||
addWorkDate(params).then(res => {
|
||||
if (res.data.code === 0) {
|
||||
this.dialogVisible = false
|
||||
ElMessage.success('更新工单成功。')
|
||||
ElMessage.success('增加工作日成功。')
|
||||
this.search()
|
||||
} else {
|
||||
errorBox(res.data.message)
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('更新工单失败。')
|
||||
errorBox('增加工作日失败。')
|
||||
}).finally(() => {
|
||||
myLoading.close()
|
||||
})
|
||||
},
|
||||
getCurrentRow(row) {
|
||||
this.orderId = row.orderId
|
||||
this.workDate = row.workDate
|
||||
},
|
||||
openUploadDialog() {
|
||||
// 请求上传记录
|
||||
const param = {
|
||||
userName: store.getters.getUserName,
|
||||
fileDescription: 'ORDERS',
|
||||
fileDescription: 'WORK_DATE',
|
||||
isAsc: false,
|
||||
sortBy: 'upload_time'
|
||||
}
|
||||
myLoading.open("处理中...")
|
||||
queryUploadRecord(param).then(res => {
|
||||
if (res.data.code == 0) {
|
||||
if (res.data.code === 0) {
|
||||
if (res.data.returnData.total > 0) {
|
||||
this.uploadRecord = res.data.returnData.lists[0]
|
||||
} else {
|
||||
|
|
@ -311,6 +299,8 @@ export default {
|
|||
}).catch(err => {
|
||||
console.log(err)
|
||||
errorBox('发生异常')
|
||||
}).finally(() => {
|
||||
myLoading.close()
|
||||
})
|
||||
this.uploadDialogVisible = true
|
||||
},
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ const routes = [
|
|||
{ path: '/roleUser', component: () => import('@/layout/role_user.vue') },// 角色——用户列表
|
||||
{ path: '/rolePermission', component: () => import('@/layout/role_permission.vue') },// 角色——权限列表
|
||||
{ path: '/workDateTable', component: () => import('@/layout/workDateTable.vue') },// 工作日历
|
||||
{ path: '/stockForInv', component: () => import('@/layout/stockForInv.vue') },// 库存（盘点用）
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@ import moment from "moment";
|
|||
import { revertSeconds } from '@/utils/dateUtils'
|
||||
|
||||
function timeFormatter(date) {
|
||||
if (date === null || date === undefined) {
|
||||
if (date === null || date === undefined || date === '') {
|
||||
return ''
|
||||
}
|
||||
return moment(date).format('yyyy-MM-DD HH:mm:ss');
|
||||
}
|
||||
|
||||
function dateFormatter(date) {
|
||||
if (date === null || date === undefined) {
|
||||
if (date === null || date === undefined || date === '') {
|
||||
return ''
|
||||
}
|
||||
return moment(date).format('yyyy-MM-DD');
|
||||
}
|
||||
|
||||
function dueFormatter(date) {
|
||||
if (date === null || date === undefined) {
|
||||
if (date === null || date === undefined || date === '') {
|
||||
return ''
|
||||
}
|
||||
return revertSeconds(moment(new Date().getTime()).diff(moment(date), 'seconds'));
|
||||
|
|
@ -50,7 +50,7 @@ function taskStatusFormatter(value) {
|
|||
}
|
||||
|
||||
function locationFormatter(locationId) {
|
||||
if (locationId === null || locationId == undefined) {
|
||||
if (locationId === null || locationId === undefined || locationId === '') {
|
||||
return ''
|
||||
}
|
||||
const locationArray = locationId.split('-')
|
||||
|
|
@ -180,11 +180,11 @@ function replaceEnglishAndNumberIGAI(value) {
|
|||
}
|
||||
|
||||
function yesOrNoFormatter(value) {
|
||||
return value == 1 ? '是' : '否'
|
||||
return value === 1 ? '是' : '否'
|
||||
}
|
||||
|
||||
function converseYesOrNoFormatter(value) {
|
||||
return value == 0 ? '是' : '否'
|
||||
return value === 0 ? '是' : '否'
|
||||
}
|
||||
|
||||
export {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user