temp
dengyu 1 year ago
parent ffe27ab7ce
commit a5d44e22da

@ -7,7 +7,7 @@
content="width=device-width,initial-scale=1,minimum-scale=1,
maximum-scale=1,user-scalable=no,viewport-fit=cover"> -->
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>青岛东胜_仓储</title>
<title>东胜软件_仓储</title>
<style type="text/css">
#loading-container {
position: absolute;

@ -11,47 +11,49 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
//'application/json;charset=utf-8';//
if (process.env.NODE_ENV == 'development') {
axios.defaults.baseURL = 'http://localhost:9991/';
axios.defaults.ds7URL = 'http://47.104.102.13:8081/login.aspx';
axios.defaults.ds7URL = 'http://118.190.210.123:8081/login.aspx';
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://127.0.0.1:8990/';
axios.defaults.ds7URL = 'http://47.104.102.13:8081/login.aspx';
axios.defaults.ds7URL = 'http://118.190.210.123:8081/login.aspx';
}
else if (process.env.NODE_ENV == 'production') {
//axios.defaults.baseURL = 'http://123.234.225.158:9991/';
//axios.defaults.ds7URL = 'http://123.234.225.158:8098/login.aspx';
axios.defaults.baseURL = 'http://60.209.125.238:9994/';
axios.defaults.ds7URL = 'http://60.209.125.238:8098/login.aspx';
axios.defaults.baseURL = 'http://47.104.253.169:9991/';
axios.defaults.ds7URL = 'http://47.104.253.169:8088/login.aspx';
//axios.defaults.baseURL = 'http://123.234.180.6:9991/';
//axios.defaults.ds7URL = 'http://123.234.180.6:8098/login.aspx';
//青岛五通
}
let ipAddress = axios.defaults.baseURL;
let ds7ipAddress = axios.defaults.ds7URL;
let FormShow = {
INDO_CONFIRM: true,//入库执行页面是否显示录入状态业务等。false时不显示 用于菲尔斯特 入库执行 分受理 确认 两步时设为true
INDO_CONFIRM: false,//入库执行页面是否显示录入状态业务等。false时不显示 用于菲尔斯特 入库执行 分受理 确认 两步时设为true
INDO_FeerateShow: true,//入库执行的费率页面是否显示
MOVE_FeerateShow: true,//移库的费率页面是否显示
WanHuaHuaXue_Show: false,//入库模块中 万华化学入口按钮是否显示
MakeInDoGoods: true,//是否显示 生成入库执行 的按钮
MakeInDoGoods: false,//是否显示 生成入库执行 的按钮
isFEST: false,//标记 用户 菲尔斯特
isWUTONG: true,//标记 用户 五通
isPROJECT: false,//是否使用大宗商品项目模式。例如货转时的新旧货主隐藏。
isWUTONG: false,//标记 用户 五通
isPROJECT: false,//标记 用户 项目
isHGTY: false,//标记 用户 华港通运
isJLWL: false,//标记 用户 嘉里物流
isJGWL: true,//标记 用户 金港物流
WMSFEE_TYPE: 'showAll',// 取值 showAll showCurr 两者之一 用于限制自定义账单的形式
FeeRateSourceName: "",//入库计划中 采用什么默认的费率来源名称
FeeRateSourceName: "非协议客户",//入库计划中 采用什么默认的费率来源名称
InplanRulenumByNetweight: false,//入库计划中 如果净重修改 则同时修改申报数量
INDO_SAMEWMS: false,//入库执行 "合并入库"选项默认值 如true则默认为合并入库
INDO_SAMEWMS: true,//入库执行 "合并入库"选项默认值 如true则默认为合并入库
}
//用于控制新增加的goodsmodel2-20字段是否显示
//不同公司所需的goodsmodel不同因此这些字段的名字通过多语言模块进行控制是否显示通过GoodsModelShow控制
let GoodsModelShow = {
GOODSMODEL2: false,
GOODSMODEL3: false,
GOODSMODEL4: false,
GOODSMODEL2: true,
GOODSMODEL3: true,
GOODSMODEL4: true,
GOODSMODEL5: true,
GOODSMODEL6: false,
GOODSMODEL7: false,
@ -111,7 +113,7 @@ let FormShowBase = {
let FestShow = JSON.parse(JSON.stringify(FormShowBase));
FestShow.显示入库计划的生成入库受理按钮 = true;
FestShow.入库计划导入明细时用毛重填充为0的净重 = true;
FestShow.入库计划导入明细时用毛重填充为0的净重 = false;
let LocalShow = FormShowBase;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 82 KiB

File diff suppressed because it is too large Load Diff

@ -9,7 +9,7 @@ module.exports = {
SEALNO: '封号',
CUSTOMNO: '报关单号',
ETA: '到港日',
CORPID: '分公司',
CORPID: '业务归属',
ACCDATE: '会计期间',
CUSTNO: '客户订单号',
MBLNOCNTRNO:'提单号/箱号',
@ -33,6 +33,25 @@ module.exports = {
BSSOURCE: '业务来源',
MASTERBSNO: '业务来源编码',
GOODSMODEL: '规格型号',
GOODSMODEL2: '幅宽/规格',
GOODSMODEL3: '克重',
GOODSMODEL4: '品牌',
GOODSMODEL5: '等级',
GOODSMODEL6: '规格型号6',
GOODSMODEL7: '规格型号7',
GOODSMODEL8: '规格型号8',
GOODSMODEL9: '规格型号9',
GOODSMODEL10: '规格型号10',
GOODSMODEL11: '规格型号11',
GOODSMODEL12: '规格型号12',
GOODSMODEL13: '规格型号13',
GOODSMODEL14: '规格型号14',
GOODSMODEL15: '规格型号15',
GOODSMODEL16: '规格型号16',
GOODSMODEL17: '规格型号17',
GOODSMODEL18: '船名',
GOODSMODEL19: '航次',
GOODSMODEL20: '核注清单号',
MATERIALNO: '物料号',
PALLET: '托盘',
GOODSLABEL: '标签',
@ -73,6 +92,9 @@ module.exports = {
GOODSMODEL_DATE_8: 'GOODSMODEL_DATE_8',
GOODSMODEL_DATE_9: 'GOODSMODEL_DATE_9',
GOODSMODEL_DATE_10: 'GOODSMODEL_DATE_10',
////
PKGS_FIRST: '入库件数',
PKGS_TOTAL: '总件数',
@ -203,7 +225,17 @@ module.exports = {
QUANTITY: '数量',
QUANTITY_DUNTIAN:'计费单位.天(吨天)',
AMOUNT: '金额',
PRICE:'单价',
PRICE: '单价',
SPE_PKGS: '计划指定件数',
SPE_SMALLPKGS: '计划指定件数2',
SPE_MINPKGS: '计划指定件数3',
SPE_KGS: '计划指定毛重(千克)',
SPE_CBM: '计划指定体积(立方米)',
SPE_NETWEIGHT: '计划指定净重(千克)',
SPE_STORAGEUNITCOUNT: '计划指定计费数量',
SPE_KGS_TON: '计划指定毛重(吨)',
SPE_NETWEIGHT_TON: '计划指定净重(吨)',
TRUCKNO: '车号',
DRIVERNAME:'司机',
@ -218,20 +250,30 @@ module.exports = {
WORKNUM: '车次',
WORKTYPE: '项目',
WORKERTYPE: '角色',
WORKTOTAL: '工作总量',
CUSTNO_OUT: '出库交货单号',
BOOLFIELD_01: '是否换标签',
BOOLFIELD_02: '是否贴小标签',
BOOLFIELD_03: '是否打托',
BOOLFIELD_04: '是否取样',
STRFIELD_01: '出库订单号',
WORKTOTAL:'',
TRADETYPE: '贸易方式',
SALE: '销售',
WMSWORKTYPE: '装卸方式',
RMBNODR: 'RMB未收',
USDNODR: 'USD未收',
OTNODR: '其它未收',
TTLNODR: '未收(合RMB)',
//WMSPLANID: '装卸方式',
PKGS_REMAIN: '剩余件数',
KGS_REMAIN: '剩余毛重(千克)',
CBM_REMAIN: '剩余体积(立方米)',
NETWEIGHT_REMAIN: '剩余净重(千克)',
RULEUNITCOUNT_REMAIN: '剩余申报数量',
STORAGEUNITCOUNT_REMAIN: '剩余计费数量',
RULEAMOUNT_REMAIN: '剩余申报金额',
KGS_TON_REMAIN: '剩余毛重(吨)',
NETWEIGHT_TON_REMAIN: '剩余净重(吨)',
WEIGHTTYPE: '过磅方式',
INSPECTIONTIME: '查验时间',
labeltitle: {//this.$t('labeltitle.')
fee: '费用',
GroupByBill: '按票汇总',
@ -259,7 +301,8 @@ module.exports = {
SelectOutPlan: '选择出库计划',
SelectAcceptDetail: '选择受理明细',
GoodsInfo:'商品信息',
GoodsInfo: '商品信息',
CustAreagoodsNodr:'客户库存与欠费',
},
feetitle: {
CUSTOMERNAME: '结算对象',
@ -313,6 +356,7 @@ module.exports = {
货权转移计划: '货权转移计划',
货权转移确认: '货权转移确认',
移库: '移库',
移库操作: '移库操作',
移库操作计划: '移库操作计划',
移库操作确认: '移库操作确认',
仓库盘点: '仓库盘点',
@ -321,13 +365,16 @@ module.exports = {
出库管理:'出库管理',
出库计划: '出库计划',
出库受理: '出库受理',
出库受理: '出库计划',
出库确认: '出库确认',
出库统计表: '出库统计表',
库存管理: '库存管理',
库存初始化: '库存初始化',
库位示意图: '库位示意图',
库存查询表_1: '库存查询表_1',
业务编码表: '业务编码表',
工作量系数表: '工作量系数表',
库存查询汇总: '库存查询汇总',
库存查询明细: '库存查询明细',
历史库存查询: '历史库存查询',
@ -382,11 +429,14 @@ module.exports = {
个人列表设置: '个人列表设置',
无菜单子窗口: '无菜单子窗口',
入库计划_明细: '入库计划_明细',
入库受理_明细: '入库受理_明细',
入库执行_明细: '入库执行_明细',
出库前置计划_明细: '出库前置计划_明细',
出库计划_明细: '出库计划_明细',
出库受理_明细: '出库受理_明细',
出库受理_明细: '出库计划_明细',
出库执行_明细: '出库执行_明细',
出库计划_待取用_明细: '出库计划_待取用_明细',
@ -398,6 +448,7 @@ module.exports = {
自定义字段: '自定义字段',
当前库存信息: '当前库存信息',
当前剩余库存汇总: '当前剩余库存汇总',
工作量表: '工作量表',
大宗散货管理: '大宗散货管理',
@ -414,18 +465,7 @@ module.exports = {
进口核注清单: '进口核注清单',
出口核注清单: '出口核注清单',
综合业务管理: '综合业务管理',
入库通知执行情况: '入库通知执行情况',
商品与客户部门关系: '商品与客户部门关系',
//以下是演示库内的标题
菲尔斯特入库受理: '入库受理(三步版第二步)',
菲尔斯特出库计划: '出库计划(三步版第一步)',
仓储费自定义账单: '仓储费自定义账单',
协议客户费率维护: '协议客户费率维护',
库位效果图: '库位效果图',
货权转移_录入: '货权转移',
移库_录入: '移库',
仓库盘点_录入: '仓库盘点',
入库通知执行情况:'入库通知执行情况',
},
MSG: {
请先填写入库商品: '请先填写入库商品',
@ -517,11 +557,13 @@ module.exports = {
OUTPLANDOBEFORE_CALLBACK: '重新录入',
OUTPLANDOBEFORE_END: '计划完成',
OUTPLANDOBEFORE_UNEND: '取消完成',
OUTPLANDO: '提交受理',
OUTPLANDO_ACCESS: '出库受理',
OUTPLANDO_CALLBACK:'取消受理',
LoadingFinish: '生成费用',
LoadingUndo: '取消生成费用',
OUTPLANDO: '提交审核',
OUTPLANDO_ACCESS: '审核通过',
OUTPLANDO_ACCESS2: '审核通过',
OUTPLANDO_CALLBACK: '取消审核',
LoadingFinish: '费用确认',
LoadingUndo: '取消费用确认',
CarryoutFinish: '审核完毕',
CarryoutUndo: '取消审核',
@ -571,6 +613,9 @@ module.exports = {
ReportPrint: '打印报表',
AddPic: '添加图片1',
Jingang_bancaiIndetify: '识别板材明细表',
Jingang_normalIndetify: '识别入库明细表',
Fenleijianguan_Post: '库存申报',
Fenleijianguan_CangkuPost: '仓库库位申报',
WMSPrint: '打印库存明细',
@ -614,7 +659,7 @@ module.exports = {
REINFORCE:'加固数量',
},
OUT_PLAN: {
title: '出库受理',
title: '出库计划',
WMSNO: '出库计划编号',
PLANTIME:'计划出库日期',
},
@ -623,7 +668,7 @@ module.exports = {
},
OUT_DO: {
title: '出库确认',
LoadingFinish: '生成费用'
LoadingFinish: '费用确认'//LoadingFinish: '费用确认',//生成费用
},
OUT_DO_PROJECT: {
title: '货物出库'

@ -32,12 +32,12 @@
<div class="bottom">平均增长趋势{{item.up}}%</div>
</div>-->
<div class="ivu-col ivu-col-span-6">
<li class="item-name">未开始入库通知</li>
<li class="rate" v-if="planinfo.itemname=='未开始入库计划'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
<li class="item-name">超期货物</li>
<li class="rate" v-for="(wmsinfo, infoindex) in WMSOVERTIMEINFO">{{wmsinfo.mblno}} {{wmsinfo.indate.replace("0:00:00","")}} {{wmsinfo.days}}</li>
</div>
<div class="ivu-col ivu-col-span-6">
<li class="item-name">正在入库</li>
<li class="rate" v-if="planinfo.itemname=='执行中的入库计划'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
<li class="item-name">执行中的入库通知</li>
<li class="rate" v-if="planinfo.itemname=='未开始入库通知'||planinfo.itemname=='正在入库'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
</div>
<div class="ivu-col ivu-col-span-6">
<li class="item-name">未开始出库计划</li>
@ -178,6 +178,7 @@ export default {
// chukuliang:[10, 150, 1, 250,20, 100, 10,150],
// churukudate:['2020.06.15', '2020.06.16', '2020.06.17',
// '2020.06.18', '2020.06.19', '2020.06.20', '2020.06.21','2020.06.22']
WMSOVERTIMEINFO:[],
rukuliang:[],
chukuliang:[],
huozhuanliang:[],
@ -213,7 +214,9 @@ export default {
_this.PLANSTATUSINFO=result.rows;
});
this.http.post("/api/VW_OP_WMS_HOMESHOW_PLANSTATUS/GetWMSOVERTIMEINFO",param).then(result => {
_this.WMSOVERTIMEINFO=result.rows;
});
},
DoSearch_1(){

@ -1,17 +1,17 @@
<template>
<div id="vol-container"
:class="['vol-theme-' + theme]">
<div class="vol-aside"
:style="{width:menuWidth+'px'}">
<div class="header"
<div class="vol-aside" v-show="!hidepath"
:style=" { width:menuWidth+'px'}">
<div class="header"
:style="{width:menuWidth-1+'px'}">
<img v-show="!isCollapse"
<img v-show="!isCollapse "
v-bind:src="logo" />
<Icon type="ios-list"
<Icon type="ios-list"
@click="toggleLeft"
class="collapse-menu" />
</div>
<div class="vol-menu">
<div class="vol-menu" >
<el-scrollbar style="height:100%;">
<VolMenu :onSelect="onSelect"
:isCollapse="isCollapse"
@ -19,7 +19,7 @@
</el-scrollbar>
</div>
</div>
<div class="vol-container"
<div class="vol-container"
:style="{left:menuWidth-1+'px'}">
<!-- <div class="vol-aside">
@ -38,7 +38,7 @@
<div class="vol-header">
<div class="vol-header" v-show="!hidepath">
<span class="header-text"><!--支持业务代码扩展的快速开发框架--></span>
<div class="header-info">
<div class="h-link">
@ -72,7 +72,7 @@
</div>
</div>
</div>
<div class="vol-path">
<div class="vol-path" v-show="!hidepath">
<!-- 2020.05.31增加顶部导tabs超出后滚动 -->
<Tabs @on-click="selectNav"
:before-remove="removeNav"
@ -89,9 +89,8 @@
:label="item.name"></TabPane>
</Tabs>
</div>
<div class="vol-main"
id="vol-main">
<el-scrollbar style="height:100%;">
<div :class="hidepath?'vol-mainhide':'vol-main'" id="vol-main" >
<el-scrollbar style="height:100%;" >
<!-- 2020.06.03增加路由切换时加载提示 -->
<loading v-show="$store.getters.isLoading()"></loading>
<!-- 2020.10.09增加路由keepAlive属性设置不缓存组件(默认缓存组件) -->
@ -125,6 +124,7 @@ export default {
data() {
return {
menuWidth: 200,
isCollapse: false,
menu_theme: "light",
theme_moel: false,
@ -153,6 +153,8 @@ export default {
{ text: "安全退出", path: "/login", id: -4 },
],
menuOptions: [],
hidepath:false,
mainposition:"absolute"
};
},
components: {
@ -164,6 +166,14 @@ export default {
if (theme) {
this.theme = theme;
}
this.hidepath=localStorage.getItem("hidepath")=="true";
if(this.hidepath){
this.menuWidth=0;
this.mainposition='revert';
}
this.menu_theme = this.theme == "white" ? "dark" : "light";
let userInfo = this.$store.getters.getUserInfo();
this.userName = userInfo.userName;
@ -472,6 +482,19 @@ body {
.vol-main {
border-left: 1px solid #eee;
position: absolute;
/*revert absolute*/
width: 100%;
/* height: 100%; */
bottom: 0;
top: 93px;
margin: 0;
/* padding: 15px; */
overflow: auto;
}
.vol-mainhide {
border-left: 1px solid #eee;
position: revert;
/*revert absolute*/
width: 100%;
/* height: 100%; */
bottom: 0;
@ -487,7 +510,7 @@ body {
padding: 5px;
}
.header img {
height: 49% !important;
height: 77% !important;
margin-right: 20px !important;
margin-top: 11px;
}

@ -5,7 +5,7 @@
<div class="logo">
<img src="../../src/assets/imgs/logo.png" />
</div>
<div class="switch">
<div class="switch" >
<select v-model="$i18n.locale">
<option v-for=" item in this.$langlist"
:key="item.key"
@ -46,7 +46,7 @@
<Icon :size="20" />公司代码
</label>
</div>
<el-select
<el-select v-show="false"
v-model="userInfo.userCompanycode"
placeholder="请选择分公司"
filterable
@ -61,6 +61,9 @@
:value="item.key"
></el-option>
</el-select>
<div class="f-input" v-show="true">
<input type="text" v-focus v-model="userInfo.userCompanycode" placeholder="输入公司代码" />
</div>
<div class="f-remove" @click="clearSelect">
<Icon type="ios-close-circle" />
</div>
@ -123,7 +126,7 @@
-->
</div>
<div class="loging-btn">
<Button size="large" :loading="loading" type="info" @click="login" long>
<Button size="large" :loading="loading" type="info" @click="login(true)" long>
<span v-if="!loading"></span>
<span v-else>...</span>
</Button>
@ -137,11 +140,9 @@
</div>
</div>
<div class="login-footer">
<!-- 企业信息
<p>Copyright © 2020 lanhai-tech Inc. All Rights Reserved.</p>
<p>青岛蓝海软通信息技术有限公司 版权所有</p>
-->
<!-- -->
<!-- -->
<p>Copyright © 2021 dongsheng-soft Inc. All Rights Reserved.</p>
<p>青岛东胜软件信息技术有限公司 版权所有</p>
@ -161,8 +162,10 @@ export default {
userCompanyName: "",
userName: "",
passWord: "",
//hideCompCMB:false
},
companys: [],
Language:"中文",
};
},
directives: {
@ -174,8 +177,21 @@ export default {
},
created() {
//this.getVierificationCode();
if(this.$route.query.companycode && this.$route.query.codename && this.$route.query.pwd){
//alert(this.$route.query.companycode+this.$route.query.codename+this.$route.query.pwd);
this.userInfo.userCompanycode=this.$route.query.companycode;
this.userInfo.userName=this.$route.query.codename;
this.userInfo.passWord=this.$route.query.pwd;
localStorage.setItem('hidepath',true);
this.login();
//
}else{
localStorage.setItem('hidepath',false);
}
this.getCompany();
//this.hideCompCMB=(this.http.FormShow.isHGTY)
},
watch: {
@ -191,6 +207,15 @@ export default {
// this.userInfo.UUID = x.uuid;
// });
// },
onInit(){
if(this.$i18n.locale=='en'){
this.Language='English';
}
},
getCompany() {
//let companys = [];
this.http.get("/api/Sys_Dictionary/getCompany").then((dic) => {
@ -206,16 +231,20 @@ export default {
},
loginPress(e) {
if (event.keyCode == 13) {
this.login();
this.login(true);
}
},
selectAndloginPress(e) {
if (this.userInfo.userCompanycode.indexOf("-") != -1 || this.userInfo.userCompanycode=="")
this.selectBlur(e);
this.login();
this.login(true);
},
login() {
login(type=false) {
if(type==true){
localStorage.setItem('hidepath',false);
}
if (
this.userInfo.userCompanycode == "" ||
this.userInfo.userCompanycode.trim() == ""

@ -19,7 +19,7 @@
//"DbConnectionString": "Data Source=192.168.2.151,11433;Initial Catalog=DSWMS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=47.105.53.126,12356;Initial Catalog=DSWMS_Dev;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//1
"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=shippingweb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=shippingweb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=DSWMS_Dev;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//
//"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=ShippingWeb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
@ -64,6 +64,7 @@
//
//"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//
//"DbConnectionString": "Data Source=59.110.216.226,52431;Initial Catalog=ShippingWeb_QDQSSD;Persist Security Info=True;User ID=QSSD;Password=SL226QSsd@@;Connect Timeout=500;",

Loading…
Cancel
Save