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

components.d.ts

@@ -66,7 +66,6 @@ declare module 'vue' {
     TableView: typeof import('./src/components/TableView.vue')['default']
     TableView: typeof import('./src/components/TableView.vue')['default']
     UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
     UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
     UploadImage: typeof import('./src/components/UploadImage.vue')['default']
     UploadImage: typeof import('./src/components/UploadImage.vue')['default']
-    VxeTable: typeof import('./src/components/VxeTable.vue')['default']
     WangEditor: typeof import('./src/components/WangEditor.vue')['default']
     WangEditor: typeof import('./src/components/WangEditor.vue')['default']
   }
   }
   export interface ComponentCustomProperties {
   export interface ComponentCustomProperties {

src/views/order/podUs/index.vue

@@ -543,7 +543,12 @@
           <template #operate="{ row }">
           <template #operate="{ row }">
             <div class="operate-box">
             <div class="operate-box">
               <span class="operate-item">
               <span class="operate-item">
-                <ElButton link type="primary" @click="confirm(row)">
+                <ElButton
+                  v-if="!row.expressSheet && row.status==='TO_BE_CONFIRMED'"
+                  link
+                  type="primary"
+                  @click="confirm(row)"
+                >
                   确认
                   确认
                 </ElButton>
                 </ElButton>
                 <ElButton
                 <ElButton