导入Excel调整

app/lib/analysis_excel.js

@@ -206,8 +206,13 @@ class ImportBaseTree {
     }
 
     _assignRelaField(temp, node) {
-        _.assignInWith(temp, node,
-            (objValue, srcValue, key) => { return ['name', 'unit'].indexOf(key) > -1 ? objValue : srcValue; });
+        if (!temp.quantity) temp.quantity = node.quantity;
+        if (!temp.dgn_qty1) temp.dgn_qty1 = node.dgn_qty1;
+        if (!temp.dgn_qty2) temp.dgn_qty2 = node.dgn_qty2;
+        if (!temp.unit_price) temp.unit_price = node.unit_price;
+        if (!temp.drawing_code) temp.drawing_code = node.drawing_code;
+        if (!temp.memo) temp.memo = node.memo;
+        if (!temp.total_price) temp.total_price = node.total_price;
     }
 
     /**