字段调整

src/views/pre-book/addPreBookDrawer.vue

@@ -398,7 +398,7 @@ export default {
 
         {
           title: '采购/委外工厂',
-          key: 'purchaseAboardFactory',
+          key: 'supplier',
           width: 160,
 
           className: 'replacecolor'
@@ -651,7 +651,8 @@ export default {
           preAssembledPackingNo:data.documentNo,
           salesman:data.salesman,
           salesDepartment:data.salesDepartment,
-          spurOrSubOrder:data.spurOrSubOrder
+          spurOrSubOrder:data.spurOrSubOrder,
+          supplier:data.supplier
         };
         ret.push(sub);
       }

src/views/shipment-details/editShipDetDrawer.vue

@@ -659,7 +659,7 @@ export default {
             {key:'numberOfSets',value:'套装件数'},
            {key:'isTc',value:'是否TC功能'},
           //  {key:'materialComposition',value:'物料成分'},
-           {key:'salesTypeText',value:'销售类型'},
+          //  {key:'salesTypeText',value:'销售类型'},
               ]
              for(var j=0 ; j<required.length;j++){
                 if(tableRow[required[j].key] == null || tableRow[required[j].key] == "" || tableRow[required[j].key] == undefined){