Browse Source

修改消息提示

pda_nev
李俊城 11 months ago
parent
commit
12bf2c4ba2
  1. 4
      fe/PDA/api/index.js
  2. 27
      fe/PDA/pages/assemble/assembleTransfer.vue
  3. 19
      fe/PDA/pages/container/containerCall.vue
  4. 26
      fe/PDA/pages/cotaing/coatingTransfer.vue
  5. 34
      fe/PDA/pages/injection/injectionTransfer.vue
  6. 60
      fe/PDA/pages/message/index.vue
  7. 116
      fe/PDA/pages/task/countFgDetail.vue
  8. 75
      fe/PDA/pages/task/countRawDetail.vue
  9. 4
      fe/PDA/static/config.json
  10. 2
      fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue
  11. 10
      fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue

4
fe/PDA/api/index.js

@ -202,8 +202,8 @@ export const getBalancesExpectByFilter = (params) => request(
data: params
});
// ERP料号模糊匹配查询库存
export const getBalancesByItemCode = (params) => request(
devUrl + "/api/pda/get-fuzzy-by-balances-request-many-parameter", {
export const getBalancesByItemCode = (params) => promise(
devUrl + "/api/pda/inventory/balances/get-fuzzy-by-balances-request-many-parameter", {
method: 'post',
data: params
});

27
fe/PDA/pages/assemble/assembleTransfer.vue

@ -173,6 +173,13 @@
});
}
},
remove(index) {
showConfirmMsg("确定移除?", res => {
if (res) {
this.itemList.splice(index, 1);
}
})
},
getScanResult(result) {
let that = this;
@ -201,7 +208,7 @@
stdPackQty: result.stdPackQty,
uom: result.uom,
qty: result.stdPackQty,
fromLocationCode: "ZPCP1",
fromLocationCode: result.locationCode,
fromStatus: 2,
toStatus:2
}
@ -240,16 +247,21 @@
});
let that = this;
locations(code).then(res => {
if (res == null) {
uni.hideLoading();
if (res) {
//
if (res.type == 1 || res.type == 6 || res.type == 13) {
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
} else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
uni.hideLoading();
}).catch(err => {
that.toLocationCode = ''
this.locationGotFocus = true;
@ -322,7 +334,10 @@
that.showMessage(err.message);
uni.hideLoading();
});
}else {
that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
})
},

19
fe/PDA/pages/container/containerCall.vue

@ -133,17 +133,28 @@
res.checked = false
})
item.checked = true;
this.containerModelCode =item.code;
this.containerModelCode = item.code;
},
getContainerModelList() {
uni.showLoading({
title: '加载中...',
mask: true
});
getDictByCode("ContainerSpecificationsType").then(res => {
uni.hideLoading();
if (res && res.items.length > 0) {
res.items.forEach(item => {
item.value = item.code;
item.checked = false
})
this.containerModelList = res.items;
}).catch(error => {
} else {
this.showMessage('获取器具规格失败,请在字典中维护器具规格');
}
}).catch(error => {
uni.hideLoading();
this.showMessage('获取器具规格失败【' + error + '】');
})
},
openScanLocation() {
@ -192,7 +203,7 @@
},
clearData() {
this.containerModelCode = ""
this.containerModelList.forEach(res=>{
this.containerModelList.forEach(res => {
res.checked = false
});
},
@ -213,7 +224,7 @@
this.$refs.comMessage.showCommitSuccess(message);
},
closeCommitMessage(){
closeCommitMessage() {
navigateBack(1)
},

26
fe/PDA/pages/cotaing/coatingTransfer.vue

@ -173,6 +173,13 @@
});
}
},
remove(index) {
showConfirmMsg("确定移除?", res => {
if (res) {
this.itemList.splice(index, 1);
}
})
},
getScanResult(result) {
let that = this;
@ -201,7 +208,7 @@
stdPackQty: result.stdPackQty,
uom: result.uom,
qty: result.stdPackQty,
fromLocationCode: "ZPCP1",
fromLocationCode: result.locationCode,
fromStatus: 2,
toStatus:2
}
@ -240,16 +247,21 @@
});
let that = this;
locations(code).then(res => {
if (res == null) {
uni.hideLoading();
if (res) {
//
if (res.type == 1 || res.type == 6 || res.type == 13) {
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
} else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
uni.hideLoading();
}).catch(err => {
that.toLocationCode = ''
this.locationGotFocus = true;
@ -322,6 +334,8 @@
that.showMessage(err.message);
uni.hideLoading();
});
}else {
that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
})

