yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改首页信息

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 5 months ago
parent e878668218
commit 2f0f64e293
9 changed files with 101 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-app/pages.json
Unescape View File

@ -1171,7 +1171,7 @@
}, },
{ {
"pagePath": "pages/index/home", "pagePath": "pages/index/home",
"text": "协同", "text": "消息",
"iconPath": "static/image/tabbar/workFlow.png", "iconPath": "static/image/tabbar/workFlow.png",
"selectedIconPath": "static/image/tabbar/workFlowHL.png" "selectedIconPath": "static/image/tabbar/workFlowHL.png"
}, },
@ -1190,7 +1190,7 @@
},*/ },*/
{ {
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"text": "消息", "text": "通讯录",
"iconPath": "static/image/tabbar/message.png", "iconPath": "static/image/tabbar/message.png",
"selectedIconPath": "static/image/tabbar/messageHL.png" "selectedIconPath": "static/image/tabbar/messageHL.png"
}, },

94
jnpf-app/pages/index/portal.vue
Unescape View File

@ -11,19 +11,33 @@
</view> </view>
<view class="sty-statistics-top"> <view class="sty-statistics-top">
<u-row gutter="16"> <u-row gutter="16">
<u-col span="4" text-align="center" class="line-right"> <u-col span="12" text-align="center" class="line-right">
<view class="sty-statistics-top-item"> <view class="sty-statistics-top-item">
<view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view> <view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view>
<view><span class="fsizeA">磅单采购数</span></view> <view><span class="fsizeA">磅单采购数</span></view>
</view> </view>
</u-col> </u-col>
<u-col span="4" text-align="center" class="line-right">
</u-row>
</view>
<view class="sty-statistics-top">
<u-row gutter="16">
<u-col span="12" text-align="center" class="line-right">
<view class="sty-statistics-top-item"> <view class="sty-statistics-top-item">
<view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view> <view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view>
<view><span class="fsizeA">今日采购量</span></view> <view><span class="fsizeA">今日采购量</span></view>
</view> </view>
</u-col> </u-col>
<u-col span="4" text-align="center">
</u-row>
</view>
<view class="sty-statistics-top">
<u-row gutter="16">
<u-col span="12" text-align="center">
<view class="sty-statistics-top-item"> <view class="sty-statistics-top-item">
<view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view> <view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view>
<view><span class="fsizeA">今日销售量</span></view> <view><span class="fsizeA">今日销售量</span></view>
@ -31,6 +45,9 @@
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
<view class="sty-msg"> <view class="sty-msg">
<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list"> <u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
</u-notice-bar> </u-notice-bar>
@ -122,6 +139,34 @@
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
<template>
<view class="menhu-v">
<!-- #ifndef MP -->
<template>
<template v-if="userInfo.appPortalId">
<mescroll-body ref="mescrollRef" @down="downCallback" :down="downOption" @up="upCallback"
:up="upOption" :bottombar="false" style="min-height: 100%" @init="mescrollInit">
<!-- 常规门户 -->
<view class="portal-v" v-if="authConfig.type==0">
<template v-if="formData.length">
<view class="portal-box" v-for="(item,index) in formData" :key="index">
<portalItem :item='item' ref="portalItem" :key="key" :protalData="formData"
v-if="item.show" />
</view>
</template>
</view>
</mescroll-body>
</template>
</template>
<!-- #endif -->
</view>
</template>
</view> </view>
</template> </template>
@ -196,23 +241,23 @@
onShow() { onShow() {
console.log('11112') console.log('11112')
this.getHomeInfo() this.getHomeInfo()
this.$forceUpdate() // this.$forceUpdate()
this.token = uni.getStorageSync('token') // this.token = uni.getStorageSync('token')
if (!this.$store.state.chat.socket) chat.initSocket() // if (!this.$store.state.chat.socket) chat.initSocket()
this.mpPortalUrl = this.define.baseURL + '/pages/mpPortal/index?token=' + this.token // this.mpPortalUrl = this.define.baseURL + '/pages/mpPortal/index?token=' + this.token
this.userInfo = uni.getStorageSync('userInfo') || {} this.userInfo = uni.getStorageSync('userInfo') || {}
if (!this.userInfo.appPortalId) return // if (!this.userInfo.appPortalId) return
// #ifndef MP // // #ifndef MP
this.getPortalList() // this.getPortalList()
this.$nextTick(() => { // this.$nextTick(() => {
// this.mescroll.resetUpScroll(); // // this.mescroll.resetUpScroll();
this.portalList = [] // this.portalList = []
}) // })
// #endif // // #endif
// #ifdef APP-PLUS // // #ifdef APP-PLUS
this.rightIcon = 'scan' // this.rightIcon = 'scan'
// #endif // // #endif
}, },
onReady() { onReady() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
@ -544,10 +589,12 @@
.sty-statistics-top { .sty-statistics-top {
// background-color: #2DA9FA; // background-color: #2DA9FA;
background-color: #66B3FF; background-color: #66B3FF;
padding: 0px; // padding: 0px;
//padding: 5px 0px 15px 0px; // padding: 5px 0px 15px 0px;
color: #ffffff; color: #ffffff;
padding: 5px 0px;
border-radius: 10px;
margin-top: 8px;
.sty-statistics-top-item { .sty-statistics-top-item {
padding: 5px 0px; padding: 5px 0px;
} }
@ -556,6 +603,9 @@
border-right: solid 1px #ffffff; border-right: solid 1px #ffffff;
} }
} }
.sty-statistics-top-b { .sty-statistics-top-b {
background-color: #97CBFF; background-color: #97CBFF;
padding: 0px; padding: 0px;

8
jnpf-app/pages/login/index.vue
Unescape View File

@ -207,7 +207,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
uni.hideLoading() uni.hideLoading()
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
}).catch(() => { }).catch(() => {
uni.hideLoading() uni.hideLoading()
@ -226,7 +226,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
uni.hideLoading() uni.hideLoading()
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
}).catch(() => { }).catch(() => {
uni.hideLoading() uni.hideLoading()
@ -353,7 +353,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
uni.hideLoading() uni.hideLoading()
uni.switchTab({ uni.switchTab({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
this.show = false this.show = false
}).catch(() => { }).catch(() => {
@ -447,7 +447,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
this.loading = false this.loading = false
uni.switchTab({ uni.switchTab({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false

4
jnpf-app/pages/login/otherLogin.vue
Unescape View File

@ -46,7 +46,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
uni.hideLoading() uni.hideLoading()
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
}).catch(() => { }).catch(() => {
uni.hideLoading() uni.hideLoading()
@ -71,7 +71,7 @@
this.$store.dispatch('user/getCurrentUser').then((res) => { this.$store.dispatch('user/getCurrentUser').then((res) => {
uni.hideLoading() uni.hideLoading()
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/home' url: '/pages/index/portal'
}); });
}).catch(() => { }).catch(() => {
uni.hideLoading() uni.hideLoading()

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
Unescape View File

@ -782,7 +782,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(entitys.getCargoId()); inventoryLogEntity.setStorageAreaId(entitys.getCargoId());
inventoryLogEntity.setBatchNumber(entitys.getBatchNo()); inventoryLogEntity.setBatchNumber(entitys.getBatchNo());
inventoryLogEntity.setChangeNumber((entitys.getDeliveryNum())); inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(entitys.getDeliveryNum()));
inventoryLogEntity.setInventoryNumber((inventoryEntity.getInventoryNumber()));//库存数量 inventoryLogEntity.setInventoryNumber((inventoryEntity.getInventoryNumber()));//库存数量
inventoryLogEntity.setCreatorUserId(deliveryOrder.getCreatorUserId()); inventoryLogEntity.setCreatorUserId(deliveryOrder.getCreatorUserId());
inventoryLogEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId());

4
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java
Unescape View File

@ -656,8 +656,8 @@ public class WarehousingOutboundController {
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId()); inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId());
inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber()); inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())); inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量 inventoryLogEntity.setInventoryNumber((inventoryEntity.getInventoryNumber()));//库存数量
inventoryLogEntity.setCompanyId( entity.getCompanyId()); inventoryLogEntity.setCompanyId( entity.getCompanyId());
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());

6
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java
Unescape View File

@ -501,12 +501,14 @@ public class WarehousingReceiveController {
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId()); inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId());
inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber()); inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber());
inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setCompanyId( entity.getCompanyId()); inventoryLogEntity.setCompanyId( entity.getCompanyId());
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId()); inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量
inventoryLogService.saveOrUpdate(inventoryLogEntity); inventoryLogService.saveOrUpdate(inventoryLogEntity);
} }
} }

