Merge branch 'dev' of 47.122.114.111:qinjianhui/factory_front into dev

components.d.ts

@@ -51,7 +51,6 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/views/order/podUs/index.vue

@@ -172,33 +172,30 @@
           <ElButton type="warning" @click="printPodOrder"> POD打单 </ElButton>
         </span>
         <span v-if="status === 'WAIT_SHIPMENT'" class="item">
-          <ElButton
-            type="success"
-            @click="getOrderByIdApi('getTrackingNumber')"
-          >
-            获取跟踪号
-          </ElButton>
-        </span>
-        <span v-if="status === 'WAIT_SHIPMENT'" class="item">
-          <ElButton type="success" @click="getOrderByIdApi('getPrintOrder')">
-            获取打印面单
-          </ElButton>
-        </span>
-        <span v-if="status === 'WAIT_SHIPMENT'" class="item">
-          <ElButton
-            type="success"
-            @click="getOrderByIdApi('cancelLogisticsOrder')"
-          >
-            取消物流订单
-          </ElButton>
+          <ElDropdown>
+            <el-button type="success">
+              物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <ElDropdownMenu>
+                <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
+                  >获取跟踪号</ElDropdownItem
+                >
+                <ElDropdownItem @click="getOrderByIdApi('getPrintOrder')"
+                  >获取打印面单</ElDropdownItem
+                >
+                <ElDropdownItem @click="getOrderByIdApi('cancelLogisticsOrder')"
+                  >取消物流订单</ElDropdownItem
+                >
+              </ElDropdownMenu>
+            </template>
+          </ElDropdown>
         </span>
         <span v-if="status === 'STOCK_OUT'" class="item">
           <ElButton type="warning" @click="stockOutCheck"> 补货校验 </ElButton>
         </span>
         <span v-if="status === 'STOCK_OUT'" class="item">
-          <ElButton type="success" @click="toBePicking">
-            转至待拣胚
-          </ElButton>
+          <ElButton type="success" @click="toBePicking"> 转至待拣胚 </ElButton>
         </span>
 
         <span class="item">
@@ -901,7 +898,7 @@
 <script setup lang="ts">
 import { getUserMarkList } from '@/api/common'
 
-import { WarningFilled } from '@element-plus/icons-vue'
+import { ArrowDown, WarningFilled } from '@element-plus/icons-vue'
 import {
   getCardOrderList,
   getOrderList,