|
|
@@ -19,11 +19,13 @@
|
|
|
</view>
|
|
|
<view class="text">
|
|
|
<view class="label">领料人：</view>
|
|
|
- <select-lay :value="operateUser" placeholder="默认当前用户" :options="userList" @selectitem="selectitem" :zindex="2000"></select-lay>
|
|
|
+ <select-lay :value="operateUser" placeholder="默认当前用户" :options="userList" @selectitem="selectitem"
|
|
|
+ :zindex="2000"></select-lay>
|
|
|
</view>
|
|
|
<view class="text">
|
|
|
<view class="label">仓库：</view>
|
|
|
- <select-lay :zindex="1000" :value="plcStationCode" :options="selectList" @selectitem="storeSelectitem"></select-lay>
|
|
|
+ <select-lay :zindex="1000" :value="plcStationCode" :options="selectList" @selectitem="storeSelectitem">
|
|
|
+ </select-lay>
|
|
|
</view>
|
|
|
<view class="text">
|
|
|
<view class="label">入库类型：</view>
|
|
|
@@ -87,10 +89,18 @@
|
|
|
scanList: [],
|
|
|
userList: [],
|
|
|
selectList: [],
|
|
|
- typeList: [
|
|
|
- { label: '入库', value: 10 },
|
|
|
- { label: '盘点新增', value: 11 },
|
|
|
- { label: '补入库', value: 13 },
|
|
|
+ typeList: [{
|
|
|
+ label: '入库',
|
|
|
+ value: 10
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '盘点新增',
|
|
|
+ value: 11
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '补入库',
|
|
|
+ value: 13
|
|
|
+ },
|
|
|
]
|
|
|
};
|
|
|
},
|
|
|
@@ -111,18 +121,18 @@
|
|
|
data: item.value
|
|
|
})
|
|
|
},
|
|
|
- cfm(){
|
|
|
+ cfm() {
|
|
|
let obj = {
|
|
|
userId: this.operateUser,
|
|
|
plcCode: this.plcStationCode,
|
|
|
rfidItems: this.scanList.map(item => item.rfidCode),
|
|
|
stockChangeType: this.stockChangeType,
|
|
|
remark: this.remark
|
|
|
- }
|
|
|
+ }
|
|
|
console.log(obj)
|
|
|
this.$http.HandleMacStockInOut(obj).then(res => {
|
|
|
console.log(res)
|
|
|
- if(res.code === 0) {
|
|
|
+ if (res.code === 0) {
|
|
|
this.$msg.showToast(res.msg || '操作成功！')
|
|
|
this.timer = setTimeout(() => {
|
|
|
this.$utils.back()
|
|
|
@@ -134,10 +144,10 @@
|
|
|
scan() {
|
|
|
this.$utils.open('/pages/store-in-manage/store-in/store-in-scan')
|
|
|
},
|
|
|
- getList () {
|
|
|
+ getList() {
|
|
|
this.$http.GetApplyStockOutTemp().then(res => {
|
|
|
console.log(res)
|
|
|
- if(res.code === 0) {
|
|
|
+ if (res.code === 0) {
|
|
|
this.scanList = res.result
|
|
|
}
|
|
|
})
|
|
|
@@ -147,11 +157,11 @@
|
|
|
console.log(this.scanList)
|
|
|
let flag = true
|
|
|
this.scanList.forEach(item => {
|
|
|
- if(item.rfidCode === data.rfidCode) {
|
|
|
+ if (item.rfidCode === data.rfidCode) {
|
|
|
flag = false
|
|
|
}
|
|
|
})
|
|
|
- if(flag) {
|
|
|
+ if (flag) {
|
|
|
this.scanList.push(data)
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
@@ -161,26 +171,48 @@
|
|
|
},
|
|
|
/* 获取用户列表 */
|
|
|
getUserPageList() {
|
|
|
- this.$http.GetUserPageList({
|
|
|
- pageIndex: 1,
|
|
|
- pageSize: 999,
|
|
|
- takeUser: true
|
|
|
- }).then(res => {
|
|
|
- if(res.code == 0) {
|
|
|
- let list = res.result.list.map(item => {
|
|
|
+ uni.request({
|
|
|
+ url: 'http://120.79.80.64:8050' + '/cloudApi/uUser/list',
|
|
|
+ method: 'POST',
|
|
|
+ header: {
|
|
|
+ 'Content-Type': 'application/json',
|
|
|
+ },
|
|
|
+ data: {
|
|
|
+ deptIdList: ['A012', 'A008', 'A007', 'A017', 'A005'],
|
|
|
+ },
|
|
|
+ success: res => {
|
|
|
+ console.log(res)
|
|
|
+ let list = res.data.data.map((item) => {
|
|
|
return {
|
|
|
- label: item.realName,
|
|
|
- value: item.id
|
|
|
+ label: item.realname,
|
|
|
+ value: item.id,
|
|
|
+ name: item.realname,
|
|
|
}
|
|
|
})
|
|
|
this.userList = list
|
|
|
- }
|
|
|
- })
|
|
|
+
|
|
|
+ },
|
|
|
+ });
|
|
|
+ // this.$http.GetUserPageList({
|
|
|
+ // pageIndex: 1,
|
|
|
+ // pageSize: 999,
|
|
|
+ // takeUser: true
|
|
|
+ // }).then(res => {
|
|
|
+ // if (res.code == 0) {
|
|
|
+ // let list = res.result.list.map(item => {
|
|
|
+ // return {
|
|
|
+ // label: item.realName,
|
|
|
+ // value: item.id
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // this.userList = list
|
|
|
+ // }
|
|
|
+ // })
|
|
|
},
|
|
|
/* 手持机获取仓库 */
|
|
|
getStockHouse() {
|
|
|
this.$http.GetStockHouse().then(res => {
|
|
|
- if(res.code === 0) {
|
|
|
+ if (res.code === 0) {
|
|
|
this.selectList = res.result.map(item => {
|
|
|
return {
|
|
|
label: item.name,
|
|
|
@@ -201,10 +233,10 @@
|
|
|
this.pushData(res)
|
|
|
})
|
|
|
uni.getStorage({
|
|
|
- key: 'plcStationCode',
|
|
|
- success: (res) => {
|
|
|
- this.plcStationCode = res.data
|
|
|
- }
|
|
|
+ key: 'plcStationCode',
|
|
|
+ success: (res) => {
|
|
|
+ this.plcStationCode = res.data
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
onUnload() {
|
|
|
@@ -215,54 +247,64 @@
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-.container-wrap {
|
|
|
- overflow: hidden;
|
|
|
- .container {
|
|
|
- padding: 20rpx;
|
|
|
- height: calc(100vh - var(--status-bar-height) - 44px);
|
|
|
- overflow: auto;
|
|
|
- padding-bottom: 100rpx;
|
|
|
- .text {
|
|
|
- padding: 10rpx 0;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- font-size: 24rpx;
|
|
|
- .label {
|
|
|
- width: 150rpx;
|
|
|
- text-align: right;
|
|
|
+ .container-wrap {
|
|
|
+ overflow: hidden;
|
|
|
+
|
|
|
+ .container {
|
|
|
+ padding: 20rpx;
|
|
|
+ height: calc(100vh - var(--status-bar-height) - 44px);
|
|
|
+ overflow: auto;
|
|
|
+ padding-bottom: 100rpx;
|
|
|
+
|
|
|
+ .text {
|
|
|
+ padding: 10rpx 0;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ font-size: 24rpx;
|
|
|
+
|
|
|
+ .label {
|
|
|
+ width: 150rpx;
|
|
|
+ text-align: right;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- .list {
|
|
|
- margin: 10rpx 0;
|
|
|
- .item {
|
|
|
- padding: 20rpx;
|
|
|
- margin-bottom: 10rpx;
|
|
|
- background-color: #FFFFFF;
|
|
|
- border: 1rpx solid rgba(215, 215, 215, 1);
|
|
|
- border-radius: 10rpx;
|
|
|
- .row {
|
|
|
- &.border {
|
|
|
- border-bottom: 1px solid rgba(215, 215, 215, 1);
|
|
|
- }
|
|
|
- .label {
|
|
|
- width: 80rpx;
|
|
|
- }
|
|
|
- .col {
|
|
|
- &:last-child {
|
|
|
- justify-content: flex-end;
|
|
|
+
|
|
|
+ .list {
|
|
|
+ margin: 10rpx 0;
|
|
|
+
|
|
|
+ .item {
|
|
|
+ padding: 20rpx;
|
|
|
+ margin-bottom: 10rpx;
|
|
|
+ background-color: #FFFFFF;
|
|
|
+ border: 1rpx solid rgba(215, 215, 215, 1);
|
|
|
+ border-radius: 10rpx;
|
|
|
+
|
|
|
+ .row {
|
|
|
+ &.border {
|
|
|
+ border-bottom: 1px solid rgba(215, 215, 215, 1);
|
|
|
+ }
|
|
|
+
|
|
|
+ .label {
|
|
|
+ width: 80rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .col {
|
|
|
+ &:last-child {
|
|
|
+ justify-content: flex-end;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- .sub-row {
|
|
|
- align-items: flex-start;
|
|
|
- .label, .value {
|
|
|
- font-size: 24rpx;
|
|
|
- color: #7F7F7F;
|
|
|
+
|
|
|
+ .sub-row {
|
|
|
+ align-items: flex-start;
|
|
|
+
|
|
|
+ .label,
|
|
|
+ .value {
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #7F7F7F;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
</style>
|
|
|
-
|
asd26269546