在库订单转库存品时, 限制商配不能转

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -101,7 +101,9 @@
               v-if="handler"
               >修改服务类型</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
+              >导 出</el-button
+            >
 
             <!--            <el-button type="danger"-->
             <!--                       icon="el-icon-delete"-->
@@ -412,7 +414,8 @@ import {
   add,
   update,
   remove,
-  addStock, stockArticExport
+  addStock,
+  stockArticExport,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
@@ -1080,21 +1083,18 @@ export default {
     },
   },
   methods: {
-
     //导出
     handleExport() {
-      let row = {  };
-      if(!!this.ids){
+      let row = {};
+      if (!!this.ids) {
         row.ids = this.ids;
       }
-      stockArticExport(row).then( res =>{
+      stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '全部订单数据.xlsx');
       });
-
     },
 
-
     uploadAfter(res, done, loading, column) {
       window.console.log(column);
       this.excelBox = false;
@@ -1262,6 +1262,12 @@ export default {
         }
         console.log(123123);
 
+        // 判断订单类型
+        if (Number(item.typeService) === 1) {
+          this.$message.warning(item.orderCode + ' - 为商配订单, 无法转为库存品');
+          return false;
+        }
+
         if (item.reservationStatus == '30') {
           console.log('1 :>> ', 1);
           this.$message.warning(item.orderCode + ' - 已预约，无法转为库存品！！！');
@@ -1284,8 +1290,8 @@ export default {
         }
         console.log('item :>> ', item);
         if (item.isZero === '1') {
-          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品')
-          return false
+          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品');
+          return false;
         }
         console.log('111 :>> ', 111);
         ids.push(item.id);