feature/样式修改&&入库添加删除功能

src/styles/index.scss

@@ -29,7 +29,7 @@
 
 .mainContentBox {
   width: 100%;
-  height: calc(100vh - 130px);
+  height: calc(100vh - 80px);
   padding: 0 24px 24px 24px;
   overflow: hidden;
 }

src/views/pro-steps/components/operates.vue

@@ -83,18 +83,6 @@ const stepComponents = ref([
     compentName: "报工",
     compentType: "baogong",
   },
-  {
-    compentName: "报工",
-    compentType: "baogong",
-  },
-  {
-    compentName: "报工",
-    compentType: "baogong",
-  },
-  {
-    compentName: "报工",
-    compentType: "baogong",
-  },
 ]);
 </script>
 

src/views/pro-steps/components/wuliaocaiji.vue

@@ -144,10 +144,6 @@ const getOpCompentData = async () => {
     pageSize: 9999,
   });
   opCompentDataList.value = data;
-  opCompentDataList.value.push(data);
-  opCompentDataList.value.push(data);
-  opCompentDataList.value.push(data);
-  opCompentDataList.value.push(data);
 };
 const input = ref("");
 onMounted(() => {

src/views/pro-steps/index.vue

@@ -1,75 +1,79 @@
 `
 <template>
-  <div class="headerInfo">
-    <div class="titleText">
-      {{ store.processInfo.materialName }} -
-      {{ store.processInfo.materialModel }}
-    </div>
-    <div class="info">
-      <div class="item">
-        当前工序:
-        {{ store.scanInfo.operationName ? store.scanInfo.operationName : "-" }}
-      </div>
-      <div class="item">
-        下一工位:{{
-          store.scanInfo.nextStation ? store.scanInfo.nextStation : "-"
-        }}
+  <div>
+    <div class="headerInfo">
+      <div class="titleText">
+        {{ store.processInfo.materialName }} -
+        {{ store.processInfo.materialModel }}
       </div>
-      <div class="item">
-        流转卡号:{{ store.scanInfo.seqNo ? store.scanInfo.seqNo : "-" }}
-      </div>
-      <div class="item">
-        产品编码:{{
-          store.scanInfo.materialCode ? store.scanInfo.materialCode : "-"
-        }}
+      <div class="info">
+        <div class="item">
+          当前工序:
+          {{
+            store.scanInfo.operationName ? store.scanInfo.operationName : "-"
+          }}
+        </div>
+        <div class="item">
+          下一工位:{{
+            store.scanInfo.nextStation ? store.scanInfo.nextStation : "-"
+          }}
+        </div>
+        <div class="item">
+          流转卡号:{{ store.scanInfo.seqNo ? store.scanInfo.seqNo : "-" }}
+        </div>
+        <div class="item">
+          产品编码:{{
+            store.scanInfo.materialCode ? store.scanInfo.materialCode : "-"
+          }}
+        </div>
       </div>
     </div>
-  </div>
-  <div class="mainContentBox">
-    <el-row :gutter="20">
-      <el-col :span="4" class="boxStyle">
-        <!-- 侧边栏盒子 -->
-        <OperationBar />
-      </el-col>
-      <el-col :span="20">
-        <div class="typeContainer">
-          <el-scrollbar>
-            <div style="display: flex">
-              <div
-                v-for="(item, index) in stepComponents"
-                :key="index"
-                class="scrollbar-demo-item"
-              >
-                <router-link :to="{ name: item.name }" replace>
-                  <div
-                    :class="getNameClass(index)"
-                    class="typeBox"
-                    @click="setSelectIndex(index)"
-                  >
-                    <div class="svgIcon">
-                      <svg-icon :icon-class="item.iconName" size="30" />
+    <div class="mainContentBox">
+      <el-row :gutter="20">
+        <el-col :span="4" class="boxStyle">
+          <!-- 侧边栏盒子 -->
+          <OperationBar />
+        </el-col>
+        <el-col :span="20">
+          <div class="typeContainer">
+            <el-scrollbar>
+              <div style="display: flex">
+                <div
+                  v-for="(item, index) in stepComponents"
+                  :key="index"
+                  class="scrollbar-demo-item"
+                >
+                  <router-link :to="{ name: item.name }" replace>
+                    <div
+                      :class="getNameClass(index)"
+                      class="typeBox"
+                      @click="setSelectIndex(index)"
+                    >
+                      <div class="svgIcon">
+                        <svg-icon :icon-class="item.iconName" size="30" />
+                      </div>
+                      <div class="name">{{ item.compentName }}</div>
                     </div>
-                    <div class="name">{{ item.compentName }}</div>
-                  </div>
-                </router-link>
+                  </router-link>
+                </div>
               </div>
-            </div>
-          </el-scrollbar>
-        </div>
-        <Empty v-if="stepComponents.length == 0" />
-        <div class="routerView" :key="key">
-          <el-scrollbar style="width: 100%">
-            <router-view v-slot="{ Component, route }">
-              <keep-alive
-                include="Dianjian,Jiluxiang,Duomeiticaiji,Esop,Jingu,Mingpaibangding,Shebeijilu,Tiaoshipipei,Wuliaocaiji"
-              >
-                <component :is="Component" :key="route.fullPath" />
-              </keep-alive>
-            </router-view>
-          </el-scrollbar>
-        </div>
-      </el-col>
-    </el-row>
+            </el-scrollbar>
+          </div>
+          <Empty v-if="stepComponents.length == 0" />
+          <div class="routerView" :key="key">
+            <el-scrollbar style="width: 100%">
+              <router-view v-slot="{ Component, route }">
+                <keep-alive
+                  include="Dianjian,Jiluxiang,Duomeiticaiji,Esop,Jingu,Mingpaibangding,Shebeijilu,Tiaoshipipei,Wuliaocaiji"
+                >
+                  <component :is="Component" :key="route.fullPath" />
+                </keep-alive>
+              </router-view>
+            </el-scrollbar>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
@@ -255,7 +259,9 @@ onActivated(async () => {
     @include flex;
   }
 }
-
+.mainContentBox {
+  height: calc(100vh - 130px);
+}
 .routerView {
   display: flex;
   flex: 1;

src/views/storage-in/index.vue

@@ -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;