Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

config/gulpConfig.js

@@ -44,6 +44,7 @@ module.exports = {
     pm_jspaths:[
         'public/web/syntax-detection.js',
         'public/web/uuid.js',
+        'public/billsUtil.js',
         'public/web/date_util.js',
         'public/web/upload_cdn.js',
         'public/web/id_tree.js',

web/building_saas/pm/html/project-management.html

@@ -758,6 +758,7 @@
 <script type="text/javascript" src="/public/web/syntax-detection.js"></script>
 <script src="/web/building_saas/js/global.js"></script>
 <script src="/public/web/uuid.js"></script>
+<script src="/public/billsUtil.js"></script>
 <script src="/public/web/date_util.js"></script>
 <script src="/public/web/upload_cdn.js"></script>
 <script src="/web/building_saas/pm/js/pm_tree.js"></script>

web/building_saas/standard_interface/import/base.js

@@ -374,7 +374,9 @@ const INTERFACE_EXPORT_BASE = (() => {
         feeFile: { name: tender.name, id: `newFeeRate@@${taxData.fee_lib.id}` } // 新建费率文件
       };
       delete tender.feature;
-      tender.bills = handleBills(tender.bills, _.cloneDeep(templateData.bills), tender.ID,); // 必须要拷贝一份，否则多单位工程情况下，前单位工程的清单数据会被后单位工程的覆盖
+      const tenderDataBills = _.cloneDeep(templateData.bills);
+      BILLS_UTIL.resetTreeData(tenderDataBills, uuid.v1);
+      tender.bills = handleBills(tender.bills, tenderDataBills, tender.ID,); // 必须要拷贝一份，否则多单位工程情况下，前单位工程的清单数据会被后单位工程的覆盖
       // 给暂估材料和评标材料设置项目数据
       const setGLJRefFunc = glj => {
         glj.ID = uuid.v1();