chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Labels Milestones

New Pull Request

temp #2

Merged
dengyu merged 2 commits from temp into dev 1 year ago
Conversation 0 Commits 2 Files Changed 5
5 changed files with 31505 additions and 13101 deletions
Show Stats Download Patch File Download Diff File

42164
Vol.Vue/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
Vol.Vue/package.json
Unescape Escape View File

@ -56,7 +56,7 @@
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"cross-spawn": "^5.0.1", "cross-spawn": "^5.0.1",
"css-loader": "^0.28.11", "css-loader": "^0.28.11",
"eslint": "^5.16.0", "eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1", "eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0", "eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.7.1", "eslint-loader": "^1.7.1",
@ -84,7 +84,7 @@
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"selenium-server": "^3.0.1", "selenium-server": "^3.0.1",
"semver": "^5.3.0", "semver": "^5.3.0",
"shelljs": "^0.8.5", "shelljs": "^0.7.6",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"stylus-loader": "^3.0.2", "stylus-loader": "^3.0.2",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",

2
Vol.Vue/src/extension/wms/OP_WMS_OUT_PLAN.js
Unescape Escape View File

@ -245,10 +245,12 @@ let extension = {
this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.load(); this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.load();
this.$refs.modelBody.$refs.tab_chfee.$refs.tab_chfee.load(); this.$refs.modelBody.$refs.tab_chfee.$refs.tab_chfee.load();
//this.$refs.modelBody.$refs.table_outdogoods.load(); //this.$refs.modelBody.$refs.table_outdogoods.load();
this.$refs.modelBody.$refs.tab_wmsfee.load();
} else { } else {
this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.reset(); this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.reset();
this.$refs.modelBody.$refs.tab_chfee.$refs.tab_chfee.reset(); this.$refs.modelBody.$refs.tab_chfee.$refs.tab_chfee.reset();
//this.$refs.modelBody.$refs.table_outdogoods.reset(); //this.$refs.modelBody.$refs.table_outdogoods.reset();
this.$refs.modelBody.$refs.tab_wmsfee.reset();
} }

2
Vol.Vue/src/views/wms/VW_OP_WMS_IN_DO.vue
Unescape Escape View File

@ -80,7 +80,7 @@
,[{"title":this.$t('DODATE_IN'),"field":"DODATE","type":"date"} ,[{"title":this.$t('DODATE_IN'),"field":"DODATE","type":"date"}
,{"dataKey":"goodsfeetype","data":[],"title":this.$t('GOODSFEETYPE'),"field":"GOODSFEETYPE","type":"select"} ,{"dataKey":"goodsfeetype","data":[],"title":this.$t('GOODSFEETYPE'),"field":"GOODSFEETYPE","type":"select"}
,{"title":this.$t('CNTRNO'),"field":"CNTRNO","type":"like"} ,{"title":this.$t('CNTRNO'),"field":"CNTRNO","type":"like"}
,{"dataKey":"user","data":[],"title":this.$t('INPLAN.Creator'),"field":"CreateID","type":"select"}] ,{"dataKey":"username","data":[],"title":this.$t('INPLAN.Creator'),"field":"CreateID","type":"select"}]
,[{"data":[{ key: '1000', value: '录入状态' } ,[{"data":[{ key: '1000', value: '录入状态' }
, { key: '1001', value: '入库受理'} , { key: '1001', value: '入库受理'}
, { key: '1002', value: '入库待审核' } , { key: '1002', value: '入库待审核' }

4
Vue.Net/VOL.WebApi/appsettings.json
Unescape Escape View File

@ -36,7 +36,7 @@
//"DbConnectionString": "Data Source=47.104.148.25,12356;Initial Catalog=ShippingWeb_QDWTSJ_20211201;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=47.104.148.25,12356;Initial Catalog=ShippingWeb_QDWTSJ_20211201;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//华港通运 //华港通运
"DbConnectionString": "Data Source=118.190.210.123,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=118.190.210.123,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=118.190.210.123,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=118.190.210.123,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//连云港中鹏 //连云港中鹏
@ -65,7 +65,7 @@
//"DbConnectionString": "Data Source=36.112.133.3,53076;Initial Catalog=ShippingWeb_JLWL;Persist Security Info=True;User ID=JLWLsa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=36.112.133.3,53076;Initial Catalog=ShippingWeb_JLWL;Persist Security Info=True;User ID=JLWLsa;Password=Ds20040201;Connect Timeout=500;",
//金港 //金港
//"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_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_QDHGTY;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=47.104.253.169,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",

Write Preview
Loading…
Cancel
Save