工厂端提交

components.d.ts

@@ -11,6 +11,7 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElDate: typeof import('element-plus/es')['ElDate']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']

src/api/order.ts

@@ -35,6 +35,7 @@ export function getOrderTabData() {
     'factory/customJomallOrder/findStateGroupList',
   )
 }
+
 // 确认生产
 export function confirmProductionOrder(ids: number[]) {
   return axios.post<never, BaseRespData<never>>(
@@ -50,18 +51,23 @@ export function downloadOrder(id: number) {
     { params: { id } },
   )
 }
+
 // 重新生成稿件
-export function reGenerateScriptUrlApi(ids: number[]) {
+export function reGenerateScriptUrlApi(ids: string) {
   return axios.post<never, BaseRespData<never>>(
-    'factory/customJomallOrder/downloadAgain',
+    'factory/customJomallOrder/rebuildFileByOrderId',
     ids,
   )
 }
 
-export function reCreateScriptUrlApi(ids: number[]) {
-  return axios.post<never, BaseRespData<never>>(
-    'factory/customJomallOrder/rebuildFileByOrderIds',
-    ids,
+export function reCreateScriptUrlApi(id: string) {
+  return axios.get<never, BaseRespData<never>>(
+    'factory/customJomallOrder/rebuildFileByOrderId',
+    {
+      params:{
+        id
+      }
+    },
   )
 }
 
@@ -74,14 +80,10 @@ export function printOrder(ids: number[]) {
 }
 
 // 导出生产单
-export function exportOrder(status?: string | number) {
-  return axios.get<never, BaseRespData<never>>(
+export function exportOrder(data?: { ids: number[], status: string | number }) {
+  return axios.post<never, BaseRespData<never>>(
     'factory/customJomallOrder/exportData',
-    {
-      params: {
-        status,
-      },
-    },
+    data,
   )
 }
 
@@ -96,6 +98,7 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
     },
   )
 }
+
 export function getQaOrderBySubOrderNumber(orderNumber: string) {
   return axios.get<never, BaseRespData<QaData[]>>(
     'factory/customJomallOrder/inspectionQuery',
@@ -106,6 +109,7 @@ export function getQaOrderBySubOrderNumber(orderNumber: string) {
     },
   )
 }
+
 // 质检完成
 export function qaFinishedApi(data: InspectionData[]) {
   return axios.post<never, BaseRespData<never>>(
@@ -132,6 +136,7 @@ export function addInternalTagApi(idList: number[], memo: string) {
     { idList, content: memo },
   )
 }
+
 // 查看发货单
 export function loadSendOutList(id: number) {
   return axios.get<never, BaseRespData<SendOrderData[]>>(
@@ -143,6 +148,7 @@ export function loadSendOutList(id: number) {
     },
   )
 }
+
 // 操作日志
 export function getLogList(id: number) {
   return axios.get<never, BaseRespData<LogListData[]>>(
@@ -181,6 +187,7 @@ export function refreshProductInfo(data: number[]) {
     data,
   )
 }
+
 export function getDeliveryNoteList(
   data: DeliveryNoteSearchForm,
   currentPage: number,
@@ -195,6 +202,7 @@ export function getDeliveryNoteList(
     },
   )
 }
+
 export function customJomallReconciliation(
   data: AccountStatementNoteSearchForm,
   currentPage: number,
@@ -209,7 +217,8 @@ export function customJomallReconciliation(
     },
   )
 }
-export function printDeliveryNote(data: string[],userMark?:string) {
+
+export function printDeliveryNote(data: string[], userMark?: string) {
   return axios.post<never, BaseRespData<never>>(
     'factory/customJomallShipment/printInvoiceStatistics',
     {
@@ -219,6 +228,7 @@ export function printDeliveryNote(data: string[],userMark?:string) {
     },
   )
 }
+
 export function createReconciliation(data: { shipmentIdList: number[] }) {
   return axios.post<never, BaseRespData<never>>(
     'factory/customJomallReconciliation/createReconciliation',
@@ -247,6 +257,7 @@ export function getOrderByIdApi(id?: number) {
     },
   )
 }
+
 export function getReconciliationAmount(id?: number) {
   return axios.get<never, BaseRespData<CountStatus[]>>(
     'factory/customJomallReconciliation/getReconciliationAmount',
@@ -257,17 +268,18 @@ export function getReconciliationAmount(id?: number) {
     },
   )
 }
+
 export function getCustomJomallReconciliationById(id?: number) {
   return axios.get<never, BaseRespData<OrderData>>(
     'factory/customJomallReconciliation/getById',
     {
-      params:{
-        id
-      }
-    }
-
+      params: {
+        id,
+      },
+    },
   )
 }
+
 export function customJomallReconciliationLog(reconciliationId?: number) {
   return axios.get<never, BaseRespData<OrderData>>(
     'factory/customJomallReconciliationLog/getListById',
@@ -278,6 +290,7 @@ export function customJomallReconciliationLog(reconciliationId?: number) {
     },
   )
 }
+
 export function updateReconciliation(
   data: AccountStatementNote,
 ) {
@@ -286,6 +299,7 @@ export function updateReconciliation(
     data,
   )
 }
+
 export function getShipmentDetailsById(shipmentId?: string) {
   return axios.get<never, BaseRespData<AccountStatementNote[]>>(
     'factory/customJomallReconciliation/getShipmentDetailsById',
@@ -302,6 +316,6 @@ export function factoryConfirm(
 ) {
   return axios.post(
     'factory/customJomallReconciliation/factoryConfirm',
-    data
+    data,
   )
 }
\ No newline at end of file

src/components/splitDiv/splitDiv.vue

@@ -2,68 +2,113 @@
 import { Splitpanes, Pane } from 'splitpanes'
 
 import 'splitpanes/dist/splitpanes.css'
+import { onMounted, onUnmounted, ref } from 'vue'
 
- defineProps({
-    size: {
-        default: '15',
-        type:  String
-    }
+const props = defineProps({
+  size: {
+    default: '',
+    type: String,
+  },
+})
+const domSize = ref<number>(0)
+
+function domResize() {
+  const father = document.getElementsByClassName('splitpanes')[0]
+  const top = document.getElementById('top')
+  const v = ((top.clientHeight / father.clientHeight) * 100).toFixed(2)
+
+  if (props.size === '') {
+    domSize.value = v
+  } else {
+    domSize.value = props.size
+  }
+}
+onUnmounted(()=>{
+  window.removeEventListener('resize', domResize)
+})
+onMounted(() => {
+  window.addEventListener('resize', domResize)
+  domResize()
+})
+defineExpose({
+  domResize
 })
 </script>
 
 <template>
-    <splitpanes horizontal style="height: 100%">
-        <pane :size="size">
-            <slot name="top"></slot>
-        </pane>
-        <pane style="flex: 1; flex-shrink: 0">
-            <slot name="bottom"></slot>
-        </pane>
-    </splitpanes>
+  <splitpanes horizontal style="height: 100%">
+    <pane :size="domSize">
+      <div id="top">
+        <slot name="top"></slot>
+      </div>
+
+    </pane>
+    <pane style="flex: 1; flex-shrink: 0">
+      <div id="bottom">
+        <slot name="bottom"></slot>
+      </div>
+    </pane>
+  </splitpanes>
 </template>
 
 <style scoped lang="scss">
+#top {
+  height: fit-content;
+}
+
+#bottom {
+  height: 100%;
+}
+
+#top, #bottom {
+
+  display: flex;
+  flex-direction: column;
+}
+
 ::v-deep(.splitpanes__splitter) {
-    width: 100%;
-    border-left: 1px solid #eee;
-    margin-left: -1px;
-    background-color: #ececec;
-    cursor: row-resize;
-    box-sizing: border-box;
-    position: relative;
-    flex-shrink: 0;
-    min-width: 1px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    &::before{
-        margin-top: -2px;
-        background-color: #00000040;
-        transform: translate(-50%);
-        width: 30px;
-        height: 1px;
-        content: "";
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transition: background-color .3s;
-    }
-    &::after{
-        margin-top: 1px;
-        background-color: #00000040;
-        transform: translate(-50%);
-        width: 30px;
-        height: 1px;
-        content: "";
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transition: background-color .3s;
-    }
+  width: 100%;
+  border-left: 1px solid #eee;
+  margin-left: -1px;
+  background-color: #ececec;
+  cursor: row-resize;
+  box-sizing: border-box;
+  position: relative;
+  flex-shrink: 0;
+  min-width: 1px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+
+  &::before {
+    margin-top: -2px;
+    background-color: #00000040;
+    transform: translate(-50%);
+    width: 30px;
+    height: 1px;
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transition: background-color .3s;
+  }
+
+  &::after {
+    margin-top: 1px;
+    background-color: #00000040;
+    transform: translate(-50%);
+    width: 30px;
+    height: 1px;
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transition: background-color .3s;
+  }
 }
 
 ::v-deep(.splitpanes__pane) {
-    .el-card {
-        height: 100%;
-    }
+  .el-card {
+    height: 100%;
+  }
 }
 </style>

src/types/api/order.ts

@@ -5,6 +5,9 @@ export interface SearchForm {
   endProductId: string
   orderNumber: string
   shopNumber: string
+  timeType: string | null
+  startTime?: string | null
+  endTime?: string | null
   logisticsTracking: string
   lanshouName: string
   billNumber: string

src/views/DeliveryNotePage.vue

@@ -286,6 +286,7 @@ const productProps = [
     { label: '质检(不通过)', key: 'notPassNum' },
   ],
 ]
+
 const logisticsProps = [
   { label: '订单号', key: 'orderNumber', copyable: true },
   {