feat: Eslint 报错修改

d33a44ea · qinjianhui · 236e940e · d33a44ea · d33a44ea · d33a44ea
Commit d33a44ea authored Apr 08, 2026 by qinjianhui
6 changed files
--- a/src/store/order.ts
+++ b/src/store/order.ts
@@ -20,6 +20,7 @@ const useOrderStore = defineStore('order', {
  },
  actions: {
    async setPodBoxList(content: {
+      url: string
      boxList: PodMakeOrderData[] | OrderData | null
      factoryNo: number | string | undefined
      fromUser: number
@@ -27,10 +28,10 @@ const useOrderStore = defineStore('order', {
      box?: number
      data?: OrderData
    }) {
-      console.log(content,'content')
+      console.log(content, 'content')
-      const { factoryNo, warehouseId, boxList, box, data,fromUser } = content
+      const { url, factoryNo, warehouseId, boxList, box, data, fromUser } = content
      if (Array.isArray(boxList)) {
-        boxList.forEach(item => {
+        boxList.forEach((item) => {
          item.fromUser = fromUser
        })
        this.podBoxList = boxList
@@ -38,7 +39,7 @@ const useOrderStore = defineStore('order', {
        const index = this.podBoxList?.findIndex((item) => item.box === box)
        if (index === -1) {
          try {
-            const res = await getPodBoxListApi(factoryNo, warehouseId)
+            const res = await getPodBoxListApi(url, factoryNo, warehouseId)
            const boxList = res.data.map((item) => {
              item.fromUser = fromUser
              if (res.data) {

--- a/src/views/order/factoryOrderNew/component/CardLayout.vue
+++ b/src/views/order/factoryOrderNew/component/CardLayout.vue
@@ -35,7 +35,7 @@
              >
                <div
                  style="
-                    background-color: #F56C6C;
+                    background-color: #f56c6c;
                    color: #fff;
                    padding: 2px 4px;
                    border-radius: 4px;
@@ -67,7 +67,7 @@
                      <el-image
                        :src="img?.url"
                        height="50"
-                        :preview-src-list="JSON.parse(item.imageAry as string).map((i: { title: string; url: string }) => i.url)"
+                        :preview-src-list="JSON.parse(item.imageAry as string).map((i: any) => i.url)"
                      />
                    </div>
                  </div>

--- a/src/views/order/factoryOrderNew/component/OperateDetailsDialog.vue
+++ b/src/views/order/factoryOrderNew/component/OperateDetailsDialog.vue
@@ -79,7 +79,7 @@
                      <el-image
                        :src="img?.url"
                        height="50"
-                        :preview-src-list="JSON.parse(item.imageAry as string).map((i: { title: string; url: string }) => i.url)"
+                        :preview-src-list="JSON.parse(item.imageAry as string).map((i: any) => i.url)"
                      />
                    </div>
                  </div>

--- a/src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
+++ b/src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
@@ -20,7 +20,7 @@
      </div>
      <div class="table-view">
        <TableView
-          :paginated-data="pickData.pickingSituationList"
+          :paginated-data="pickData.pickingSituationList || []"
          :columns="columns"
          serial-numberable
          selectionable

--- a/src/views/order/factoryOrderNew/index.vue
+++ b/src/views/order/factoryOrderNew/index.vue
@@ -831,6 +831,7 @@
      :is-new-order="true"
      ws-open-code="STARTORDERNEWPOD"
      ws-close-code="ENDORDERNEWPOD"
+      init-url="factory/podOrderPacking/local/getPodBoxOrderDetails"
      @set-printer="handlePrinterChange"
      @set-warehouse-id="handleWarehouseIdChange"
      @refresh="() => refreshCurrentView({ isRefreshTree: true })"

--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -64,7 +64,9 @@
            <ElInput
              ref="productionOrderRef"
              v-model="productionOrder"
-              :placeholder="props.isNewOrder ? '请输入操作单号' : '请输入生产单号'"
+              :placeholder="
+                props.isNewOrder ? '请输入操作单号' : '请输入生产单号'
+              "
              clearable
              style="width: 100%"
              @keyup.enter="handleSearch"
@@ -292,11 +294,17 @@ const props = withDefaults(
    modelValue: boolean
    printOrder: (data: OrderData, callback: (status: boolean) => void) => void
    warehouseList: WarehouseListData[]
-    isNewOrder: boolean
+    isNewOrder?: boolean
-    wsOpenCode: string
+    wsOpenCode?: string
-    wsCloseCode: string
+    wsCloseCode?: string
+    initUrl?: string
  }>(),
-  { isNewOrder: false, wsOpenCode: 'STARTORDER', wsCloseCode: 'ENDORDER' },
+  {
+    isNewOrder: false,
+    wsOpenCode: 'STARTORDER',
+    wsCloseCode: 'ENDORDER',
+    initUrl: 'factory/podJomallOrderUs/local/getPodBoxOrderDetails',
+  },
 )
 const emit = defineEmits([
  'update:modelValue',
@@ -540,11 +548,10 @@ const renderItemBox = (bool: boolean) => {
    for (const product of productList) {
      if (
        product.podJomallUsNo === currentCode ||
-        product.thirdSkuCode === currentCode
+        product.thirdSkuCode === currentCode ||
+        (product.operationNos && product.operationNos.includes(currentCode))
      ) {
        coverImage.value = product.previewImgs?.[0]?.url || ''
-        console.log(441, coverImage.value)
        nextTick(() => {
          tableRef.value?.setCurrentRow(product)
        })
@@ -555,7 +562,6 @@ const renderItemBox = (bool: boolean) => {
  }
  podOrderDetailsData.value = data
-  console.log(408, data)
  if (productList.every((item) => item.power)) {
    if (userStore.user?.id !== boxItem.fromUser) return
@@ -598,7 +604,10 @@ const setPodBoxList = (data: WebSocketMessage) => {
  if (obj && typeof obj === 'string') {
    const parsedData = JSON.parse(obj)
    parsedData.fromUser = data.fromUser
-    orderStore.setPodBoxList(parsedData)
+    orderStore.setPodBoxList({
+      url: props.initUrl,
+      ...parsedData,
+    })
  }
 }
 const initPrintDevice = () => {
@@ -798,15 +807,14 @@ const initOrderDetailBox = async () => {
    background: 'rgba(0, 0, 0, 0.3)',
  })
  try {
-    const url = props.isNewOrder
+    const url = props.initUrl
-      ? 'factory/podOrderPacking/local/getPodBoxOrderDetails'
-      : 'factory/podJomallOrderUs/local/getPodBoxOrderDetails'
    const res = await getPodBoxListApi(url, factoryNo, warehouseId.value)
    if (res.code !== 200) {
      ElMessage.warning(res.message)
      return
    }
    orderStore.setPodBoxList({
+      url,
      boxList: res.data,
      fromUser: userStore.user ? userStore.user.id : 0,
      factoryNo,
@@ -1074,6 +1082,7 @@ const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
    const factoryNo = userStore.user?.factory.id
    if (!factoryNo) return
    orderStore.setPodBoxList({
+      url: props.initUrl,
      fromUser: userStore.user ? userStore.user.id : 0,
      boxList: item ? (item.data as PodMakeOrderData[]) : null,
      factoryNo,
@@ -1102,11 +1111,6 @@ const clearAllBox = async () => {
      userStore.user?.factory.id,
    )
    if (res.code !== 200) return
-    // orderStore.setPodBoxList({
-    //   boxList: res.data,
-    //   factoryNo: userStore.user?.factory.id || '',
-    //   warehouseId: warehouseId.value,
-    // })
    productionOrderRef.value.focus()
    podOrderDetailsData.value = {}
    coverImage.value = ''