ソースを参照

调试齐套出库等页面适配鸿蒙。

jiaxiaoqiang 9 ヶ月 前
コミット
6e56c50cbf

+ 7 - 15
src/views/material-flow/recordDetail.vue

@@ -46,18 +46,12 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-dialog) {
-  background: #f1f3f5;
-  box-shadow: 0px 0px 80px 10px rgba(0, 0, 0, 0.25);
-  border-radius: 16px;
-}
-
 #custom-dialog {
   background: #f1f3f5;
   box-shadow: 0px 0px 80px 10px rgba(0, 0, 0, 0.25);
   border-radius: 16px 16px 16px 16px;
   width: 924px;
-  max-height: 80vh;
+  height: 600px;
 
   .top-title {
     width: 100%;
@@ -78,7 +72,7 @@ defineExpose({
   .center-content {
     margin-top: 24px;
     width: 100%;
-    height: 500px;
+    height: 400px;
 
     font-size: 24px;
     overflow-y: auto;
@@ -118,28 +112,26 @@ defineExpose({
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-left: 30px;
-  padding-right: 20px;
-  height: 80px;
+  padding: 10px 20px;
 }
 
 .item-header {
   font-weight: 500;
-  font-size: 24px;
+  font-size: 20px;
   color: rgba(0, 0, 0, 0.9);
   text-align: left;
 }
 
 .item-describe {
   font-weight: 400;
-  font-size: 20px;
+  font-size: 18px;
   color: rgba(0, 0, 0, 0.6);
   text-align: left;
 }
 
 .item-count {
   font-weight: bold;
-  font-size: 38px;
+  font-size: 20px;
   color: rgba(0, 0, 0, 0.9);
 
   text-align: right;
@@ -147,7 +139,7 @@ defineExpose({
 
 .item-unit {
   font-weight: 500;
-  font-size: 20px;
+  font-size: 18px;
   color: rgba(0, 0, 0, 0.6);
 
   text-align: right;

+ 20 - 10
src/views/pro-operation/call-materiel/components/materiel-box-detail.vue

@@ -18,9 +18,11 @@
           >
             <div>
               <div class="item-header">
-                {{ item?.materialName }} {{ item?.materialCode }}
-                {{ item?.batchCode }}
+                {{ item?.materialName }}
+                <!--                {{ item?.materialCode }}-->
+                <!--                {{ item?.batchCode }}-->
               </div>
+              <div class="item-mCode">{{ item?.materialCode }}</div>
               <div class="item-describe">{{ item?.spec }}</div>
             </div>
             <div>
@@ -156,29 +158,37 @@ defineExpose({
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding-left: 30px;
-  padding-right: 20px;
-  height: 80px;
-  margin-top: 15px;
+  padding: 10px 20px;
+  //height: 96px;
+  //margin-top: px;
+  //border: 1px solid red;
 }
 
 .item-header {
   font-weight: 500;
-  font-size: 24px;
+  font-size: 20px;
   color: rgba(0, 0, 0, 0.9);
   text-align: left;
 }
 
+.item-mCode {
+  font-weight: 500;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.6);
+  text-align: left;
+}
+
 .item-describe {
   font-weight: 400;
-  font-size: 20px;
+  font-size: 14px;
   color: rgba(0, 0, 0, 0.6);
   text-align: left;
+  width: 100%;
 }
 
 .item-count {
   font-weight: bold;
-  font-size: 38px;
+  font-size: 28px;
   color: rgba(0, 0, 0, 0.9);
 
   text-align: right;
@@ -186,7 +196,7 @@ defineExpose({
 
 .item-unit {
   font-weight: 500;
-  font-size: 20px;
+  font-size: 16px;
   color: rgba(0, 0, 0, 0.6);
 
   text-align: right;

+ 12 - 5
src/views/pro-operation/call-materiel/desperse.vue

@@ -27,9 +27,9 @@
                 </div>
                 <div>
                   <el-button
+                    :type="box.selected ? 'info' : 'primary'"
                     class="suit-btn"
                     round
-                    :type="box.selected ? 'info' : 'primary'"
                     @click="clickItem(box)"
                   >
                     {{ box.selected ? "取消" : "添加" }}
@@ -40,7 +40,8 @@
             <div style="width: 100%">
               <div>
                 <div class="suit-count">
-                  <span>数量:</span><NumberInput v-model="box.totalNum" />
+                  <!--                  <span>数量:</span>-->
+                  <NumberInput v-model="box.totalNum" />
                 </div>
                 <span class="suit-desc">单位:{{ box?.unit }}</span>
               </div>
@@ -170,6 +171,7 @@ const clickItem = (box: any) => {
 .container-desperse {
   display: flex;
   position: relative;
+
   .call-btn {
     position: fixed;
     height: 80px;
@@ -178,6 +180,7 @@ const clickItem = (box: any) => {
     top: 80px;
     left: 650px;
   }
+
   .left {
     width: 300px;
 
@@ -201,7 +204,7 @@ const clickItem = (box: any) => {
   }
 
   .right {
-    flex: 1;
+    width: calc(100% - 300px);
     margin-left: 20px;
   }
 }
@@ -214,18 +217,21 @@ const clickItem = (box: any) => {
   /*列间距*/
   grid-column-gap: 24px;
 
-  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-columns: 1fr 1fr;
   overflow-y: auto;
+
   .suit-header {
     display: flex;
     align-items: center;
     justify-content: space-between;
     width: 100%;
   }
+
   .suit-btn {
     font-size: $f24;
     padding: 20px;
   }
+
   .suit-box {
     box-sizing: border-box;
     border: 2px solid white;
@@ -253,7 +259,7 @@ const clickItem = (box: any) => {
       text-align: left;
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      justify-content: center;
     }
 
     .suit-desc {
@@ -262,6 +268,7 @@ const clickItem = (box: any) => {
       text-align: left;
     }
   }
+
   .suit-box-select {
     border: 2px solid #0a59f7 !important;
   }

+ 1 - 1
src/views/pro-operation/call-materiel/index.vue

@@ -16,7 +16,7 @@
       <!--          <InCompleteSuit />-->
       <!--        </div>-->
       <!--      </el-tab-pane>-->
-      <el-tab-pane label="零星叫料" name="third">
+      <el-tab-pane label="零星叫料" name="lingXing">
         <div class="contentBox">
           <Desperse />
         </div>

+ 19 - 5
src/views/pro-steps/index.vue

@@ -2,7 +2,15 @@
 <template>
   <div>
     <div class="headerInfo">
-      <div class="titleText">
+      <div
+        class="titleText"
+        style="
+          width: 300px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        "
+      >
         {{ store.processInfo.materialName }} -
         {{ store.processInfo.materialModel }}
       </div>
@@ -19,10 +27,10 @@
           }}
         </div>
         <div class="item">
-          流转卡号:{{ store.scanInfo.seqNo ? store.scanInfo.seqNo : "-" }}
+          卡号:{{ store.scanInfo.seqNo ? store.scanInfo.seqNo : "-" }}
         </div>
         <div class="item">
-          产品编码:{{
+          编码:{{
             store.scanInfo.materialCode ? store.scanInfo.materialCode : "-"
           }}
         </div>
@@ -60,7 +68,7 @@
             </el-scrollbar>
           </div>
           <Empty v-if="stepComponents.length == 0" />
-          <div class="routerView" :key="key">
+          <div :key="key" class="routerView">
             <el-scrollbar style="width: 100%">
               <router-view v-slot="{ Component, route }">
                 <keep-alive
@@ -215,6 +223,7 @@ onActivated(async () => {
 .boxStyle {
   height: calc(100vh - 80px);
 }
+
 .headerInfo {
   height: 40px;
   width: calc(100vw - 40px);
@@ -229,11 +238,14 @@ onActivated(async () => {
   box-sizing: border-box;
   margin-bottom: 10px;
   background-color: white;
+
   .info {
     display: flex;
+    flex-shrink: 0;
+
     .item {
       margin: 0 5px;
-      font-size: $f20;
+      font-size: 14px;
       font-weight: 300;
     }
   }
@@ -259,9 +271,11 @@ onActivated(async () => {
     @include flex;
   }
 }
+
 .mainContentBox {
   height: calc(100vh - 130px);
 }
+
 .routerView {
   display: flex;
   flex: 1;

+ 9 - 8
src/views/process/components/transferNum.vue

@@ -17,14 +17,14 @@
       <Transition>
         <div v-if="selectSeqArray.length > 0">
           <div
-            class="row"
-            @click="clickCardNum(index)"
             v-for="(item, index) in selectSeqArray"
             :key="index"
+            class="row"
+            @click="clickCardNum(index)"
           >
             <el-tooltip
-              effect="dark"
               :content="item.seqNo"
+              effect="dark"
               placement="left"
               trigger="hover"
             >
@@ -62,9 +62,9 @@
 </template>
 
 <script lang="ts" setup>
-import { useDictionaryStore } from "@/store";
-import { useProcessStore } from "@/store";
+import { useDictionaryStore, useProcessStore } from "@/store";
 import { Transition } from "vue";
+
 const store = useProcessStore();
 const dictS = useDictionaryStore();
 const selectSeqIndex = inject("selectSeqIndex");
@@ -82,6 +82,7 @@ onMounted(() => {
 .success {
   color: #64bb5c;
 }
+
 .body {
   width: 100%;
   background-color: white;
@@ -95,8 +96,8 @@ onMounted(() => {
     vertical-align: center;
 
     .status {
-      width: 100px;
-      font-size: $f24;
+      width: 50px;
+      font-size: 18px;
       line-height: 24px;
       margin-bottom: 10px;
       text-align: center;
@@ -107,7 +108,7 @@ onMounted(() => {
 .describeText {
   color: black;
   font-weight: $Medium;
-  font-size: 30px;
+  font-size: 22px;
   margin-bottom: $p10;
   overflow: hidden;
   text-overflow: ellipsis;