修复选择合计bug

web/building_saas/main/js/views/character_content_view.js

@@ -982,16 +982,9 @@ let pageCCOprObj = {
         let updateData = {
             itemCharacterText: '',
             jobContentText: '',
-            name: '',
+            name: this.nameCache,
         };
         let contentArray = [];
-        // 获取默认数据
-        const defaultData = this.getDataBySetting(node, {
-            serialType: "1",
-            characterFormat: "2",
-        });
-        defaultData.character = defaultData.character.join("\r\n");
-        defaultData.content = defaultData.content.join("\r\n");
 
         // 获取当前设置数据
         const currentData = this.getDataBySetting(node, setting);
@@ -1035,10 +1028,16 @@ let pageCCOprObj = {
             case "1":
                 // 换行分隔
                 content = contentArray.join("\r\n");
+
+                currentData.character = currentData.character.join("\r\n");
+                currentData.content = currentData.content.join("\r\n");
                 break;
             case "2":
                 // 逗号分隔
                 content = contentArray.join(',');
+
+                currentData.character = currentData.character.join("，");
+                currentData.content = currentData.content.join("，");
                 break;
             case "3":
                 // 括号分隔
@@ -1053,7 +1052,7 @@ let pageCCOprObj = {
                 break;
             case "2":
                 // 添加到清单名称列
-                content = defaultData.name + "\r\n" + content;
+                content = this.nameCache + "\r\n" + content;
                 updateData.name = content;
                 break;
             case "3":
@@ -1062,9 +1061,9 @@ let pageCCOprObj = {
                 break;
             case "4":
                 updateData = {
-                    itemCharacterText: defaultData.character,
-                    jobContentText: defaultData.content,
-                    name: defaultData.name,
+                    itemCharacterText: currentData.character,
+                    jobContentText: currentData.content,
+                    name: currentData.name,
                 };
                 break;
         }

web/building_saas/main/js/views/project_view.js

@@ -632,12 +632,14 @@ var projectObj = {
         // 小数点最高位数
         let max = 0;
         let total = 0;
+        let counter = 0;
         for (let col = selectedArea.col; col < (selectedArea.colCount + selectedArea.col); col++) {
             for (let row = selectedArea.row; row < (selectedArea.rowCount + selectedArea.row); row++) {
-                const value = sheet.getCell(row, col).value();
+                const value = sheet.getCell(row, col).text();
                 if (!regular.test(value)) {
                     continue;
                 }
+                counter++;
                 // 获取当前数据小数位数
                 let pointPosition = value.toString().indexOf(".");
                 pointPosition = pointPosition < 0 ? pointPosition : pointPosition + 1;
@@ -647,7 +649,7 @@ var projectObj = {
             }
         }
         // 如果不为0则悬浮显示
-        if (total > 0) {
+        if (total > 0 && counter > 1) {
             const div = $('<div id="total-tips"><p>合计: <input type="text" id="total" readonly="readonly" style="border: none;"/></p><p><a href="javascript:void(0);">复制</a></p></div>');
             div.css({
                 position: "absolute",

web/building_saas/main/js/views/sub_view.js

@@ -130,15 +130,11 @@ $("#use-to-current").click(function() {
     self.attr('disabled', 'disabled');
     let selectedNode = projectObj.mainController.tree.selected;
     // 获取原名称
-    let libId = projectInfoObj.projectInfo.engineeringInfo.bill_lib[0].id;
-    let orgCode = selectedNode.data.code.substr(0, 9);
-    CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: orgCode}, function (data) {
-        if (data) {
-            pageCCOprObj.nameCache = data.name;
-            // 操作内容
-            pageCCOprObj.setCharacterBySetting(selectedNode, setting);
-        }
-    });
+    const name = selectedNode.data.name.split("\r\n");
+    pageCCOprObj.nameCache = name[0] !== undefined ? name[0] : "";
+    // 操作内容
+    pageCCOprObj.setCharacterBySetting(selectedNode, setting);
+
     // 防止连续点击1秒后才能再次发起请求
     setTimeout(function() {
         isSaving = false;
@@ -189,6 +185,7 @@ $("#add-position").change(function() {
     const addContentEle = $("#add-content");
     const displayFormatEle = $("#display-format");
     const characterFormatEle = $("#character-format");
+    const serialTypeEle = $("#serial-type");
     switch (selected) {
         case '4':
             // 分别添加到对应列
@@ -196,14 +193,14 @@ $("#add-position").change(function() {
             addContentEle.val('');
             addContentEle.attr('disabled', 'disabled');
             displayFormatEle.val(1);
-            displayFormatEle.attr('disabled', 'disabled');
             characterFormatEle.val(2);
-            characterFormatEle.attr('disabled', 'disabled');
+            serialTypeEle.val(1);
             break;
         default:
             addContentEle.removeAttr('disabled');
             displayFormatEle.removeAttr('disabled');
             characterFormatEle.removeAttr('disabled');
+            addContentEle.val(1);
             break;
     }
 });
@@ -228,6 +225,11 @@ $("#add-content").change(function() {
         case '2':
         case '3':
             characterFormatEle.removeAttr('disabled');
+            if (serialTypeEle.val() === '') {
+                serialTypeEle.val(1);
+            }
+            serialTypeEle.removeAttr('disabled');
+            childDisplayFormatEle.attr('disabled', 'disabled');
             break;
         case '4':
             // 当“添加内容”是“定额子目”或“工作内容”，则“特征生成方式”灰显，不需选择；否则有效可选。
@@ -235,6 +237,9 @@ $("#add-content").change(function() {
             characterFormatEle.val(2);
         default:
             serialTypeEle.removeAttr('disabled');
+            if (serialTypeEle.val() === '') {
+                serialTypeEle.val(1);
+            }
             childDisplayFormatEle.attr('disabled', 'disabled');
             break;
     }