diff --git a/pages/retrace/signBillAdd.vue b/pages/retrace/signBillAdd.vue
index 85f777f..f52215b 100644
--- a/pages/retrace/signBillAdd.vue
+++ b/pages/retrace/signBillAdd.vue
@@ -45,9 +45,6 @@
{{ item.deviceCode }}：{{ item.deviceTypeName }}
-
@@ -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
diff --git a/pages/retrace/stockRefunAdd.vue b/pages/retrace/stockRefunAdd.vue
index 2861e2b..58b44c4 100644
--- a/pages/retrace/stockRefunAdd.vue
+++ b/pages/retrace/stockRefunAdd.vue
@@ -1,20 +1,17 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
@@ -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;
- // }
- // }
}
\ No newline at end of file
diff --git a/pages/retrace/transferGoodsAdd.vue b/pages/retrace/transferGoodsAdd.vue
index 6d322d7..2e04a69 100644
--- a/pages/retrace/transferGoodsAdd.vue
+++ b/pages/retrace/transferGoodsAdd.vue
@@ -1,20 +1,17 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
@@ -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;
- // }
- // }
}
\ No newline at end of file