新增单据

prod
anthonywj 2 years ago
parent 0b9caeb230
commit 79a98e5944

@ -3,8 +3,8 @@ VUE_APP_TITLE = UDI管理系统
# 生产环境配置
ENV = 'production'
VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

@ -8,6 +8,15 @@ export function getBusTypeList(params) {
});
}
export function getLocalJoinByUser(params) {
return axios({
url: "/udiwms/localBusType/filterJoinByUser",
method: "get",
params: params
});
}
export function insertBusType(data) {
return axios({
url: "/udiwms/bussinessType/insert",

@ -0,0 +1,378 @@
import axios from '@/utils/request'
export function orderList(query) {
return axios({
url: "/admin/warehouse/inout/order/list",
method: "get",
params: query
});
}
export function orderGetUdi(query) {
return axios({
url: "/udiwms/inout/order/getUdi",
method: "get",
params: query
});
}
export function deleteCodesTempById(query) {
return axios({
url: "/warehouse/inout/deleteCodesTempById",
method: "get",
params: query
});
}
export function submitOrderWeb(query) {
return axios({
url: "/warehouse/inout/submitOrderWeb",
method: "get",
params: query
});
}
export function saveOrderWeb(query) {
return axios({
url: "/warehouse/inout/saveOrderWeb",
method: "post",
data: query
});
}
export function orderListError(query) {
return axios({
url: "/udiwms/inout/order/error",
method: "get",
params: query
});
}
export function orderListRepeat(query) {
return axios({
url: "/admin/warehouse/inout/order/listRepeat",
method: "get",
params: query
});
}
export function codeList(query) {
return axios({
url: "/admin/warehouse/inout/findByOrderId",
method: "get",
params: query
});
}
export function addOrderWeb(query) {
return axios({
url: "/warehouse/inout/addOrderWeb",
method: "post",
data: query
});
}
export function enterCodeWeb(query) {
return axios({
url: "/warehouse/inout/enterCode",
method: "post",
data: query
});
}
export function postOrdersWeb(query) {
return axios({
url: "/warehouse/inout/postOrdersWeb",
method: "post",
data: query
});
}
export function mergeOrder(query) {
return axios({
url: "/warehouse/inout/order/mergeOrder",
method: "post",
data: query
});
}
export function updateUnit(query) {
return axios({
url: "/udiwms/inout/order/updateUnit",
method: "post",
data: query
});
}
export function filterOrder(query) {
return axios({
url: "/udiwms/inout/order/filter",
method: "get",
params: query
});
}
export function selectNew(query) {
return axios({
url: "/admin/warehouse/inout/order/selectNew",
method: "get",
params: query
});
}
export function selectWait(query) {
return axios({
url: "/sale/inout/order/selectWait",
method: "get",
params: query
});
}
export function selectStatus(query) {
return axios({
url: "/sale/inout/order/selectStatus",
method: "get",
params: query
});
}
export function selectDownload(query) {
return axios({
url: "/sale/inout/order/selectDownload",
method: "get",
params: query
});
}
export function selectFinish(query) {
return axios({
url: "/sale/inout/order/selectFinish",
method: "get",
params: query
});
}
export function selectSubOrders(query) {
return axios({
url: "/sale/inout/order/selectSubOrders",
method: "get",
params: query
});
}
export function errorCodeList(query) {
return axios({
url: "/admin/warehouse/inout/findErrorByOrderId",
method: "get",
params: query
});
}
export function deleteByOrderId(query) {
return axios({
url: "/udiwms/inout/order/delete",
method: "post",
data: query
});
}
export function deleteCodes(query) {
return axios({
url: "/warehouse/inout/code/deleteCodes",
method: "post",
data: query
});
}
export function commitOrder(query) {
return axios({
url: "/warehouse/inout/commit",
method: "post",
data: query
});
}
export function addCommitOrder(query) {
return axios({
url: "/warehouse/inout/addCommit",
method: "post",
data: query
});
}
export function updateExportStatus(query) {
return axios(
{
url: "/warehouse/inout/order/updateExportStatus",
method: "post",
data: query
}
)
}
export function orderDetail(query) {
return axios(
{
url: "/warehouse/inout/order/detail",
method: "get",
params: query
}
)
}
export function updateBind(query) {
return axios(
{
url: "/udiwms/erpOrder/updateBind",
method: "post",
data: query
}
)
}
export function updateBindSup(query) {
return axios(
{
url: "/udiwms/erpOrder/updateBindSup",
method: "post",
data: query
}
)
}
export function updateCodeBindSup(query) {
return axios(
{
url: "/udiwms/addCode/updateBindSup",
method: "post",
data: query
}
)
}
export function backStock(query) {
return axios(
{
url: "/sale/inout/order/backStock",
method: "get",
params: query
}
)
}
export function uploadOrder(query) {
return axios(
{
url: "/warehouse/inout/order/uploadOrder",
method: "post",
data: query
}
)
}
export function moveStock(query) {
return axios(
{
url: "/sale/inout/order/moveStock",
method: "post",
data: query
}
)
}
export function findAllByOrderId(query) {
return axios({
url: "/admin/warehouse/inout/findAllByOrderId",
method: "get",
params: query
});
}
export function revokeOredr(query) {
return axios({
url: "/spms/inout/order/revoke",
method: "get",
params: query
});
}
export function exportJson(query) {
return axios({
url: "/warehouse/inout/order/exportXml",
method: "post",
data: query,
headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
responseType: 'arraybuffer', //一定要设置响应类型否则页面会是空白pdf
});
}
export function expireTimeCheck(query) {
return axios(
{
url: "/warehouse/inout/expireTimeCheck",
method: "post",
data: query
}
)
}
export function filterOrderForDelete(params) {
return axios({
url: "/udiwms/inout/order/filterOrderForDelete",
method: "get",
params: params
});
}
export function updateOrderInfo(data) {
return axios({
url: "/udiwms/inout/order/updateOrderInfo",
method: "post",
data: data
})
}
export function getOrderById(params) {
return axios({
url: "/udiwms/inout/order/getOrderById",
method: "get",
params: params
})
}
export function updateOrder(data) {
return axios({
url: "/udiwms/inout/order/updateOrder",
method: "post",
data: data
})
}
export function uploadSpms(query) {
return axios(
{
url: "/warehouse/inout/order/uploadSpms",
method: "post",
data: query
}
);
}
export function updateOrderPrintRemark(data) {
return axios({
url: "/udiwms/inout/order/updateOrderPrintRemark",
method: "post",
data: data
});
}

@ -8,6 +8,14 @@ export function filterSubAll(query) {
params: query
});
}
export function findByInvUser(query) {
return axios({
url: "/udiwms/busType/findByInvUser",
method: "get",
params: query
});
}
export function filterSubByInv(query) {
return axios({
@ -17,6 +25,16 @@ export function filterSubByInv(query) {
});
}
export function findByDeptUser(query) {
return axios({
url: "/spms/inv/warehouse/findByDeptUser",
method: "get",
params: query
});
}
export function filterSub(query) {
return axios({
url: "/spms/sub/inv/warehouse/filterSub",

@ -1,50 +1,106 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar"/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
<!-- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<div class="inv-hos-title">
<span style="font-weight: bold;color: #303133;">平和县医院</span>
<span
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
</div>
<search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
<size-select id="size-select" class="right-menu-item hover-effect"/>
</el-tooltip>
</template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<i class="el-icon-caret-bottom" />
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown">
<!-- <router-link to="/user/profile">-->
<!-- <el-dropdown-item>个人中心</el-dropdown-item>-->
<!-- </router-link>-->
<!-- <router-link to="/user/profile">-->
<!-- <el-dropdown-item>个人中心</el-dropdown-item>-->
<!-- </router-link>-->
<el-dropdown-item @click.native="setting = true">
<span>布局设置</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="changeInv">
<span>切换仓库</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<el-dialog
title="请选择当前部门与仓库"
:visible.sync="selInvVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="35%"
v-if="selInvVisible"
>
<el-form :model="userInfo" label-width="100px" :rules="formRules" ref="dataForm">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="locDeptCode" label="当前部门:">
<el-select v-model="userInfo.locDeptCode" placeholder="请选择当前部门" clearable
style="width: 90%"
@change="deptChange">
<el-option
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="locInvCode" label="当前仓库:">
<el-select v-model="userInfo.locInvCode" placeholder="请选择当前仓库" clearable
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div style="margin-top: 8px ; color: #F71616; font-size: 12px">
<span>提示进入系统请先选择您当前所在部门与仓库&nbsp;</span>
</div>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="submitInv"></el-button>
<el-button type="primary" @click="closeDialog"></el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import {mapGetters} from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
@ -53,8 +109,32 @@ import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
import store from "@/store";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
import {updateInv} from "@/api/auth/authAdmin";
import {isRelogin} from "@/utils/request";
import router from "@/router";
export default {
data() {
return {
inv: store.getters.locInvName,
selInvVisible: false,
userInfo: {},
deptList: [],
invList: [],
formRules: {
locDeptCode: [
{required: true, message: "请选择当前部门", trigger: "blur"}
],
locInvCode: [
{required: true, message: "请选择当前仓库", trigger: "blur"}
],
},
};
},
components: {
Breadcrumb,
TopNav,
@ -101,8 +181,91 @@ export default {
this.$store.dispatch('LogOut').then(() => {
location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
})
}).catch(() => {});
}
}).catch(() => {
});
},
changeInv() {
this.selInvVisible = true;
},
getDeptList() {
this.deptList = [];
filterAllByUser()
.then((response) => {
this.deptList = response.data || [];
this.getInvList();
})
.catch(() => {
});
},
deptChange() {
this.getInvList();
},
getInvList() {
this.invList = [];
let query = {
deptCode: this.userInfo.locDeptCode
};
findByDeptUser(query)
.then((response) => {
this.invList = response.data || [];
if (this.invList != null && this.invList.length == 1) {
this.userInfo.locInvCode = this.invList[0].code;
}
})
.catch(() => {
});
},
submitInv() {
this.$refs["dataForm"].validate(valid => {
if (valid) {
if (this.$isBlank(this.userInfo.locInvCode)) {
this.$message.error("当前仓库不能为空!");
return;
}
if (this.userInfo.customerId == 110) {
if (this.$isBlank(this.userInfo.locSubInvCode)) {
this.$message.error("当前分库不能为空!");
return;
}
}
updateInv(this.userInfo).then((res) => {
if (res.code == 20000) {
this.$message.success("设置成功!");
this.selInvVisible = false;
store.dispatch('GetInfo').then(() => {
this.inv = store.getters.locInvName
});
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.selInvVisible = false;
});
}
});
},
closeDialog() {
this.selInvVisible = false;
},
},
created() {
this.userInfo = {
id: store.getters.adminId,
locInvCode: store.getters.locInvCode,
locDeptCode: store.getters.locDeptCode,
};
this.getDeptList();
this.getInvList()
}
}
</script>
@ -113,7 +276,7 @@ export default {
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
.hamburger-container {
line-height: 46px;
@ -121,7 +284,7 @@ export default {
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
@ -169,6 +332,14 @@ export default {
}
}
.inv-hos-title {
display: inline-block;
height: 100%;
font-size: 18px;
color: #5a5e66;
vertical-align: text-bottom;
}
.avatar-container {
margin-right: 30px;

@ -0,0 +1,115 @@
"use strict";
/**
* 浏览器按键处理
* howay
* 20200421
* 1.0
*/
const KeyScaner = /** @class */ (function () {
function KeyScaner(_dom) {
this.keybufs = [];
this.altBuf = [];
this.isShift = false;
this.lastTime = 0;
/**
* 在收集到文本输入时触发
* @param text 收集到的连续文本
*/
this.onInput = function (text) {
};
this.dom = _dom;
_dom.addEventListener('keydown', this.onKeyDown.bind(this));
_dom.addEventListener('keyup', this.onKeyUp.bind(this));
this.interval = setInterval(this.onTick.bind(this), 100);
}
KeyScaner.prototype.appendChar = function (c) {
this.keybufs.push(c);
};
KeyScaner.prototype.onKeyDown = function (ev) {
this.lastTime = new Date().getTime();
if (ev.key == "Alt") {
if (ev.shiftKey || ev.ctrlKey || ev.metaKey) {
return;
}
} else if (ev.key == "Shift") {
if (ev.altKey || ev.ctrlKey || ev.metaKey) {
return;
}
this.isShift = true;
} else if (ev.key == "Enter") {
if (ev.shiftKey || ev.altKey || ev.ctrlKey || ev.metaKey) {
return;
}
this.appendChar("\r");
this.completeInput(); //立即完成输入
} else if (ev.key == "Delete" || ev.key == "Backspace") {
this.dom.innerTex = "";
this.appendChar("delete");
this.completeInput(); //立即完成输入
} else {
if (ev.key.length == 1) {
var charCode = ev.key.charCodeAt(0);
console.log("key="+charCode);
if (charCode >= 48 && charCode <= 57) {
if (ev.altKey) {
this.altBuf.push(ev.key);
} else {
this.appendChar(ev.key);
}
} else if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
//忽略大小写锁定键直接通过SHIFT键判断大小写
if (ev.shiftKey) {
this.appendChar(ev.key.toUpperCase());
} else {
this.appendChar(ev.key.toLowerCase());
}
} else {
this.appendChar(ev.key);
}
}
//忽略其他控制键
}
};
KeyScaner.prototype.onKeyUp = function (ev) {
this.lastTime = new Date().getTime();
if (ev.key == "Alt") {
if (this.altBuf && this.altBuf.length > 0) {
var str = this.altBuf.join("");
var num = parseInt(str);
var c = String.fromCharCode(num);
this.appendChar(c);
this.altBuf = [];
}
} else if (ev.key == "Shift") {
this.isShift = false;
}
};
KeyScaner.prototype.completeInput = function () {
var text = this.keybufs.join("");
this.keybufs = [];
if (this.onInput) {
this.onInput.bind(this)(text);
}
};
KeyScaner.prototype.onTick = function () {
if (this.keybufs && this.keybufs.length > 0 && (!this.altBuf || this.altBuf.length == 0) && new Date().getTime() - this.lastTime > 500) {
//有缓存的字符且没有缓存的alt字符 且 与上次按键时间超过500毫秒。 收集输入
// this.completeInput();
}
};
/**
* 释放资源
*/
KeyScaner.prototype.dispose = function () {
this.dom.removeEventListener('keydown', this.onKeyDown);
this.dom.removeEventListener('keyup', this.onKeyUp);
clearInterval(this.interval);
};
return KeyScaner;
}());
export default {
KeyScaner
}

@ -16,5 +16,11 @@ const getters = {
defaultRoutes: state => state.permission.defaultRoutes,
sidebarRouters: state => state.permission.sidebarRouters,
customerId: state => state.user.customerId,
companyName: state => state.user.companyName,
locDeptCode: state => state.user.locDeptCode,
locInvCode: state => state.user.locInvCode,
locDeptName: state => state.user.locDeptName,
locInvName: state => state.user.locInvName,
adminId: state => state.user.adminId,
}
export default getters

@ -3,15 +3,19 @@ import {getToken, setToken, removeToken, removeAdminId, setAdminId} from '@/util
const user = {
state: {
adminId:"",
adminId: "",
token: getToken(),
name: '',
avatar: '',
roles: [],
permissions: [],
employeeName:"",
customerId:"",
companyName:"",
employeeName: "",
customerId: "",
companyName: "",
locDeptCode: "",
locInvCode: "",
locDeptName: "",
locInvName: "",
},
mutations: {
@ -19,7 +23,6 @@ const user = {
SET_ADMINID: (state, adminId) => {
state.adminId = adminId
},
SET_TOKEN: (state, token) => {
state.token = token
},
@ -45,6 +48,18 @@ const user = {
SET_COMPANYNAME: (state, companyName) => {
state.companyName = companyName
},
SET_LOCDEPTCODE: (state, locDeptCode) => {
state.locDeptCode = locDeptCode
},
SET_LOCIVNCODE: (state, locInvCode) => {
state.locInvCode = locInvCode
},
SET_LOCDEPTNAME: (state, locDeptName) => {
state.locDeptName = locDeptName
},
SET_LOCIVNNAME: (state, locInvName) => {
state.locInvName = locInvName
},
},
actions: {
@ -84,7 +99,12 @@ const user = {
commit('SET_EMPLOYEENAME', user.employeeName)
commit('SET_CUSTOMERID', user.customerId)
commit('SET_COMPANYNAME', user.companyName)
commit('SET_LOCDEPTCODE', user.locDeptCode)
commit('SET_LOCIVNCODE', user.locInvCode)
commit('SET_LOCDEPTNAME', user.locDeptName)
commit('SET_LOCIVNNAME', user.locInvName)
resolve(res)
console.log("获取用户数据成功-=----");
}).catch(error => {
reject(error)
})
@ -102,6 +122,10 @@ const user = {
commit('SET_EMPLOYEENAME', "")
commit('SET_CUSTOMERID', "")
commit('SET_COMPANYNAME', "")
commit('SET_LOCDEPTCODE', "")
commit('SET_LOCIVNCODE', "")
commit('SET_LOCDEPTNAME', "")
commit('SET_LOCIVNNAME', "")
removeToken()
removeAdminId()
resolve()
@ -111,16 +135,6 @@ const user = {
})
},
// 前端 登出
FedLogOut({commit}) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
commit('SET_ADMINID', '')
removeToken()
removeAdminId()
resolve()
})
}
}
}