34
fe/PDA/pages/injection/injectionTransfer.vue

@ -45,7 +45,7 @@
<view class="">
<button type="primary" size="mini" style="margin-left: 30rpx;"
@click="remove(item,index)">移除</button>
@click="remove(index)">移除</button>
</view>
</view>
@ -130,7 +130,7 @@
locationErpCode: '',
toLocationErpCode: '',
locationGotFocus: false,
transferType:"Transfer_Injection"
transferType: "Transfer_Injection"
};
},
props: {
@ -174,6 +174,14 @@
}
},
remove(index) {
showConfirmMsg("确定移除?", res => {
if (res) {
this.itemList.splice(index, 1);
}
})
},
getScanResult(result) {
let that = this;
let code = result.itemCode;
@ -203,7 +211,7 @@
qty: result.stdPackQty,
fromLocationCode: result.locationCode,
fromStatus: 2,
toStatus:2
toStatus: 2
}
this.itemList.unshift(item);
@ -241,15 +249,15 @@
let that = this;
locations(code).then(res => {
uni.hideLoading();
if(res){
if (res) {
//
if(res.type==1||res.type==6||res.type==13){
if (res.type == 1 || res.type == 6 || res.type == 13) {
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
}else {
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
}else {
} else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
@ -300,17 +308,17 @@
this.itemList.forEach(r => {
r.toLocationCode = that.toLocationCode;
r.toLocationErpCode = this.toLocationErpCode
r.fromLot ="";
r.fromLot = "";
r.fromLocationArea = this.fromLocationInfo.areaCode;
r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
r.fromWarehouseCode = localStorage.warehouseCode;
r.toLot ="";
r.fromPackingCode="";
r.toLot = "";
r.fromPackingCode = "";
r.toPackingCode = "";
r.toWarehouseCode =localStorage.warehouseCode;
r.toWarehouseCode = localStorage.warehouseCode;
r.worker = localStorage.userName_CN == "" ? localStorage.userName :
localStorage.userName_CN
item.details.push(r);
@ -328,8 +336,8 @@
that.showMessage(err.message);
uni.hideLoading();
});
}else {
that.showMessage("库位["+this.itemList[0].fromLocationCode+"]不存在");
} else {
that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
})

60
fe/PDA/pages/message/index.vue

@ -1,21 +1,40 @@
<template>
<view class="body-view msg_body">
<!-- 头部 -->
<scroll-view class="top-menu-view" scroll-x="true" :scroll-left="scrollLeft">
<block v-for="(menuTab,index) in menuTabs" :key="index">
<view class="menu-topic-view" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable>
<view class="" style="width: 100%;height: 100%; background-color: #fff;">
<scroll-view scroll-y="" >
<scroll-view class="">
<view class="" v-for="(menuTab,index) in menuTabs" :key="index">
<view class="" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable>
<view :class="[currentTab==index ? 'menu-topic-act' : 'menu-topic']">
<view class="menu-topic-txt">{{menuTab.name}}
<text v-if="menuTab.name == '全部'"
:class="[unreadCount>0?'tipred':'' ]">{{Math.abs(unreadCount)>99?'99+':unreadCount==0?'':unreadCount}}</text>
<view class="menu-topic-txt" style="font-size: 35rpx; margin-left: 10rpx;">{{menuTab.name}}
<text v-if="menuTab.name == '未读'">
({{Math.abs(unreadCount)>99?'99+':unreadCount==0?'':unreadCount}})</text>
</view>
<view class="menu-topic-bottom">
<view class="menu-topic-bottom-color"></view>
<view class=""
style="width: 150rpx; height: 6rpx; margin: 10rpx; background-color: #5A7CF3">
</view>
</view>
</view>
</view>
</block>
</scroll-view>
<uni-list class="list msg_list" style="margin-bottom: 200rpx;" >
<uni-list :border="true" v-for="(item ,index) in allMessageList" :key="item.id">
<view class="uni-flex" style="flex-direction: row; align-items: center;">
<view class="" style="margin-left: 10rpx;">
({{index+1}})
</view>
<uni-list-chat :title="item.title" avatar="../../static/images/message.svg" clickable
:note="item.content" :time="item.sendTime" badge-positon="left"
:badge-text="item.hasRead === false?'dot':''" @click="jumpdetails(item)"
:class="item.hasRead === false?'':'hasread'">
</uni-list-chat>
</view>
</uni-list>
</uni-list>
<!-- <view class="uni-list">
<view class="uni_list_cell uni-flex">
<view class="image">
@ -30,14 +49,21 @@
</view>
</view>
</view> -->
<uni-list class="list msg_list">
</scroll-view>
<!-- 头部 -->
<!-- <uni-list class="list msg_list">
<uni-list :border="true" v-for="item in allMessageList" :key="item.id">
<uni-list-chat :title="item.title" avatar="../../static/images/message.svg" clickable
:note="item.content" :time="item.sendTime" badge-positon="left"
:badge-text="item.hasRead === false?'dot':''" @click="jumpdetails(item)"
:class="item.hasRead === false?'':'hasread'"></uni-list-chat>
</uni-list>
</uni-list>
</uni-list> -->
<!-- 展示列表内容 -->
<!-- <uni-list class="list">
<uni-list :border="true" v-for="item in allMessageList" :key="item.id">
@ -74,7 +100,7 @@
currentTab: 0,
// Tab
menuTabs: [{
name: '全部'
name: '未读'
},
// {
// name: ''
@ -90,7 +116,7 @@
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}else if(e.index === 1){
} else if (e.index === 1) {
window.location.reload();
}
},
@ -207,9 +233,11 @@
align-items: center;
justify-content: center;
}
.uni-list--border:after{
.uni-list--border:after {
height: 0;
}
.top-menu-view .menu-topic-view .menu-topic:first-child {
margin-left: 30upx;
}

116
fe/PDA/pages/task/countFgDetail.vue

@ -4,9 +4,13 @@
<view class="" style="display:flex;flex-direction: column;">
<view class="top_card">
<com-count-scan-detail :jobContent="datacontent" :allCount="allCount" :scanCount="scanCount"
:newCount="newCount" :location="location">
:newCount="newCount" :location="location" :countOrder="datacontent.inventoryStage">
</com-count-scan-detail>
</view>
<view class="" style="margin: 20rpx;">
<button type="primary" @click="queryItemCode">ERP料号查询</button>
</view>
<scroll-view scroll-y="true" style="margin-bottom: 50rpx;">
<view v-for="(item ,index) in showList" :key="index">
<view class="detail-content common_card">
@ -135,6 +139,7 @@
<com-easy-input-count ref="countPopup" @confirm='closeEditCount'></com-easy-input-count>
<win-inventory-status ref="statusPopup"></win-inventory-status>
<!-- com-message必须放在最下层 -->
<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" />
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message>
<!-- <uni-load-more :status="loadingType" v-if="details.length>0"></uni-load-more> -->
@ -150,6 +155,7 @@
getBalancesByFilterAsync,
getitems,
locationsAsync,
getBalancesByItemCode
} from '@/api/index.js';
import {
@ -237,7 +243,12 @@
pageSize: 20,
jobStatus: "",
index: 0,
showList: []
showList: [],
userForm: {
names: [],
values: [],
origin: []
}
}
},
props: {},
@ -339,6 +350,87 @@
this.loadingType = "";
this.showList = this.getDataPage(this.index, this.pageSize)
},
queryItemCode(){
this.$refs.wzSelectPopup.open({
mode: 'radio', //radio checkbox
// dataList:[], //dataList使proxyConfig
selected: this.userForm.values, //
proxyConfig: { //
reqFun: this.reqGetList, //,Promise.resolve([])
localPaging: false //
},
search: {
type: 'remote', //local | remote
},
fields: {
label: 'name',
value: 'code'
}
})
},
selectCheckbox(mode, resultData) {
console.log(mode, resultData)
var result = resultData
var itemCode = result.itemCode;
var itemScan = this.scanAllDetails.filter(r =>
r.itemCode == itemCode&&
r.inventoryStage==this.datacontent.inventoryStage&&
r.isDelete==false)
// if(itemScan.length == 0){
// let detail = this.creatDetail(result);
// this.setDetailNoBalance(detail, result)
// detail.inventoryQty=result.qty
// detail.countQty =result.qty
// this.scanAllDetails.unshift(detail);
// this.initList();
// this.calcScanCount();
// this.$forceUpdate();
// }else if (itemScan.length == 1){
// setTimeout(res => {
// showConfirmMsg("" + itemCode + ",", res => {
// if (res) {
// this.setQty(itemScan[0], itemScan[0].inventoryQty, false);
// }
// })
// }, 100)
// }
if (itemScan.length > 0) {
setTimeout(res => {
showConfirmMsg("物料【" + itemCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
if (res) {
this.setQty(itemScan[0], itemScan[0].inventoryQty, false);
}
})
}, 100)
return;
}
let items = this.originalDetails.filter(r =>
r.itemCode === itemCode&&r.inventoryStage==this.datacontent.inventoryStage)
//
if (items.length == 0) {
this.addNewDetail(result)
} else if (items.length == 1) {
var item = items[0];
item.isNew =true;
this.setQty(item, item.inventoryQty, true);
} else {
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据');
}
},
reqGetList(data) {
let params = {
pageSize: data.pageSize,
pageIndex: data.pageIndex,
itemCode: data.searchValue,
locationCode:this.datacontent.locationCode
};
return getBalancesByItemCode(params);
},
getDetail() {
uni.showLoading({
title: '加载中...',
@ -390,8 +482,16 @@
var itemCode =result.itemCode;
this.getitem(itemCode,res=>{
var result = res;
result.itemCode = result.code;
result.itemName = result.name;
result.itemDesc1 = result.desc1;
result.itemDesc2 = result.desc2;
result.uom =result.basicUom
var itemScan = this.scanAllDetails.filter(r =>
r.itemCode == itemCode&&r.inventoryStage==this.datacontent.inventoryStage)
r.itemCode == itemCode&&
r.inventoryStage==this.datacontent.inventoryStage&&
r.isDelete==false
)
if (itemScan.length > 0) {
setTimeout(res => {
showConfirmMsg("物料【" + itemCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
@ -517,10 +617,10 @@
packingCode: "",
lot: "",
itemCode: result.code,
itemName: result.name,
itemDesc1: result.desc1,
itemDesc2: result.desc2,
itemCode: result.itemCode,
itemName: result.itemName,
itemDesc1: result.itemDesc1,
itemDesc2: result.itemDesc2,
locationCode: this.location.code,
locationGroup: this.location.locationGroupCode,
@ -553,7 +653,7 @@
detail.inventoryQty = 0;
detail.countQty = 1;
detail.status = 2;
detail.uom =result.basicUom
detail.uom =result.uom
return detail;
},

75
fe/PDA/pages/task/countRawDetail.vue

@ -7,7 +7,6 @@
:newCount="newCount" :location="location" :countOrder="datacontent.inventoryStage">
</com-count-scan-detail>
</view>
<button @click="open">打开</button>
<scroll-view scroll-y="true" style="margin-bottom: 50rpx;">
<view v-for="(item ,index) in showList" :key="index">
<view class="detail-content common_card">
@ -345,80 +344,6 @@
})
},
methods: {
open() {
this.$refs.wzSelectPopup.open({
mode: 'radio', //radio checkbox
// dataList:[], //dataList使proxyConfig
selected: this.userForm.values, //
proxyConfig: { //
reqFun: this.reqGetList, //,Promise.resolve([])
localPaging: false //
},
search: {
type: 'remote', //local | remote
},
fields: {
label: 'name',
value: 'code'
}
})
},
selectCheckbox(mode, data) {
console.log(mode, data)
var result={
data:data
} ;
var itemCode = data.itemCode;
var itemScan = this.scanAllDetails.filter(r =>
r.itemCode == itemCode&&r.inventoryStage==this.datacontent.inventoryStage)
if (itemScan.length > 0) {
setTimeout(res => {
showConfirmMsg("物料【" + itemCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
if (res) {
this.setQty(itemScan[0], itemScan[0].countQty, false);
}
})
}, 100)
return;
}
let items = this.originalDetails.filter(r =>
r.itemCode === itemCode&&r.inventoryStage==this.datacontent.inventoryStage)
if(items.length == 0){
let detail = this.creatDetail(result);
this.setDetailNoBalance(detail, result)
detail.inventoryQty=result.data.qty
this.scanAllDetails.unshift(detail);
this.initList();
this.calcScanCount();
this.$forceUpdate();
}else if (items.length == 1){
setTimeout(res => {
showConfirmMsg("物料【" + itemCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
if (res) {
this.setQty(items[0], items[0].inventoryQty, false);
}
})
}, 100)
}
},
reqGetList(data) {
let params = {
pageSize: data.pageSize,
pageIndex: data.pageIndex,
itemCode: data.searchValue
};
return getBalancesByFilterAsync(params);
// return simulationReqGetList({
// pageIndex: data.pageIndex,
// pageSize: data.pageSize,
// name: data.searchValue
// })
},
initList() {
this.index = 1;
this.showList = []

4
fe/PDA/static/config.json

@ -4,7 +4,7 @@
"value": "DongYang"
}, {
"name": "仓库代码",
"value": "T8"
"value": "T9"
},
{
"name": "服务地址",
@ -22,7 +22,7 @@
"params": {
"companyCode": "DongYang",
"warehouseCode": "T8",
"warehouseCode": "T9",
"putawayLocationTypes": "1,2,3,4",
"putawayInventoryStatus": "2",
"dev": "http://dev.ccwin-in.com:60099",

2
fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue

@ -9,7 +9,7 @@
({{index+1}})
<view class="uni-flex" style="flex-direction: column; font-size: 32rpx;">
<view class="list-item-text">代码 : {{item.itemCode}}</view>
<view class="list-item-text">ERP料号 : {{item.itemCode}}</view>
<view class="list-item-text">名称 : {{item.itemName}}</view>
<view class="list-item-text">描述 : {{item.itemDesc1}}</view>
</view>

10
fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue

@ -1,6 +1,6 @@
<template>
<view>
<u-popup ref="popup" v-model="showPopup" border-radius="15" mode="center">
<u-popup ref="popup" v-model="showPopup" border-radius="15" style="width: 100%;" mode="center">
<view class="select-popup-content">
<view class="uni-flex" style="display: flex; width: 100%;justify-content: center; ">
<view class="" style=" font-size: 35rpx; margin: 20rpx; font-weight: bold;">
@ -161,12 +161,14 @@
if (config) {
this.popConfig = deepMerge(this.popConfig, config)
}
this.dataList=[]
this.searchValue=""
this.listInit(dataList)
this.showPopup =true;
},
/**列表数据初始化*/
listInit(dataList) {
this.pageStatus.loading = 'loading'
//dataListproxyConfig.reqFun
if (dataList && dataList instanceof Array) {
@ -186,11 +188,13 @@
},
/**组件代理请求*/
proxyRequest() {
console.log("请求proxyRequest")
const {
proxyConfig,
page
} = this.popConfig
this.pageStatus.loading = 'loading'
proxyConfig.reqFun({
...page,
searchValue: this.searchValue
@ -274,7 +278,7 @@
})
this.$emit('select', mode, {
...data,
origin: list
origin: list,
})
this.close()
},

Loading…
Cancel
Save