Bläddra i källkod

工程量明细窗口,累加列后新增一列“图号及备注”。
造价书“显示至”菜单移出来放到“更多”后面。

chenshilong 3 år sedan
förälder
incheckning
58c360658d

+ 18 - 14
modules/all_models/quantity_detail.js

@@ -2,20 +2,24 @@
  * Created by chen on 2017/7/20.
  */
 
-var mongoose = require('mongoose'),
-    Schema = mongoose.Schema;
+var mongoose = require("mongoose"),
+  Schema = mongoose.Schema;
 
-var quantity_detail = new Schema({
-    ID:String,
+var quantity_detail = new Schema(
+  {
+    ID: String,
     projectID: Number,
-    rationID:String,
-    billID:String,
-    name:String,
-    regex:String,
-    result:Number,
-    isSummation: {type: Number,default:1},//0:false 1:true
-    referenceIndexs:[Number],
-    seq:Number
-},{versionKey:false});
+    rationID: String,
+    billID: String,
+    name: String,
+    regex: String,
+    result: Number,
+    isSummation: { type: Number, default: 1 }, //0:false 1:true,
+    memo: String,
+    referenceIndexs: [Number],
+    seq: Number,
+  },
+  { versionKey: false }
+);
 
-mongoose.model('quantity_detail', quantity_detail);
+mongoose.model("quantity_detail", quantity_detail);

+ 12 - 12
web/building_saas/main/html/main.html

@@ -107,17 +107,6 @@
                       <div class="btn-group ml-2">
                           <a class="dropdown-toggle btn btn-light btn-sm" data-toggle="dropdown" href="#" id="moreMenuA" role="button" aria-haspopup="true" aria-expanded="false">更多</a>
                           <div class="dropdown-menu dropright" id="moreMenu">
-                              <a id="displayA" href="javascript:void(0);" data-toggle="dropdown" class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 显示至...</a>
-                              <div id="subDisplay" class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: 0px; left: 0px; will-change: transform;" x-placement="right-start">
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayX">项</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayM">目</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayJ">节</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayXM">细目</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayZDCXM">最底层细目</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayDE">定额</a>
-                              </div>
-                              <!--<a href="javascript:void(0);" id="ZLFB_btn" class="dropdown-item" data-placement="bottom"><i class="fa fa-retweet" aria-hidden="true"></i> 整理分部</a>
-                                <a id="switchTznr" href="javascript:void(0);"  class="dropdown-item"><i class="fa fa-eye" aria-hidden="true"></i> 显示特征</a>-->
                             <% if((compilationName === '公路造价(2018)' || compilationName === '安徽养护(2018)' || compilationName === '广东公路造价(2018)' || compilationName === '浙江养护(2005)') && boqType) { %>
                                 <a class="dropdown-item" id="open-export-modal" href="javascript:void(0);"><i class="fa fa-code-fork"></i> 数据接口</a>
                                 <!-- <a class="dropdown-item" id="open-export-modal" href="javascript:void(0);" data-toggle="modal" data-target="#interface-export-modal"><i class="fa fa-code-fork"></i> 数据接口</a> -->
@@ -128,7 +117,18 @@
                             <a href="javascript:void(0)"  class="dropdown-item" name="lockBills"> <i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a>
                             <% } %>
                               <a id = "menu_calc_program_manage"  href="javascript:void(0);" class="dropdown-item"><i class="fa fa-calculator" aria-hidden="true"></i> 总计算程序</a>
-                          </div>
+                          </div> 
+                      </div>
+                      <div class="btn-group ml-2">
+                        <a class="dropdown-toggle btn btn-light btn-sm" data-toggle="dropdown" href="#" id="displayA" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-list-ol"></i> 显示至...</a>
+                        <div class="dropdown-menu dropright" id="subDisplay">
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayX">项</a>
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayM">目</a>
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayJ">节</a>
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayXM">细目</a>
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayZDCXM">最底层细目</a>
+                          <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayDE">定额</a>
+                        </div>
                       </div>
                       <% } %>
                  <!--   <span class="btn btn-light btn-sm">

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1730 - 1669
web/building_saas/main/js/views/glj_view.js