Merge branch 'dev' into 'master'

fix: 问题修改

See merge request !283

src/views/order/factoryOrderNew/component/CardLayout.vue

@@ -181,7 +181,14 @@
                 </div>
                 <div class="card-info-row">
                   <div class="third-sku-cell">
-                    <el-tooltip v-if="item.originThirdSkuCode" effect="dark" placement="top">
+                    <el-tooltip
+                      v-if="
+                        item.originThirdSkuCode &&
+                        item.originThirdSkuCode !== item.thirdSkuCode
+                      "
+                      effect="dark"
+                      placement="top"
+                    >
                       <template #content>
                         <div>
                           下单库存SKU:

src/views/order/factoryOrderNew/index.vue

@@ -2221,7 +2221,7 @@ const operationOrderColumns = computed(() => [
 
       return (
         <div class="third-sku-cell">
-          {originSku && (
+          {originSku && originSku !== row.thirdSkuCode && (
             <el-tooltip
               effect="dark"
               placement="top-start"