huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2

main
userName 2025-10-11 17:32:25 +08:00
parent 06630187b6
commit ecb36e4799
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wms-vue/src/components/duochaxun/Kucunrizhi.vue
View File

@ -292,7 +292,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="LOC" label="LOC"
width="80"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C2 }}</span> <span>{{ scope.row.PROP_C2 }}</span>
@ -301,10 +301,10 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
width="80"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_D2 }}</span> <span>{{ scope.row.PROP_D2!=null?new Date(scope.row.PROP_D2).toISOString().replace('T','').substring(0,10):scope.row.PROP_D2}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

2
wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
View File

@ -251,7 +251,7 @@ export default {
// 计算满在库和空在库的合计 // 计算满在库和空在库的合计
let mzkSum = this.tableData.reduce((total, row) => total + (Number(row.mzk) || 0), 0); let mzkSum = this.tableData.reduce((total, row) => total + (Number(row.mzk) || 0), 0);
let kzkSum = this.tableData.reduce((total, row) => total + (Number(row.kzk) || 0), 0); let kzkSum = this.tableData.reduce((total, row) => total + (Number(row.kzk) || 0), 0);
return 30500 - mzkSum - kzkSum; return 30000 - mzkSum - kzkSum;
}, },
}, },

4
wms-vue/src/main.js
View File

@ -8,9 +8,9 @@ import VueRouter from "vue-router";
import router from "@/router/router"; import router from "@/router/router";
import store from "@/store/store"; import store from "@/store/store";
Vue.prototype.$axios=axios; Vue.prototype.$axios=axios;
Vue.prototype.$httpUrl='http://127.0.0.1:8083'; //Vue.prototype.$httpUrl='http://127.0.0.1:8083';
//Vue.prototype.$httpUrl='http://192.68.2.88:8081'; //Vue.prototype.$httpUrl='http://192.68.2.88:8081';
// Vue.prototype.$httpUrl='http://10.1.112.23:8083'; Vue.prototype.$httpUrl='http://10.1.112.23:8083';
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.use(VueRouter) Vue.use(VueRouter)
Vue.use(ElementUI,{size:'small'}); Vue.use(ElementUI,{size:'small'});

16
wms/src/main/resources/application.yml
View File

@ -13,16 +13,16 @@ server:
spring: spring:
datasource: datasource:
# url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
url: jdbc:sqlserver://192.168.56.133:1433;DatabaseName=LD_WMSDB # url: jdbc:sqlserver://192.168.56.133:1433;DatabaseName=LD_WMSDB
# url: jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest # url: jdbc:sqlserver://10.1.119.75:1433;DatabaseName=zwlgtest
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# username: wmsdb username: wmsdb
# password: AmecDDbb32A password: AmecDDbb32A
username: liu # username: liu
password: 123456 # password: 123456
# username: sa # username: sa
# password: Amecadmin1! # password: Amec8888!
hikari: hikari:
connection-timeout: 60000 connection-timeout: 60000