瀏覽代碼

标段概况,标段属性,新增部分属性

MaiXinRong 4 年之前
父節點
當前提交
969c6a0d39
共有 3 個文件被更改,包括 115 次插入2 次删除
  1. 11 1
      app/const/tender_info.js
  2. 101 1
      app/view/tender/detail_modal.ejs
  3. 3 0
      sql/update.sql

+ 11 - 1
app/const/tender_info.js

@@ -8,7 +8,7 @@
  * @version
  */
 
-const parseInfo = ['deal_info', 'construction_unit', 'tech_param', 'decimal', 'precision', 'deal_param', 'display', 'pay_account', 'shenpi'];
+const parseInfo = ['deal_info', 'construction_unit', 'tech_param', 'decimal', 'precision', 'deal_param', 'display', 'pay_account', 'shenpi', 'bid_info'];
 const arrayInfo = ['chapter'];
 const defaultInfo = {
     // 合同信息
@@ -16,6 +16,8 @@ const defaultInfo = {
         buildName: '',
         dealCode: '',
         dealName: '',
+        projectType: '',
+        dealType: '',
     },
     // 参建单位
     construction_unit: {
@@ -55,6 +57,14 @@ const defaultInfo = {
         dealPeriod: '',
         startDate: '',
         planEndDate: '',
+        realStartDate: '',
+        realEndDate: '',
+        structureScale: '',
+    },
+    bid_info: {
+        controlPrice: 0,
+        bidPrice: 0,
+        bidStartDate: '',
     },
     // 小数位数
     decimal: {

+ 101 - 1
app/view/tender/detail_modal.ejs

@@ -17,6 +17,9 @@
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="tab" href="#jscs" role="tab">技术参数</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#zbxx" role="tab">中标信息</a>
+                        </li>
                     </ul>
                     <div class="tab-content">
                         <div class="tab-pane active" id="htxx">
@@ -38,7 +41,7 @@
                                             <input type="text" class="form-control" value="" id="deal-code" maxlength="100" oninput="limitReturn(this)">
                                         </div>
                                     </div>
-                                    <div class="col-12">
+                                    <div class="col-12 mb-2">
                                         <div class="input-group input-group-sm">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text" style="width:90px">合同名称</span>
@@ -46,6 +49,28 @@
                                             <input type="text" class="form-control" value="" id="deal-name" maxlength="100" oninput="limitReturn(this)">
                                         </div>
                                     </div>
+                                    <div class="col-12 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text" style="width:90px">工程类别</span>
+                                            </div>
+                                            <select class="form-control" id="project-type">
+                                                <option value="">请选择</option>
+                                                <option value="设计">设计</option>
+                                                <option value="监理">监理</option>
+                                                <option value="施工">施工</option>
+                                                <option value="其他">其他</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text" style="width:90px">合同类别</span>
+                                            </div>
+                                            <input type="text" class="form-control" value="" id="deal-type">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -270,6 +295,60 @@
                                             <input type="date" class="form-control" value="" id="plan-end-date">
                                         </div>
                                     </div>
+                                    <div class="col-6 pr-0 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">实际开工日期</span>
+                                            </div>
+                                            <input type="date" class="form-control" value="" id="real-start-date">
+                                        </div>
+                                    </div>
+                                    <div class="col-6">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">实际完工日期</span>
+                                            </div>
+                                            <input type="date" class="form-control" value="" id="real-end-date">
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">构造物规模</span>
+                                            </div>
+                                            <textarea class="form-control" id="structure-scale"></textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="tab-pane" id="zbxx">
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-12 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">业主控制价</span>
+                                            </div>
+                                            <input type="number" class="form-control nospin" value="" id="control-price" onchange="checkNumberValid(this)">
+                                        </div>
+                                    </div>
+                                    <div class="col-12 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">中标价</span>
+                                            </div>
+                                            <input type="number" class="form-control nospin" value="" id="bid-price" onchange="checkNumberValid(this)">
+                                        </div>
+                                    </div>
+                                    <div class="col-12 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">开标日期</span>
+                                            </div>
+                                            <input type="date" class="form-control" value="" id="bid-start-date">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -705,6 +784,8 @@
         $('#build-name').val(property.deal_info.buildName);
         $('#deal-code').val(property.deal_info.dealCode);
         $('#deal-name').val(property.deal_info.dealName);
+        $('#project-type').val(property.deal_info.projectType);
+        $('#deal-type').val(property.deal_info.dealType);
 
         // 参建单位
         // 建设单位
@@ -737,6 +818,14 @@
         $('#deal-period').val(property.tech_param.dealPeriod);
         $('#start-date').val(property.tech_param.startDate);
         $('#plan-end-date').val(property.tech_param.planEndDate);
+        $('#real-start-date').val(property.tech_param.realStartDate);
+        $('#real-end-date').val(property.tech_param.realEndDate);
+        $('#structure-scale').val(property.tech_param.structureScale);
+
+        // 中标信息
+        $('#control-price').val(property.bid_info.controlPrice);
+        $('#bid-price').val(property.bid_info.bidPrice);
+        $('#bid-start-date').val(property.bid_info.bidStartDate);
     }
 
     $('#bd-set-1').on('show.bs.modal', function () {
@@ -748,6 +837,8 @@
                 buildName: $('#build-name').val(),
                 dealCode: $('#deal-code').val(),
                 dealName: $('#deal-name').val(),
+                projectType: $('#project-type').val(),
+                dealType: $('#deal-type').val(),
             },
             construction_unit: {
                 build: {
@@ -785,6 +876,14 @@
                 dealPeriod: $('#deal-period').val(),
                 startDate: $('#start-date').val(),
                 planEndDate: $('#plan-end-date').val(),
+                realStartDate: $('#real-start-date').val(),
+                realEndDate: $('#real-end-date').val(),
+                structureScale: $('#structure-scale').val(),
+            },
+            bid_info: {
+                controlPrice: _.toNumber($('#control-price').val()),
+                bidPrice: _.toNumber($('#bid-price').val()),
+                bidStartDate: $('#bid-start-date').val(),
             }
         };
         const tenderId = window.location.pathname.split('/')[2];
@@ -792,6 +891,7 @@
             property.deal_info = data.deal_info;
             property.construction_unit = data.construction_unit;
             property.tech_param = data.tech_param;
+            property.bid_info = data.bid_info;
             $('#bd-set-1').modal('hide');
         });
     }

+ 3 - 0
sql/update.sql

@@ -1 +1,4 @@
 ALTER TABLE `zh_change` ADD `tp_decimal` TINYINT(3) NULL DEFAULT NULL COMMENT '金额位数' AFTER `sin_time`;
+
+ALTER TABLE `zh_tender_info`
+ADD COLUMN `bid_info`  varchar(200) NULL AFTER `tech_param`;