发运明细位置调整，托书取消成衣工厂限制

src/views/book/packingListModalFabrics.vue

@@ -244,14 +244,16 @@ export default {
       }
       if(this.selectedRows.length === 0){
         this.$message.error('请选择数据！');
-      }else if(this.selectedRows.length !==1 && this.error.length !==0){
-        this.$message.error('所勾选数据的成衣工厂必须相同！');
-        this.error = []
-      }else if(this.fatherList.length !== 0 && this.errorFather.length !==0){
-        var fatherCc = this.errorFather.toString()
-        this.$message.error('所勾选的数据必须与已存在数据成衣工厂必须相同！');
-        this.errorFather = []
-      }else{
+      }
+      // else if(this.selectedRows.length !==1 && this.error.length !==0){
+      //   this.$message.error('所勾选数据的成衣工厂必须相同！');
+      //   this.error = []
+      // }else if(this.fatherList.length !== 0 && this.errorFather.length !==0){
+      //   var fatherCc = this.errorFather.toString()
+      //   this.$message.error('所勾选的数据必须与已存在数据成衣工厂必须相同！');
+      //   this.errorFather = []
+      // }
+      else{
         this.$emit('callback',this.selectedRows,'面辅料')
         this.close()
       }

src/views/shipment-details/shipmentList.vue

@@ -371,15 +371,6 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-        {
-          title: '单据号',
-          dataIndex: 'documentNo',
-          // fixed: 'left',
-          align: 'left',
-          width: 140,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
         {
           title: '销售订单号',
           dataIndex: 'orderNumber',
@@ -389,26 +380,24 @@ export default {
            ellipsis: true,
           className: 'replacecolor'
         },
-
         {
-          title: '客户简称',
-          dataIndex: 'customerAbbreviation',
-          width: 100,
-          align: 'left',
+          title: '款号',
+          dataIndex: 'itemNumber',
+          width: 80,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '部门',
-          dataIndex: 'salesDepartment',
+          title: '业务员',
+          dataIndex: 'salesman',
           width: 100,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '业务员',
-          dataIndex: 'salesman',
-          width: 100,
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+          width: 110,
           ellipsis: true,
           className: 'replacecolor'
         },
@@ -421,41 +410,33 @@ export default {
         },
 
         {
-          title: 'pack id',
-          dataIndex: 'packId',
-          width: 110,
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 240,
+          className: 'replacecolor',
           ellipsis: true,
-          className: 'replacecolor'
         },
         {
-          title: '分销点',
-          dataIndex: 'distributionPoint',
+          title: '报关品名',
+          dataIndex: 'declarationName',
           width: 110,
-          ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+           ellipsis: true,
         },
         {
-          title: '款号',
-          dataIndex: 'itemNumber',
-          width: 80,
-          ellipsis: true,
-          className: 'replacecolor'
-        },
-         {
-          title: '数量',
-          dataIndex: 'shipmentQuantity',
-          width: 80,
-          ellipsis: true,
+          title: '是否TC',
+          dataIndex: 'isTc',
+          width: 90,
+          customRender: function(text) {
+            if (text === '0') {
+              return '否'
+            }
+            if (text === '1') {
+              return '是'
+            }
+          },
           className: 'replacecolor'
         },
-        {
-          title: '物料成分',
-          dataIndex: 'materialComposition',
-          width: 180,
-          ellipsis: true,
-          className: 'replacecolor',
-          ellipsis: true,
-        },
         {
           title: '预发货日期',
           dataIndex: 'preDeliveryDate',
@@ -468,25 +449,31 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-
         {
-          title: '存货名称',
-          dataIndex: 'inventoryName',
-          width: 240,
-          className: 'replacecolor',
+          title: '数量',
+          dataIndex: 'shipmentQuantity',
+          width: 80,
           ellipsis: true,
+          className: 'replacecolor'
         },
-         {
-          title: 'HScode',
-          dataIndex: 'hsCode',
-          width: 120,
+        {
+          title: '报关单价',
+          dataIndex: 'customsDeclarationUnitPrice',
+          width: 80,
           className: 'replacecolor',
            ellipsis: true,
         },
         {
-          title: '报关品名',
-          dataIndex: 'declarationName',
-          width: 110,
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 100,
+          className: 'replacecolor',
+          ellipsis: true,
+        },
+        {
+          title: 'HScode',
+          dataIndex: 'hsCode',
+          width: 120,
           className: 'replacecolor',
            ellipsis: true,
         },
@@ -498,7 +485,14 @@ export default {
           // customRender: t => ellipsis(t),
            ellipsis: true,
         },
-
+        {
+          title: '物料成分',
+          dataIndex: 'materialComposition',
+          width: 180,
+          ellipsis: true,
+          className: 'replacecolor',
+          ellipsis: true,
+        },
         {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
@@ -515,35 +509,38 @@ export default {
            ellipsis: true,
         },
         {
-          title: '是否TC',
-          dataIndex: 'isTc',
-          width: 90,
-          customRender: function(text) {
-            if (text === '0') {
-              return '否'
-            }
-            if (text === '1') {
-              return '是'
-            }
-          },
+          title: 'pack id',
+          dataIndex: 'packId',
+          width: 110,
+          ellipsis: true,
           className: 'replacecolor'
         },
-       
-
         {
-          title: '成衣工厂',
-          dataIndex: 'garmentFactory',
+          title: '客户简称',
+          dataIndex: 'customerAbbreviation',
           width: 100,
-          className: 'replacecolor',
+          align: 'left',
           ellipsis: true,
+          className: 'replacecolor'
         },
         {
-          title: '报关单价',
-          dataIndex: 'customsDeclarationUnitPrice',
-          width: 80,
-          className: 'replacecolor',
-           ellipsis: true,
+          title: '部门',
+          dataIndex: 'salesDepartment',
+          width: 100,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '单据号',
+          dataIndex: 'documentNo',
+          // fixed: 'left',
+          align: 'left',
+          width: 140,
+          ellipsis: true,
+          className: 'replacecolor'
         },
+  
         {
           title: '推送结果',
           dataIndex: 'pushState',