导入工程专业下拉bug

web/building_saas/main/html/main.html

@@ -2073,6 +2073,27 @@
         </div>
     </div>
 </div>
+<!--设置导出工程编号-->
+<div class="modal fade" id="exportCode" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">设置工程编号</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="modal-auto-height" style="overflow: hidden" id="exportSpread">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" id="exportCode-confirm">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
 <!--进度条-->
 <div class="modal fade" id="progress" data-backdrop="static">
     <div class="modal-dialog" role="document">

web/building_saas/main/js/models/importStandardInterface.js

@@ -1566,11 +1566,4 @@ const ImportXML = (() => {
             }
         }
     };
-})();
-
-let toGet = ['a', 'b', 'c'],
-    getMap = {a: 1, b: 2, c: 3};
-
-function getDataSleep(attr) {
-
-}
+})();

web/building_saas/main/js/views/export_view.js

@@ -7,18 +7,33 @@
  * @date 2019/6/5
  * @version
  */
-
+//导出接口相关
 const ExportView = (() => {
     let xmlObj = null;
-    //导出接口-项目自检
+    //设置工程编号表格数据设置
+    const sheetSetting = {
+        header: [
+            {headerName: '名称', headerWidth: 200, dataCode: 'name', dataType: 'String'},
+            {headerName: '工程编号', headerWidth: 200, dataCode: 'code', dataType: 'String'},
+        ]
+    };
+    //初始化设置工程编号表格
+    function initSpread() {
+        let spread = SheetDataHelper.createNewSpread($("#exportSpread")[0], 1);
+        sheetCommonObj.spreadDefaultStyle(spread);
+        let sheet = spread.getSheet(0);
+        sheetCommonObj.initSheet(sheet, sheetSetting, 30);
+    }
+    //事件监听
     function exportListener() {
+        //导出接口-项目自检
         $('#export-check').click(async function () {
             let checkedDatas = $('#export input[type="checkbox"]:checked');
             if (!checkedDatas.length) {
                 return;
             }
             let pr = new SCComponent.InitProgressBar();
-            pr.start('导出数据接口', '正在自检，请稍候……')
+            pr.start('导出数据接口', '正在自检，请稍候……');
             try {
                 if (!xmlObj || !xmlObj.fileDatas.length) {
                     xmlObj = new XMLStandard(userID, 1);

web/building_saas/pm/js/pm_import.js

@@ -183,7 +183,7 @@ const importView = (() => {
             //文件里的工程专业跟软件里的对应不上，取第一个
             if (!engineerings.length) {
                 engineerings = this.engineeringList.filter(data => data.lib.seq === 1) || [this.engineeringList[0]];
-                tenderData.temp.engineering = engineerings[0];
+                tenderData.temp.engineering = engineerings[0] ? engineerings[0].lib.name : tenderData.engineering;
             }
             if (!engineerings.length) {
                 return;