Merge branch 'master' into 测试

src/views/subsidiary/order/management/design.vue

@@ -231,7 +231,7 @@
                             </el-table-column>
                             <el-table-column label="操作" align="center" fixed="right" width="60">
                               <template #default="props">
-                                <el-button type="danger" @click="clickDeletePackingFittings(index, props.$index)" text>删除</el-button>
+                                <el-button type="danger" @click="clickDeletePackingFittings(index, props.$index, props.row)" text>删除</el-button>
                               </template>
                             </el-table-column>
                           </el-table>
@@ -805,8 +805,12 @@ const computeMoney = (index, indexSKU) => {
   }
   return money;
 };
-const clickDeletePackingFittings = (index, indexTwo) => {
-  formData.data.orderSkuList[index].orderSkuBomList.splice(indexTwo, 1);
+const clickDeletePackingFittings = (index, indexTwo, row) => {
+  if (["1682221201491058690", "1682221249268375554"].includes(row.bomClassifyId)) {
+    ElMessage("彩纸类和OPP膜类不可删除");
+  } else {
+    formData.data.orderSkuList[index].orderSkuBomList.splice(indexTwo, 1);
+  }
 };
 const rowIndex = ref(null);
 const openPackingFittings = ref(false);