发货单导出修改

src/views/DeliveryNotePage.vue

@@ -14,6 +14,21 @@
             value-format="YYYY-MM-DD HH:mm:ss"
           />
         </ElFormItem>
+        <ElFormItem label="客户">
+          <ElSelect
+            v-model="searchForm.userMark"
+            clearable
+            placeholder="请选择客户"
+            style="width: 160px"
+          >
+            <ElOption
+              v-for="item in nameSpaceList"
+              :key="item"
+              :label="item"
+              :value="item"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
         <ElFormItem label="生产单号">
           <ElInput
             v-model="searchForm.subOrderNumber"
@@ -58,21 +73,7 @@
             <ElOption label="送货上门" :value="1"></ElOption>
         </ElSelect>
         </ElFormItem>
-        <ElFormItem label="客户">
-          <ElSelect
-            v-model="searchForm.userMark"
-            clearable
-            placeholder="请选择客户"
-            style="width: 160px"
-          >
-            <ElOption
-              v-for="item in nameSpaceList"
-              :key="item"
-              :label="item"
-              :value="item"
-            ></ElOption>
-          </ElSelect>
-        </ElFormItem>
+
         <ElFormItem label="物流跟踪号" prop="logisticsTracking">
           <ElInput
             v-model="searchForm.logisticsTracking"
@@ -88,7 +89,7 @@
           <ElButton @click="resetSearchForm">重置</ElButton>
         </ElFormItem>
         <ElFormItem>
-          <ElButton type="success" @click="onPrintDeliveryNote"
+          <ElButton v-loading="btnLoading" type="success" @click="onConfirmDateRange"
             >导出发货单</ElButton
           >
         </ElFormItem>
@@ -221,27 +222,7 @@
       ></ElPagination>
     </div>
   </div>
-  <ElDialog
-    v-model="dialogVisible"
-    title="选择时间"
-    width="500px"
-    :close-on-click-modal="false"
-  >
-    <el-date-picker
-      v-model="dateRange"
-      type="datetimerange"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      format="YYYY-MM-DD HH:mm:ss"
-      value-format="YYYY-MM-DD HH:mm:ss"
-    />
-    <template #footer>
-      <div class="dialog-footer">
-        <ElButton @click="dialogVisible = false">取消</ElButton>
-        <ElButton type="primary" @click="onConfirmDateRange">确定</ElButton>
-      </div>
-    </template>
-  </ElDialog>
+
   <ElDrawer
     v-model="orderDetailDialogVisible"
     title="查看订单"
@@ -313,6 +294,7 @@ const logisticsProps = [
       `${d.lanshouRegion || ''}${d.lanshouAddress || ''}`,
   },
 ]
+const btnLoading = ref<boolean>(false)
 const {
   currentPage,
   pageSize,
@@ -350,10 +332,6 @@ const handleSelectionChange = (s: DeliveryNoteData[]) => {
   selection.value = s
 }
 
-const onPrintDeliveryNote = () => {
-  dialogVisible.value = true
-  dateRange.value = []
-}
 const onConfirmDateRange = async () => {
   if (dateRange.value.length === 0) {
     return ElMessage({
@@ -362,14 +340,17 @@ const onConfirmDateRange = async () => {
       offset: window.innerHeight / 2,
     })
   }
+  btnLoading.value = true
   try {
     const res = await printDeliveryNote(dateRange.value)
     window.open(filePath + res.message)
     dateRange.value = []
     dialogVisible.value = false
     search()
+    btnLoading.value = false
   } catch (e) {
     showError(e)
+    btnLoading.value = false
   }
 }