6
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
Unescape View File

@ -504,12 +504,14 @@ public class WarehousingReportlossController {
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId()); inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId());
inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber()); inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber());
inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setCompanyId( entity.getCompanyId()); inventoryLogEntity.setCompanyId( entity.getCompanyId());
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId()); inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量
inventoryLogService.saveOrUpdate(inventoryLogEntity); inventoryLogService.saveOrUpdate(inventoryLogEntity);
} }

19
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
Unescape View File

@ -712,8 +712,9 @@ public class WorkOrderController {
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId()); inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())); inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量 inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogService.saveOrUpdate(inventoryLogEntity); inventoryLogService.saveOrUpdate(inventoryLogEntity);
} }
@ -1038,8 +1039,8 @@ public class WorkOrderController {
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId()); inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId());
inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber()); inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())); inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量 inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setCompanyId( entity.getCompanyId()); inventoryLogEntity.setCompanyId( entity.getCompanyId());
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
@ -1545,9 +1546,10 @@ public class WorkOrderController {
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());
inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId()); inventoryLogEntity.setCreatorUserId( entity.getCreatorUserId());
inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量
inventoryLogService.saveOrUpdate(inventoryLogEntity); inventoryLogService.saveOrUpdate(inventoryLogEntity);
} }
@ -1857,8 +1859,9 @@ public class WorkOrderController {
inventoryLogEntity.setWarehouseId(entity.getWarehouseId()); inventoryLogEntity.setWarehouseId(entity.getWarehouseId());
inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId()); inventoryLogEntity.setStorageAreaId(warehousingOutboundProductModel.getOutboundAreaId());
inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber()); inventoryLogEntity.setBatchNumber(warehousingOutboundProductModel.getBatchNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));
inventoryLogEntity.setInventoryNumber(new BigDecimal("0").subtract(inventoryEntity.getInventoryNumber()));//库存数量 inventoryLogEntity.setInventoryNumber(inventoryEntity.getInventoryNumber());
inventoryLogEntity.setChangeNumber(new BigDecimal("0").subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
inventoryLogEntity.setCompanyId( entity.getCompanyId()); inventoryLogEntity.setCompanyId( entity.getCompanyId());
inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); inventoryLogEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
inventoryLogEntity.setDepartmentId( entity.getDepartmentId()); inventoryLogEntity.setDepartmentId( entity.getDepartmentId());

Write Preview
Loading…
Cancel
Save