Merge branch 'dev' into 'master'

Dev

See merge request !194

src/types/api/order/factoryOrderNew.ts

@@ -96,6 +96,7 @@ export interface FactoryOrderNewListData {
   version?: number
   version?: number
   totalCustomsWeight?: number
   totalCustomsWeight?: number
   totalCustomsValue?: number
   totalCustomsValue?: number
+  pauseStatus?: number
   statusName?: string
   statusName?: string
   thirdOrderNumber?: string
   thirdOrderNumber?: string
   customTagList?: { id: string; name: string }[]
   customTagList?: { id: string; name: string }[]

src/views/order/factoryOrderNew/index.vue

@@ -1298,6 +1298,32 @@ const mainColumns = computed(() => [
     label: '订单编号',
     label: '订单编号',
     minWidth: 160,
     minWidth: 160,
     align: 'center',
     align: 'center',
+    render: (row: FactoryOrderNewListData) => {
+      if (status.value === 'SUSPEND' && row.pauseStatus === 2) {
+        return (
+          <span>
+            {row.factoryOrderNumber}
+            <el-tooltip content="客户已确认" placement="top">
+              <span
+                style="
+                  color: #ff6700;
+                  font-weight: bold;
+                  font-size: 12px;
+                  padding: 1px 4px;
+                  border: 1px solid #ff6700;
+                  border-radius: 4px;
+                  margin-left: 4px;
+                  line-height: 1.2;
+                "
+              >
+                确
+              </span>
+            </el-tooltip>
+          </span>
+        )
+      }
+      return row.factoryOrderNumber
+    },
   },
   },
   {
   {
     prop: 'thirdOrderNumber',
     prop: 'thirdOrderNumber',