JSY/jsy-app
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

Browse Source
This commit is contained in:
Iruka 2025-02-13 11:35:39 +08:00
commit 351886a441
3 changed files with 66 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/retrace/signBillAdd.vue
View File

@ -45,9 +45,6 @@
{{ item.deviceCode }}：{{ item.deviceTypeName }}
</view>
</view>
<!-- <view style="margin-right: 5px;">
<u-button type="success" text="删除" @click="deleteDetail(item)" />
</view> -->
</view>
<u-gap height="1" bgColor="#D2D2D2"></u-gap>
</view>
@ -192,15 +189,17 @@
},
//删除明细
deleteDetail(item) {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
plugin.modal.confirm("确定删除吗?").then(res => {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
})
},
onStorageInSelect(e) {
this.briefForm.storageInId = e.id

75
pages/retrace/stockRefunAdd.vue
View File

@ -1,20 +1,17 @@
<template>
<view class="create-container">
<custom-nav-bar :left="true" title="退库新增">
<view class="fixed">
<view align="right" class="icon iconfont icon-scan" @click="toQRCode"></view>
<view align="right" class="icon iconfont icon-NFC1" @click="nfc"></view>
<view align="right" class="iconfont icon-jia icon" @click="add"></view>
</view>
<template v-slot:right>
<view class="fixed">
<view align="right" class="icon iconfont icon-scan" @click="toQRCode"></view>
<view align="right" class="icon iconfont icon-NFC1" @click="nfc"></view>
<view align="right" class="iconfont icon-jia icon" @click="add"></view>
</view>
</template>
</custom-nav-bar>
<uni-section title="基础信息" type="line">
<u--form labelPosition="left" :model="briefForm" :rules="rules" ref="form">
<u-line color="#D2D2D2"></u-line>
<!-- <u-form-item class="form-item" label="签收单号" prop="sourceBillCode" labelWidth="100px" required>
<u--input style="background: white" v-model="briefForm.sourceBillCode" border="none" disabled
placeholder="请选择签收单号" suffixIcon="arrow-right" class="custom-input"
@click="onselectBillCode"></u--input>
</u-form-item> -->
<u-form-item label="退回仓库" prop="storageInName" required>
<u--input @click="showStorageIn=true" v-model="briefForm.storageInName" border="none" disabled
placeholder="请选择退回仓库" suffixIcon="arrow-right"></u--input>
@ -199,15 +196,17 @@
},
//删除明细
deleteDetail(item) {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
plugin.modal.confirm("确定删除吗?").then(res => {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
})
},
onStorageInSelect(e) {
this.briefForm.storageInId = e.id
@ -286,11 +285,12 @@
}
})
},
//选择签收单
onselectBillCode: function() {
uni.navigateTo({
url: '/pages/retrace/selectDeviceBill?billTypeId=2002'
});
nfc() {
this.addType = 2;
},
add: function() {
this.showDeviceModal = true;
this.addType = 1;
},
//获取扫码或nfc查询设备
getDeviceInfo(code) {
@ -405,32 +405,5 @@
margin: 0px 20px;
}
}
// .item-container {
// margin: 10px 10px;
// background-color: white;
// padding-bottom: 10px;
// border-radius: 10px;
// box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05);
// }
// .flex-text {
// display: flex;
// align-items: center;
// .flex-text-one {
// color: #939393;
// font-weight: bold;
// }
// }
// .data {
// margin: 10px 20px !important;
// width: 100%;
// .uni-col {
// margin-bottom: 5px;
// }
// }
}
</style>

81
pages/retrace/transferGoodsAdd.vue
View File

@ -1,20 +1,17 @@
<template>
<view class="create-container">
<custom-nav-bar :left="true" title="调货新增">
<view class="fixed">
<view align="right" class="icon iconfont icon-scan" @click="toQRCode"></view>
<view align="right" class="icon iconfont icon-NFC1" @click="nfc"></view>
<view align="right" class="iconfont icon-jia icon" @click="add"></view>
</view>
<template v-slot:right>
<view class="fixed">
<view align="right" class="icon iconfont icon-scan" @click="toQRCode"></view>
<view align="right" class="icon iconfont icon-NFC1" @click="nfc"></view>
<view align="right" class="iconfont icon-jia icon" @click="add"></view>
</view>
</template>
</custom-nav-bar>
<uni-section title="基础信息" type="line">
<u--form labelPosition="left" :model="briefForm" :rules="rules" ref="form">
<u-line color="#D2D2D2"></u-line>
<!-- <u-form-item class="form-item" label="调货单号" prop="billCode" labelWidth="100px" required>
<u--input style="background: white" v-model="briefForm.billCode" border="none" disabled
placeholder="请选择签收单号" suffixIcon="arrow-right" class="custom-input"
@click="onselectBillCode"></u--input>
</u-form-item> -->
<u-form-item label="调货仓库" prop="storageOutName" required>
<u--input @click="showStorageOut=true" v-model="briefForm.storageOutName" border="none" disabled
placeholder="请选择调货仓库" suffixIcon="arrow-right"></u--input>
@ -106,10 +103,10 @@
addType: 1,
showDeviceModal: false,
showStorageIn: false,
showStorageOut:false,
showStorageOut: false,
showDevicePda: false,
storageInData: [],
storageOutData:[],
storageOutData: [],
devicePdaData: [],
deviceInfoData: {
deviceCode: null
@ -181,6 +178,7 @@
}
}
this.getDeviceStorageUserList();
this.getDeviceStorageData();
this.getPdaDeviceData();
if (this.type == "edit") {
this.getDeviceBill();
@ -192,7 +190,7 @@
this.briefForm = {
billId: null,
billTypeId: 2005,
billCode:null,
billCode: null,
storageInId: null,
storageInName: null,
devicePdaId: null,
@ -215,21 +213,23 @@
},
//删除明细
deleteDetail(item) {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
plugin.modal.confirm("确定删除吗?").then(res => {
let index = this.dataList.findIndex(x => x.deviceId == item.deviceId);
if (index != -1) {
this.dataList.splice(index, 1);
}
if (this.type == "edit") {
//明细时删除明细及更改设备仓库id及在库状态
deleteDeviceBillWms(item.billDetailId)
.then(res => {})
}
})
},
onStorageInSelect(e) {
this.briefForm.storageInId = e.id
this.briefForm.storageInName = e.name
},
onStorageOutSelect(e){
onStorageOutSelect(e) {
this.briefForm.storageOutId = e.id
this.briefForm.storageOutName = e.name
},
@ -302,6 +302,13 @@
}
})
},
nfc() {
this.addType = 2;
},
add: function() {
this.showDeviceModal = true;
this.addType = 1;
},
//选择签收单
onselectBillCode: function() {
uni.navigateTo({
@ -349,6 +356,7 @@
//获取调货仓库
getDeviceStorageData() {
getDeviceStorageList().then(res => {
console.log(res)
if (res && res.data) {
this.storageOutData = res.data.map(
item => {
@ -436,32 +444,5 @@
margin: 0px 20px;
}
}
// .item-container {
// margin: 10px 10px;
// background-color: white;
// padding-bottom: 10px;
// border-radius: 10px;
// box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05);
// }
// .flex-text {
// display: flex;
// align-items: center;
// .flex-text-one {
// color: #939393;
// font-weight: bold;
// }
// }
// .data {
// margin: 10px 20px !important;
// width: 100%;
// .uni-col {
// margin-bottom: 5px;
// }
// }
}
</style>