Merge branch 'dev' of 47.122.114.111:qinjianhui/factory_front into new-pod-cn

components.d.ts

@@ -32,6 +32,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -62,6 +63,7 @@ declare module 'vue' {
     RightClickMenu: typeof import('./src/components/RightClickMenu.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SearchProdOrder: typeof import('./src/components/searchProdOrder.vue')['default']
     Select: typeof import('./src/components/Form/Select.vue')['default']
     ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
     SideBar: typeof import('./src/components/SideBar.vue')['default']

src/api/podOrder.ts

@@ -36,6 +36,18 @@ export function getSubOrderBySubOrderNumber(thirdSubOrderNumber: string) {
     },
   )
 }
+
+export function getSubOrderBySubOrder(factorySubOrderNumber: string,orderFrom:string) {
+  return axios.get<never, BaseRespData<PodProductList>>(
+    'factory/podJomallOrderProductCnUs/getSubOrderBySubOrderNumber',
+    {
+      params: {
+        factorySubOrderNumber,
+        orderFrom,
+      },
+    },
+  )
+}
 export function refreshJMProductInfo(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrder/refreshJomallPodProduct ',

src/api/podUsOrder.ts

@@ -535,6 +535,25 @@ export function statusPushApi(params: (string | number)[]) {
   )
 }
 
+// 转至已完成
+export function changeToFinished(ids: string) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateToComplete`,
+    { params: { ids } },
+  )
+}
+
+// 转至已完成
+export function updateTrackingNumberAndRegister(
+  id: number,
+  trackingNumber: string,
+) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateTrackingNumberAndRegister`,
+    { id, trackingNumber },
+  )
+}
+
 // 完成发货
 export function completeDeliveryApi(params: {
   orderIdList: (string | number)[]
@@ -576,3 +595,10 @@ export function printProductionPdfByBatchNumberApi(params: {
     },
   )
 }
+
+// 待跟踪 注册列表统计接口
+export function countTrackRegisterApi() {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/countTrackRegister`,
+  )
+}

src/components/SideBar.vue

@@ -11,6 +11,13 @@
     >
       <img src="../assets/images/printer.png" width="24" height="24" />
     </div>
+    <div
+      title="生产单查询"
+      class="tool-item"
+      @click="searchVisible = true"
+    >
+      <img src="../assets/images/saoma.png" width="24" height="24" />
+    </div>
   </div>
 
   <!-- 格式工具 -->
@@ -130,13 +137,16 @@
       </TableView>
     </el-dialog>
   </span>
-
+  <el-dialog v-model="searchVisible" title="生产单查询" width="100%" fullscreen>
+    <SearchProductOrder v-if="searchVisible" />
+  </el-dialog>
   <!-- 预览图片 -->
   <el-dialog v-model="dialogVisible" width="35%">
     <img :src="dialogImageUrl" alt="商品预览图片" />
   </el-dialog>
 </template>
 <script lang="ts" setup>
+import SearchProductOrder from './searchProdOrder.vue'
 import { ref, watch, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 
@@ -148,6 +158,7 @@ import { LogisticBill } from '@/types/api/podMakeOrder'
 import TableView from '@/components/TableView.vue'
 
 const formatDrawer = ref(false)
+const searchVisible = ref(false)
 const getLogisticDrawer = ref(false)
 
 const textareaT = ref('')

src/router/menu.ts

@@ -187,11 +187,6 @@ const menu: MenuItem[] = [
         label: '下载生产客户端',
       },
       {
-        index: '/system/external-authorisation',
-        id: 5,
-        label: '外部授权',
-      },
-      {
         index: '/system/customers',
         id: 6,
         label: '客户管理',

src/types/api/podOrder.ts

@@ -123,6 +123,20 @@ export interface PodOrderRes extends PodProductList {
   note?: Array<{ prop: string | number; value: string | number }>
   imgList: ImgList
 }
+
+export interface SearchOrderRes extends PodProductList {
+  expectDeliveryTime?: string | null
+  thirdOrderNumber?: string | null
+  startStockingTime?: string | null
+  userMark?: string | null
+  color?: string | null
+  size?: string | null
+  note?: Array<{ prop: string | number; value: string | number }>
+  imgList: {
+    url:string
+    title?: string
+  }[]
+}
 export interface ShipmentOrderRes {
   factoryOrderNumber?: string
   thirdSubOrderNumber?: string

src/types/api/podUsOrder.ts

@@ -35,6 +35,7 @@ export interface SearchForm {
   craftCode?: string
   thirdStockSku?: string
   interceptStatus?: number | string
+  trackRegisterSelect?: string | number
 }
 export interface PodUsOrderListData {
   id: number
@@ -80,6 +81,7 @@ export interface PodUsOrderListData {
   logisticsWayName?: string
   url?: string | null
   tiffUrl?: string | null
+  lanshouAddress?: string | null
 }
 export interface ProductList {
   id: number