11/28

src/views/main/BookingLedger/detail/modules/goodsTable.vue

@@ -237,8 +237,8 @@ export default {
                   this.$forceUpdate()
                 }}
               >
-                <a-select-option value="1">累加</a-select-option>
-                <a-select-option value="2">总重</a-select-option>
+                <a-select-option value="累加">累加</a-select-option>
+                <a-select-option value="总重">总重</a-select-option>
               </a-select>
             )
           }

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -36,7 +36,7 @@
         <button @click="TxxpLink"><span class="iconfont icon-dayinxiaopiao"></span>提箱小票</button>
       </div>
       <div class="btn-list single-view-4">
-        <button><span class="iconfont icon-OCR"></span>OCR</button>
+        <button @click="ShowOCR"><span class="iconfont icon-OCR"></span>OCR</button>
         <button @click="checkFun"><span class="iconfont icon-jinggao"></span>校验</button>
       </div>
       <div class="btn-list single-view-1">
@@ -410,13 +410,34 @@
     <!-- 打印弹窗 start -->
     <a-modal v-model="PrintModalVisible" title="打印">
       <template slot="footer"> <span></span> </template>
-      <a-row>
+      <div class="PrintMain">
+        <span v-for="item in templateType" :key="item.id" @click="FnCilckTemplateType(item.code)" class="items">
+          {{ item.name }}
+        </span>
+      </div>
+      <!-- <a-row>
         <a-col class="Citems" :span="6" v-for="item in templateType" :key="item.id">
           <span @click="FnCilckTemplateType(item.code)" class="items">{{ item.name }}</span>
         </a-col>
-      </a-row>
+      </a-row> -->
     </a-modal>
     <!-- 打印弹窗 end -->
+
+    <!-- OCR抽屉 start -->
+    <a-drawer
+      title="OCR"
+      width="23vw"
+      :destroyOnClose="true"
+      :mask="false"
+      placement="right"
+      :visible="OcrVisible"
+      @close="OcrOnClose"
+    >
+      <p>Some contents...</p>
+      <p>Some contents...</p>
+      <p>Some contents...</p>
+    </a-drawer>
+    <!-- OCR抽屉 end -->
   </div>
 </template>
 <script>
@@ -498,7 +519,8 @@ export default {
       SaveLoading: false,
       SendLoading: false,
       DelLoading: false,
-      PrintModalVisible: false
+      PrintModalVisible: false,
+      OcrVisible: false
     }
   },
   mounted() {
@@ -508,6 +530,17 @@ export default {
     // }
   },
   methods: {
+    // ========== OCR ==========
+    ShowOCR() {
+      if (this.OcrVisible) {
+        this.OcrOnClose()
+      } else {
+        this.OcrVisible = true
+      }
+    },
+    OcrOnClose() {
+      this.OcrVisible = false
+    },
     // ========== 订舱打印 ==========
     FSnhowPrintModal() {
       this.PrintModalVisible = true
@@ -1069,14 +1102,19 @@ export default {
   align-items: center;
   justify-content: center;
 }
-.items {
-  display: inline-block;
-  height: 28px;
-  line-height: 26px;
-  border: 1px dashed #ccc;
-  border-radius: 4px;
-  padding: 0 10px;
-  font-size: 13px;
-  cursor: pointer;
+.PrintMain {
+  display: flex;
+  flex-wrap: wrap;
+  .items {
+    display: inline-block;
+    height: 28px;
+    line-height: 26px;
+    border: 1px dashed #ccc;
+    border-radius: 4px;
+    padding: 0 10px;
+    font-size: 13px;
+    cursor: pointer;
+    margin: 5px 10px;
+  }
 }
 </style>