1.多单价套定额debug

2.管理文件页面调整

modules/glj/models/glj_list_model.js

@@ -705,7 +705,7 @@ class GLJListModel extends BaseModel {
             }
             let basePrice = tmp.basePrice;
             //只有标准的工料机的组成物才会有多单价、多组成物消耗量的情况 fromTable
-            if(fromTable == 'std' && ext && ext.priceField &&( tmp.priceProperty[ext.priceField]!= undefined && tmp.priceProperty[ext.priceField]!=null)){
+            if(fromTable == 'std' && ext && ext.priceField &&(tmp.priceProperty && tmp.priceProperty[ext.priceField]!= undefined && tmp.priceProperty[ext.priceField]!=null)){
                 basePrice = tmp.priceProperty[ext.priceField];
             }
             basePrice = scMathUtil.roundTo(basePrice,-6);

modules/main/facade/ration_facade.js

@@ -978,7 +978,7 @@ function getProjectGLJNewData(tmp,projectId,ext){
       market_price: tmp.basePrice,
       from:tmp.from?tmp.from:"std"
   };
-  if(gljData.from == 'std' && ext && ext.priceField &&( tmp.priceProperty[ext.priceField]!= undefined && tmp.priceProperty[ext.priceField]!=null)){
+  if(gljData.from == 'std' && ext && ext.priceField &&(tmp.priceProperty && tmp.priceProperty[ext.priceField]!= undefined && tmp.priceProperty[ext.priceField]!=null)){
     const basePrice = scMathUtil.roundTo(tmp.priceProperty[ext.priceField],-6);
     gljData.base_price = basePrice;
     gljData.market_price = basePrice;

web/building_saas/css/custom.css

@@ -448,4 +448,7 @@ input.text-right{
 .material_link.active{
   border:2px solid #ff6501 !important;
   border-right: 1px solid #fff !important;
+}
+.table-sc th {
+    font-weight: normal;
 }

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

@@ -155,7 +155,7 @@
                     <thead>
                         <th style="width: 25px;" class="text-center"></th>
                         <th style="width: 330px;" class="text-center">名称</th>
-                        <th style="width:40px;" class="text-center">使用</th>
+                        <th style="width: 55px;" class="text-center">使用</th>
                     </thead>
                     <tbody>
                     </tbody>
@@ -167,7 +167,7 @@
                     <thead>
                         <th style="width: 25px;" class="text-center"></th>
                         <th style="width: 330px;" class="text-center">名称</th>
-                        <th style="width:40px;" class="text-center">使用</th>
+                        <th style="width: 55px;" class="text-center">使用</th>
                     </thead>
                     <tbody>
                     </tbody>

web/common/html/header.html

@@ -176,7 +176,7 @@
 </div>
 <!--激活产品 & 售后服务 & 联系客服-->
 <!--办事处客服列表-->
-<div class="modal fade z-index-3000" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
+<div class="modal fade z-index-3000" id="activ" data-backdrop="static" style="display: none; overflow: auto;" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">