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

web/building_saas/complementary_glj_lib/js/glj.js

@@ -788,7 +788,9 @@ let repositoryGljObj = {
         // 输入编号、名称、规格时，如果输入回车符或粘贴回车符，提交时应转换为空格。
         let deESCFields = ['code', 'name', 'specs'];
         if (deESCFields.includes(me.setting.header[args.col]['dataCode'])) {
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r\n]/g, ' ') : '';
+            args.editingText = me.isDef(args.editingText) 
+                ? args.editingText.toString().replace(/[\r\n]/g, ' ').replace(/\s$/, '')
+                : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetOpr.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),

web/building_saas/main/html/main.html

@@ -1476,7 +1476,7 @@
           </div>
         </div>
         <div class="modal-footer" style="position: relative;">
-          <a href="/complementaryGlj" target="_blank" class="btn btn-primary"
+          <a href=<%- "/complementaryGlj/" + userID %> target="_blank" class="btn btn-primary"
             style="position: absolute; left: 20px">新增人材机</a>
           <a href="javascript:void(0);" id="glj_selected_conf" class="btn btn-primary">确定</a>
           <a href="javascript:void(0);" id="replace_next_btn" class="btn btn-primary">下一步</a>