|
@@ -19,7 +19,13 @@
|
|
|
class="box-item"
|
|
|
@click="clickBox(item, index)"
|
|
|
>
|
|
|
- <div class="box-name">{{ item.vehicleNo }}</div>
|
|
|
+ <div class="box-header">
|
|
|
+ <div class="box-name">{{ item.vehicleNo }}</div>
|
|
|
+ <div class="box-name">
|
|
|
+ {{ item.locationNo ? item.locationNo : "-" }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div
|
|
|
v-for="(material, index) in item.list"
|
|
|
:key="index"
|
|
@@ -65,8 +71,16 @@
|
|
|
:key="index"
|
|
|
class="outing-box"
|
|
|
>
|
|
|
- <div class="material-title">
|
|
|
- {{ material.materialName }} | {{ material.materialNo }}
|
|
|
+ <div class="outing-box-header">
|
|
|
+ <div class="material-title">
|
|
|
+ {{ material.materialName }} | {{ material.materialNo }}
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ @click="deleteIndexOld(index)"
|
|
|
+ class="material-title deleteSty"
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="material-info">
|
|
|
<div>批次号/序列号</div>
|
|
@@ -102,13 +116,23 @@
|
|
|
:key="index"
|
|
|
class="list-box"
|
|
|
>
|
|
|
- <div>
|
|
|
- <div class="name">{{ item.materialName }}</div>
|
|
|
- <div class="spec">{{ item.spec }}</div>
|
|
|
- </div>
|
|
|
- <div class="bottom">
|
|
|
- <NumberInput v-model="item.num" />
|
|
|
- <span class="unit">{{ item.unitDictLabel }}</span>
|
|
|
+ <div class="list-box-header">
|
|
|
+ <div>
|
|
|
+ <div>
|
|
|
+ <div class="name">{{ item.materialName }}</div>
|
|
|
+ <div class="spec">{{ item.spec }}</div>
|
|
|
+ </div>
|
|
|
+ <div class="bottom">
|
|
|
+ <NumberInput v-model="item.num" />
|
|
|
+ <span class="unit">{{ item.unitDictLabel }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ @click="deleteIndexScanAdd(index)"
|
|
|
+ class="list-box-delete deleteSty"
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -136,6 +160,16 @@ import {
|
|
|
} from "@/api/storage/in";
|
|
|
|
|
|
const boxSearch = ref("");
|
|
|
+const deleteIndexOld = (index: any) => {
|
|
|
+ outingMaterials.value.splice(index, 1);
|
|
|
+ ElMessage.success("操作成功!");
|
|
|
+};
|
|
|
+
|
|
|
+const deleteIndexScanAdd = (index: any) => {
|
|
|
+ materialList.value.splice(index, 1);
|
|
|
+ ElMessage.success("操作成功!");
|
|
|
+};
|
|
|
+
|
|
|
//盒内原有物料data
|
|
|
const boxesList = ref<any[]>([]);
|
|
|
const addStatus = ref(false);
|
|
@@ -175,6 +209,7 @@ const addenterBox = () => {
|
|
|
addSuccessStatus.value = true;
|
|
|
outingBox.value.vehicleNo = addBoxInfo.value.code;
|
|
|
outingBox.value.vehicleId = addBoxInfo.value.id;
|
|
|
+ outingBox.value.houseNo = "1";
|
|
|
ElMessage.success("扫码成功!");
|
|
|
});
|
|
|
};
|
|
@@ -262,7 +297,8 @@ const sureToAdd = () => {
|
|
|
materialList.value[i].materialCode ==
|
|
|
outingMaterials.value[b].materialNo &&
|
|
|
materialList.value[i].materialName ==
|
|
|
- outingMaterials.value[b].materialName
|
|
|
+ outingMaterials.value[b].materialName &&
|
|
|
+ materialList.value[i].batchCode == outingMaterials.value[b].batchCode
|
|
|
) {
|
|
|
outingMaterials.value[b].num =
|
|
|
outingMaterials.value[b].num + materialList.value[i].num;
|
|
@@ -319,7 +355,10 @@ onMounted(() => {
|
|
|
.box-selected {
|
|
|
border: 2px solid #0a59f7;
|
|
|
}
|
|
|
-
|
|
|
+ .box-header {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ }
|
|
|
.box-name {
|
|
|
font-size: 20px;
|
|
|
line-height: 40px;
|
|
@@ -333,7 +372,9 @@ onMounted(() => {
|
|
|
font-size: 24px;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+.deleteSty {
|
|
|
+ color: #0a59f7;
|
|
|
+}
|
|
|
.outing-container {
|
|
|
height: calc(100vh - 354px);
|
|
|
|
|
@@ -343,6 +384,10 @@ onMounted(() => {
|
|
|
margin-bottom: 15px;
|
|
|
padding: 10px 8px;
|
|
|
}
|
|
|
+ .outing-box-header {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ }
|
|
|
|
|
|
.material-title {
|
|
|
font-weight: bolder;
|
|
@@ -385,6 +430,16 @@ onMounted(() => {
|
|
|
align-items: start;
|
|
|
padding: 30px 30px;
|
|
|
|
|
|
+ .list-box-header {
|
|
|
+ width: 100%;
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ }
|
|
|
+ .list-box-delete {
|
|
|
+ text-align: right;
|
|
|
+ font-weight: bolder;
|
|
|
+ font-size: 24px;
|
|
|
+ }
|
|
|
.name {
|
|
|
font-weight: 500;
|
|
|
font-size: 24px;
|