@ -0,0 +1,144 @@
function pluralize(time, label) {
if (time === 1) {
return time + label;
}
return time + label + "s";
}
export function timeAgo(time) {
const between = Date.now() / 1000 - Number(time);
if (between < 3600) {
return pluralize(~~(between / 60), " minute");
} else if (between < 86400) {
return pluralize(~~(between / 3600), " hour");
} else {
return pluralize(~~(between / 86400), " day");
}
}
export function parseTime(time, cFormat) {
if (arguments.length === 0) {
return null;
}
if ((time + "").length === 10) {
time = +time * 1000;
}
const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
let date;
if (typeof time === "object") {
date = time;
} else {
date = new Date(parseInt(time));
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
};
const timeStr = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key];
if (key === "a")
return ["一", "二", "三", "四", "五", "六", "日"][value - 1];
if (result.length > 0 && value < 10) {
value = "0" + value;
}
return value || 0;
});
return timeStr;
}
export function rTime(date) {
var json_date = new Date(date).toJSON();
return new Date(new Date(json_date) + 8 * 3600 * 1000)
.toISOString()
.replace(/T/g, " ")
.replace(/\.[\d]{3}Z/, "");
}
export function formatTime(time, option) {
time = +time * 1000;
const d = new Date(time);
const now = Date.now();
const diff = (now - d) / 1000;
if (diff < 30) {
return "刚刚";
} else if (diff < 3600) {
// less 1 hour
return Math.ceil(diff / 60) + "分钟前";
} else if (diff < 3600 * 24) {
return Math.ceil(diff / 3600) + "小时前";
} else if (diff < 3600 * 24 * 2) {
return "1天前";
}
if (option) {
return parseTime(time, option);
} else {
return (
d.getMonth() +
1 +
"月" +
d.getDate() +
"日" +
d.getHours() +
"时" +
d.getMinutes() +
"分"
);
}
}
/* 数字 格式化 */
export function nFormatter(num, digits) {
const si = [
{ value: 1e18, symbol: "E" },
{ value: 1e15, symbol: "P" },
{ value: 1e12, symbol: "T" },
{ value: 1e9, symbol: "G" },
{ value: 1e6, symbol: "M" },
{ value: 1e3, symbol: "k" }
];
for (let i = 0; i < si.length; i++) {
if (num >= si[i].value) {
return (
(num / si[i].value + 0.1)
.toFixed(digits)
.replace(/\.0+$|(\.[0-9]*[1-9])0+$/, "$1") + si[i].symbol
);
}
}
return num.toString();
}
export function html2Text(val) {
const div = document.createElement("div");
div.innerHTML = val;
return div.textContent || div.innerText;
}
export function toThousandslsFilter(num) {
return (+num || 0)
.toString()
.replace(/^-?\d+/g, m => m.replace(/(?=(?!\b)(\d{3})+$)/g, ","));
}
/**
* 格式化文件大小
* @param value
* @returns {*}
*/
export function renderSize(value) {
if (!value || value === null || value === "") {
return "";
}
let unitArr = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
let srcsize = parseFloat(value);
let index = Math.floor(Math.log(srcsize) / Math.log(1024));
let size = srcsize / Math.pow(1024, index);
size = size.toFixed(0); // 保留的小数位数
return size + unitArr[index];
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,15 @@
<template>
<div>
</div>
</template>
<script>
export default {
name: "IoCreateOrderBizDetail"
}
</script>
<style scoped>
</style>

@ -0,0 +1,15 @@
<template>
<div>
</div>
</template>
<script>
export default {
name: "IoCreateOrderCodeDetail"
}
</script>
<style scoped>
</style>

@ -0,0 +1,211 @@
<template>
<div>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
:row-style="rowStyle"
border
ref="multipleTable">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column
label="UDI码"
prop="code"
width="250"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="供应商"
prop="supName"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="100"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
width="100"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" width="180">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteCode(scope.$index, scope.row)"
>减一
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="bindRl(scope.row)"
>选择产品
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="handleUnitClick(scope.row)"
>选择供应商
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="editCode(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<pagination
v-show="total>0"
:total="total"
:page.sync="query.page"
:limit.sync="query.limit"
@pagination="getList"
/>
</div>
</div>
</template>
<script>
import {deleteCodesTempById, errorCodeList} from "@/api/inout/order";
export default {
name: "IoAddCodeDetail",
props: {
idQuery: {
type: Object,
required: true,
},
},
data() {
return {
loading: false,
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 10,
},
codeArray: [],
total: 0,
curRow: null,
selectRlVisible: false,
dialogTableVisible: false,
editCodeVisible: false,
}
},
methods: {
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType;
}
this.tableSelection();
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteCode(index, row) {
this.$confirm("是否确定移除一个条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
let tQuery = {
id: row.id
}
deleteCodesTempById(tQuery)
.then((response) => {
if (response.code === 20000) {
this.getCodeList();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
}).catch(() => {
});
},
bindRl(val) {
this.curRow = val;
this.selectRlVisible = true;
},
handleUnitClick(row) {
this.curRow = row;
this.dialogTableVisible = true;
},
editCode(row) {
this.editTitle = "编辑条码";
this.codeDetail = row;
this.editCodeVisible = true;
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
},
created() {
this.getCodeList();
},
}
</script>
<style scoped>
</style>

@ -0,0 +1,737 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号:"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="subInvChange"
>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addOrders"></el-button>
<el-button type="primary" icon="el-icon-error" @click="errOrders"></el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="扫码单据类型" prop="billTypeName">
</el-table-column>
<el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="220">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="当前分库" prop="subInvName" width="120">
</el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
</el-table-column>
<el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.actDate }}</span>
</template>
</el-table-column>
<el-table-column label="校验状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="addOrders(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status !== -1"
@click.native.stop="onUpload(scope.row.id)"
>立即处理
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
<span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"
> </el-button
>
</span>
</el-dialog>
<el-dialog
title="选择往来单位"
:visible.sync="dialogTableVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="70%"
>
<el-form :inline="true" :model="unitquery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input v-model="unitquery.key" placeholder="搜索"></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="search"
@click.native.stop="getUnitList()"
>查询
</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="unitlist"
style="width: 100%"
@row-click="selectUnit"
>
<el-table-column
label="往来单位ID"
prop="erpId"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="往来单位名称"
prop="name"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="往来单位简写"
prop="spell"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="地址"
prop="addr"
show-overflow-tooltip
></el-table-column>
<el-table-column label="状态" prop="status"></el-table-column>
<el-table-column label="类型" prop="type"></el-table-column>
</el-table>
</el-dialog>
<el-dialog
title="异常订单"
:visible.sync="errOrderVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<ioErrorOrder
></ioErrorOrder>
</el-dialog>
<el-dialog
title="新增单据"
:visible.sync="addOrderVisible"
width="75%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:idQuery="idQuery"
></addOrder>
</el-dialog>
<el-dialog
title="单号详情"
:visible.sync="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="codeDetailVisible"
>
<codeDetail
:idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog"
></codeDetail>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
</el-card>
</div>
</template>
<script>
import {
filterOrder,
deleteByOrderId,
commitOrder,
updateUnit, mergeOrder,
} from "../../api/inout/order";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import draggable from "vuedraggable";
// import codeDetail from "./errorCode";
// import ioErrorOrder from "./IOErrorOrder";todo
import addOrder from "./IoCreateOrder";
import store from "../../store";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
const formJson = {
site_id: "",
site_name: "",
describe: "",
ads: [],
};
export default {
name: "IoNewOrder",
data() {
return {
showSearch: true,
filterQuery: {
id: "",
mainAction: null,
action: null,
page: 1,
status: 10,
limit: 10,
locStorageCode: this.$store.getters.locInvCode,
invWarehouseCode: this.$store.getters.locSubInvCode,
},
checkStatus: {
'-1': "草稿",
// 1: "",
1: "等待处理",
2: "等待校验",
3: "校验异常",
4: "校验成功",
},
curIndex: "",
unitquery: {key: "", page: 1, limit: 20},
unitlist: [],
multipleSelection: [],
unitUpdateQuery: {
id: "",
fromCorpId: "",
fromCorp: "",
},
idQuery: {
id: "",
},
storageList: [],
subInvList: [],
errOrderVisible: false,
list: [],
adId: [],
adSelectList: [],
adList: {},
adListNoDataText: "无数据",
queryAdIdAsyncLoading: false,
codeDetailVisible: false,
addOrderVisible: false,
total: 0,
loading: false,
index: null,
formName: null,
errorDetail: "1111111111111",
formMap: {
add: "新增",
edit: "编辑",
},
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点"
},
deleteData: {
id: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
formData: formJson,
deleteLoading: false,
busTypes: [],
};
},
components: {
draggable,
// codeDetail,
addOrder,
// ioErrorOrder
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
status: 10,
page: 1,
limit: 10,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getBusType() {
if (this.subInvList.length > 0) {
this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
}
let query = {
code: this.filterQuery.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
})
.catch(() => {
});
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
getSubStorageName(code) {
for (let i = 0; i < this.subInvList.length; i++) {
if (this.subInvList[i].code === code) {
return this.subInvList[i].name;
}
}
},
addOrders(row) {
this.idQuery.id = '';
this.idQuery.actDate = '';
this.idQuery.corpOrderId = '';
this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id;
this.idQuery.actDate = row.actDate;
this.idQuery.corpOrderId = row.corpOrderId;
this.idQuery.billType = row.action;
this.idQuery.locStorageCode = row.locStorageCode;
this.idQuery.invWarehouseCode = row.invWarehouseCode;
this.idQuery.fromSubInvCode = row.fromSubInvCode;
this.idQuery.deptCode = row.deptCode;
this.idQuery.preCheck = row.preCheck;
}
this.addOrderVisible = true;
this.idQuery.action = row.action;
this.idQuery.fromCorp = row.fromCorp;
this.idQuery.fromCorpId = row.fromCorpId;
this.idQuery.preCheck = row.preCheck;
},
errOrders() {
this.errOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.addHosOrderVisible = false;
this.getList();
},
getUnitList() {
this.loading = true;
getBasicUnitMaintains(this.unitquery)
.then((response) => {
this.loading = false;
this.unitlist = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
selectUnit(row) {
this.unitUpdateQuery.id = this.curIndex;
this.unitUpdateQuery.fromCorp = row.name;
this.unitUpdateQuery.fromCorpId = row.unitid;
updateUnit(this.unitUpdateQuery)
.then((response) => {
this.dialogTableVisible = false;
this.getList();
})
.catch(() => {
this.dialogTableVisible = false;
});
},
//
getList() {
this.loading = true;
// this.filterQuery.status = -1;
this.filterQuery.customerId = store.getters.customerId;
// this.filterQuery.status = 1;
// this.filterQuery.statusOrOne = -1;
if (isBlank(this.filterQuery.locStorageCode)) {
this.filterQuery.locStorageCode = this.$store.getters.locInvCode;
this.filterQuery.invWarehouseCode = this.$store.getters.locSubInvCode;
}
filterOrder(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
mergesOrders() {
let repeatData = this.multipleSelection;
if (repeatData.length <= 1) {
this.$message.warning("未选择单据!");
return;
}
let orderid = repeatData[0].id;
let unit = repeatData[0].fromCorp;
let action = repeatData[0].action;
let orderList = [];
for (let index in repeatData) {
if (action !== repeatData[index].action) {
this.$message.warning("业务类型不一致!");
return;
}
if (unit !== repeatData[index].fromCorp) {
this.$message.warning("往来单位不一致!");
return;
}
orderList.push(repeatData[index].id);
}
let tquery = {
orderList: orderList,
type: 2,
};
this.$confirm(
"所选择的订单将会合并到订单号为" + orderid + "的订单下",
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
mergeOrder(tquery).then((response) => {
if (response.code === 20000) {
this.getList();
this.$message({
type: "success",
message: "合并成功",
});
} else {
this.$message.error(response.message);
}
});
})
.catch(() => {
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.id = data;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
onUpload(data) {
this.loading = true;
var idQuery = {
orderId: "",
};
idQuery.orderId = data;
commitOrder(idQuery)
.then((response) => {
if (response.code == 20000) {
this.$message.success(response.data);
for (let i = 0; i < this.list.length; i++) {
if (this.list[i].id === idQuery.orderId) {
this.list.splice(i, 1);
break;
}
}
this.loading = false;
} else {
this.loading = false
this.$message.error(response.message);
}
})
.catch(() => {
});
},
handleErrorDetail(poistion) {
var mOrder = this.list[poistion];
var corpOrderId = mOrder.remark;
this.errorDetail = mOrder.remark;
this.dialogVisible = true;
},
intentDetail(row) {
this.codeDetailVisible = true;
this.idQuery.id = row.id;
},
invChange() {
this.subInvList = [];
this.filterQuery.invWarehouseCode = "";
let query = {
pcode: this.filterQuery.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getSubInvList() {
let query = {
// pcode: this.filterQuery.locStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
},
subInvChange() {
this.getBusType();
},
init() {
axios.get("./config.json").then(res => {
//
let response = res.data.BASE_URL;
this.uploadFileUrl = response + "/udiwms/orders/file/upload";
});
},
},
filters: {
statusFilterType(status) {
const statusMap = {
false: "success",
true: "warning",
};
return statusMap[status];
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {
if (res.data.paramValue === "0") {
this.enableDept = true;
}
}
})
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -56,7 +56,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
<span>Copyright © 2018-2022 glxp All Rights Reserved.</span>
</div>
</div>
</template>

@ -166,11 +166,9 @@
</el-dialog>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!-- 部门绑定用户列表-->
<el-tab-pane>
<span slot="label">{{ currentRow.name }}-用户列表</span>
<el-form :inline="true" :model="userQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="用户名称/账号:">
<el-input
@ -200,7 +198,6 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="userloading" :data="userlist" style="width: 100%" border
row-key="id"
>
@ -226,7 +223,6 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="userTotal>0"
:total="userTotal"

Loading…
Cancel
Save