Merge branch 'dev_arrange' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_track

src/views/order/podUs/index.vue

@@ -3741,11 +3741,28 @@ const tableColumns = computed(() => {
         width: 150,
         width: 150,
         prop: 'craftType',
         prop: 'craftType',
         align: 'center',
         align: 'center',
-        render: (item:ProductList) => (
-          <div>
-            <span>{processType.value.find((e) => e.value === item.craftType)?.label}</span>
-          </div>
-        )
+        render: (item:ProductList) => {
+          if (!item.craftType) {
+            return (
+              <div>
+                <span>-</span>
+              </div>
+            )
+          }
+          
+          // 分割字符串并查找对应的 label
+          const labels = item.craftType
+            .split(',')
+            .map(type => type.trim())
+            .map(type => processType.value.find(e => e.value === type)?.label || type)
+            .filter(Boolean)
+          
+          return (
+            <div>
+              <span>{labels.join(',')}</span>
+            </div>
+          )
+        }
       },
       },
 
 
       {
       {