重做标段概况

app/controller/deal_bills_controller.js

@@ -55,7 +55,7 @@ module.exports = app => {
                 stream = await ctx.getFileStream();
                 const create_time = Date.parse(new Date()) / 1000;
                 const fileInfo = path.parse(stream.filename);
-                const fileName = this.app.baseDir + '/app/public/deal_bills/uploads/' + 'deal_bills' + create_time + fileInfo.ext;
+                const fileName = this.app.config.filePath + '/cache/deal_bills/uploads/' + 'deal_bills' + create_time + fileInfo.ext;
                 // 保存文件
                 await ctx.helper.saveStreamFile(stream, fileName);
                 if (loadType === loadExcelType.display) {

app/controller/revise_controller.js

@@ -207,11 +207,11 @@ module.exports = app => {
 
         async _getDefaultReviseInfoData(ctx, revise) {
             const reviseBills = revise.bills_file
-                ? JSON.parse(await fs.readFileSync(this.ctx.app.filePath + revise.bills_file, 'utf8'))
+                ? JSON.parse(await fs.readFileSync(this.ctx.app.config.filePath + revise.bills_file, 'utf8'))
                 : await ctx.service.reviseBills.getData(ctx.tender.id);
 
             const revisePos = revise.pos_file
-                ? JSON.parse(await fs.readFileSync(this.ctx.app.filePath + revise.pos_file, 'utf8'))
+                ? JSON.parse(await fs.readFileSync(this.ctx.app.config.filePath + revise.pos_file, 'utf8'))
                 : await ctx.service.revisePos.getData(ctx.tender.id);
             const [ledgerSpread, posSpread] = this._getSpreadSetting(revise);
             const [stdBills, stdChapters] = await this.ctx.service.valuation.getValuationStdList(ctx.tender.data.valuation);

app/controller/tender_controller.js

@@ -324,7 +324,7 @@ module.exports = app => {
                     audit: auditConst,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.tenderInfo),
                 };
-                await this.layout('tender/detail.ejs', renderData);
+                await this.layout('tender/detail.ejs', renderData, 'tender/detail_modal.ejs');
             } catch (error) {
                 this.log(error);
                 this.ctx.redirect('/list');

app/extend/helper.js

@@ -504,6 +504,7 @@ module.exports = {
      * @returns {Promise<void>}
      */
     async saveBufferFile(buffer, fileName) {
+        console.log(fileName);
         // 检查文件夹是否存在，不存在则直接创建文件夹
         const pathName = path.dirname(fileName);
         if (!fs.existsSync(pathName)) {

app/public/js/tender.js

@@ -5,23 +5,6 @@
  * @date 2018/2/5
  * @version
  */
-
-// 整理数据
-let tenderData = [];
-try {
-    if (tenderList.length <= 0) {
-        throw '数据为空';
-    }
-    for(const tmp of tenderList) {
-        const tmpData = {
-            value: 7814964.00,
-            name: tmp.name,
-        };
-        tenderData.push(tmpData);
-    }
-} catch (error) {
-
-}
 // 属性
 function loadCommonProperty () {
     // 合同信息
@@ -730,20 +713,4 @@ $(document).ready(function() {
             $('#edit-6').parent().show();
         });
     });
-
-    //标段类型选择
-    $('#tender_type_select').change(function () {
-        const type = $(this).val() != 0 ? '/?type='+$(this).val() : '';
-        window.location.href = '/tender' + type;
-    });
-    //编辑标段 选择
-    $('.save-btn').on('click',function () {
-        $('#saveid').val($(this).attr('tender-id'));
-        $('#savename').val($(this).attr('tender-name'));
-        $('#savetype').val($(this).attr('tender-type'));
-    });
-    //删除标段 选择
-    $('.del-btn').on('click',function () {
-        $('#delid').val($(this).attr('tender-id'));
-    });
 });

app/service/ledger_revise.js

@@ -141,11 +141,11 @@ module.exports = app => {
 
             const billsHis = '/revise/bills' + timestamp + '.json';
             const bills = await this.ctx.service.reviseBills.getData(revise.tid);
-            await this.ctx.helper.saveBufferFile(JSON.stringify(bills), this.ctx.app.filePath + billsHis);
+            await this.ctx.helper.saveBufferFile(JSON.stringify(bills), this.ctx.app.config.filePath + billsHis);
 
             const posHis = '/revise/pos' + timestamp + '.json';
             const pos = await this.ctx.service.revisePos.getData(revise.tid);
-            await this.ctx.helper.saveBufferFile(JSON.stringify(pos), this.ctx.app.filePath + posHis);
+            await this.ctx.helper.saveBufferFile(JSON.stringify(pos), this.ctx.app.config.filePath + posHis);
 
             return [billsHis, posHis];
         }

app/view/tender/detail.ejs

@@ -22,521 +22,98 @@
     <div class="content-wrap">
         <div class="c-body">
             <div class="sjs-height-0">
-                <!--金额概况-->
-                <div class="row mx-1 mb-3">
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.total_price) %></h5>
-                                <p class="card-text text-muted">0号台帐合同</p>
+                <div class="m-3">
+                    <!--金额概况-->
+                    <div class="row mx-0 mb-3">
+                        <div class="col-auto p-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.total_price) %></h5>
+                                    <p class="card-text text-muted">0号台帐合同</p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.gather_tp) %></h5>
-                                <p class="card-text text-muted">本期完成</p>
+                        <div class="col-auto pr-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.gather_tp) %></h5>
+                                    <p class="card-text text-muted">本期完成</p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %><small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
-                                <p class="card-text text-muted">截止本期变更</p>
+                        <div class="col-auto pr-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %><small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
+                                    <p class="card-text text-muted">截止本期变更</p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_gather_tp) %></h5>
-                                <p class="card-text text-muted">截止本期完成</p>
+                        <div class="col-auto pr-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_gather_tp) %></h5>
+                                    <p class="card-text text-muted">截止本期完成</p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.pre_gather_tp) %></h5>
-                                <p class="card-text text-muted">截止上期完成</p>
+                        <div class="col-auto pr-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.pre_gather_tp) %></h5>
+                                    <p class="card-text text-muted">截止上期完成</p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-auto pr-0">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.yf_tp) %></h5>
-                                <p class="card-text text-muted">本期应付</p>
+                        <div class="col-auto pr-0">
+                            <div class="card text-center">
+                                <div class="card-body">
+                                    <h5 class="card-title"><%- ctx.helper.formatMoney(tender.yf_tp) %></h5>
+                                    <p class="card-text text-muted">本期应付</p>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <!--进度条-->
-                <div class="mb-3">
-                    <div class="progress">
-                        <% if (tender.pre_ratio > 0) { %>
-                        <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成：￥<%- ctx.helper.formatMoney(tender.pre_gather_tp) %>"><%- tender.pre_ratio %>%</div>
-                        <% } %>
-                        <% if (tender.cur_ratio > 0) { %>
-                        <div class="progress-bar bg-info" style="width: <%- tender.cur_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥<%- ctx.helper.formatMoney(tender.gather_tp) %>"><%- tender.cur_ratio %>%</div>
-                        <% } %>
-                        <% if (tender.other_ratio > 0) { %>
-                        <div class="progress-bar bg-gray" style="width: <%- tender.other_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥<%- ctx.helper.formatMoney(tender.other_tp) %>"><%- tender.other_ratio %>%</div>
-                        <% } %>
-                    </div>
-                </div>
-                <ul class="nav nav-tabs">
-                    <!--<li class="nav-item">-->
-                    <!--<a class="nav-link active" data-toggle="tab" href="#tubiao" role="tab">进度表</a>-->
-                    <!--</li>-->
-                    <li class="nav-item">
-                        <a class="nav-link active" data-toggle="tab" href="#shuxing" role="tab">标段属性</a>
-                    </li>
-                </ul>
-                <div class="tab-content">
-                    <!--进度表-->
-                    <div id="tubiao" class="tab-pane">
-                        <!--月进度图表-->
-                        <div id="chartContainer3" style="height: 300px; width: 100%;" class="my-5">
+                    <!--进度条-->
+                    <div class="mb-3">
+                        <div class="progress">
+                            <% if (tender.pre_ratio > 0) { %>
+                            <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成：￥<%- ctx.helper.formatMoney(tender.pre_gather_tp) %>"><%- tender.pre_ratio %>%</div>
+                            <% } %>
+                            <% if (tender.cur_ratio > 0) { %>
+                            <div class="progress-bar bg-info" style="width: <%- tender.cur_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥<%- ctx.helper.formatMoney(tender.gather_tp) %>"><%- tender.cur_ratio %>%</div>
+                            <% } %>
+                            <% if (tender.other_ratio > 0) { %>
+                            <div class="progress-bar bg-gray" style="width: <%- tender.other_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥<%- ctx.helper.formatMoney(tender.other_tp) %>"><%- tender.other_ratio %>%</div>
+                            <% } %>
                         </div>
-                        <!--期汇总图表-->
-                        <div id="chartContainer4" style="height: 300px; width: 100%;" class="mb-5">
+                    </div>
+                    <!--标段设置-->
+                    <div class="col-6 p-0 mb-3">
+                        <div class="card">
+                            <div class="card-body">
+                                <h5 class="card-title">标段设置</h5>
+                                <a href="#bd-set-1" data-toggle="modal" data-target="#bd-set-1" class="btn btn-sm btn-outline-primary">标段属性</a>
+                                <a href="#bd-set-2" data-toggle="modal" data-target="#bd-set-2" class="btn btn-sm btn-outline-primary">小数位数</a>
+                                <a href="#bd-set-3" data-toggle="modal" data-target="#bd-set-3" class="btn btn-sm btn-outline-primary">清单精度</a>
+                                <a href="#bd-set-4" data-toggle="modal" data-target="#bd-set-4" class="btn btn-sm btn-outline-primary">合同参数</a>
+                                <a href="#bd-set-5" data-toggle="modal" data-target="#bd-set-5" class="btn btn-sm btn-outline-primary">显示设置</a>
+                                <a href="#bd-set-6" data-toggle="modal" data-target="#bd-set-6" class="btn btn-sm btn-outline-primary">章节设置</a>
+                            </div>
                         </div>
                     </div>
-                    <!--标段属性-->
-                    <div id="shuxing" class="tab-pane active">
-                        <div class="row m-0 my-3">
-                            <div class="col-2">
-                                <div class="nav flex-column nav-pills" >
-                                    <a class="nav-link active" data-toggle="pill" href="#v-pills-1" role="tab">标段属性</a>
-                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-2" role="tab">小数位数</a>
-                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-3" role="tab">数量精度</a>
-                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-4" role="tab">合同参数</a>
-                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-5" role="tab">显示设置</a>
-                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-6" role="tab">章节设置</a>
-                                </div>
+                    <!--图表-->
+                    <div class="card mb-3 mr-1">
+                        <div class="card-body">
+                            <h5 class="card-title">期进度表</h5>
+                            <div id="chartContainer4" style="height: 300px; width: 100%;">
                             </div>
-                            <div class="col">
-                                <div class="tab-content">
-                                    <div class="tab-pane fade show active" id="v-pills-1" role="tabpanel">
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                            <div>
-                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-1"> 编辑</button>
-                                            </div>
-                                            <div style="display: none">
-                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-1"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-1"><i class="fa fa-close"></i> 取消</button>
-                                            </div>
-                                        </div>
-                                        <!--合同信息-->
-                                        <legend class="mt-3">合同信息</legend>
-                                        <!--默认显示-->
-                                        <div class="form-group">
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">建设项目名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="项目A" readonly="" id="build-name" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">合同编号</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-code" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">合同名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-name" maxlength="100">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <!--参建单位-->
-                                        <legend class="mt-3">参建单位</legend>
-                                        <!--编辑模式-->
-                                        <div class="form-group">
-                                            <label>建设单位：</label>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">单位名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="build-company" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">法人代表</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="build-corporation" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" id="build-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>承包单位1：</label>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">单位名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="contract1-company" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">法人代表</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="contract1-corporation" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" id="contract1-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>承包单位2：</label>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">单位名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="contract2-company" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">法人代表</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="contract2-corporation" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" id="contract2-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>监理单位1：</label>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">单位名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision1-company" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">法人代表</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision1-corporation" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" id="supervision1-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>监理单位2：</label>
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">单位名称</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision2-company" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">法人代表</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision2-corporation" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" id="supervision2-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <!--技术参数-->
-                                        <legend class="mt-3">技术参数</legend>
-                                        <div class="form-group">
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">公路等级</span>
-                                                        </div>
-                                                        <select class="form-control form-control-sm" disabled="" id="load-level">
-                                                            <option value="1">高速公路</option>
-                                                            <option value="2">一级公路</option>
-                                                            <option value="3">二级公路</option>
-                                                            <option value="4">三级公路</option>
-                                                            <option value="5">四级公路</option>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">长度（KM）</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="length" min="0" max="10000"
-                                                               oninput="limitDealParamLength(this)" onchange="checkNumberValid(this)">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">起始桩号</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="start-peg" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">终止桩号</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="end-peg" maxlength="100">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">车道数</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="lane-count" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="input-group input-group-sm">
-                                                        <div class="input-group-prepend">
-                                                            <span class="input-group-text">合同工期</span>
-                                                        </div>
-                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-period" maxlength="100">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" readonly="" id="start-date">
-                                                    </div>
-                                                </div>
-                                                <div class="col">
-                                                    <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 form-control-sm" value="" readonly="" id="plan-end-date">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane fade" id="v-pills-2" role="tabpanel" >
-                                        <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
-                                                || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                        <span>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-2">编辑</button>
-                                        </span>
-                                            <span style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-2"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-2"><i class="fa fa-close"></i>  取消</button>
-                                        </span>
-                                        </div>
-                                        <% } %>
-                                        <!--小数位数-->
-                                        <legend class="mt-3">小数位数</legend>
-                                        <div class="form-group">
-                                            <label>全局设置</label>
-                                            <div class="row">
-                                                <div class="col-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 form-control-sm" value="3" id="decimal-up" min="0" max="4" maxlength="1" oninput="limitDecimal(this)">
-                                                    </div>
-                                                </div>
-                                                <div class="col-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 form-control-sm" value="2" id="decimal-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>单独设置</label>
-                                            <div class="row">
-                                                <div class="col-auto">
-                                                    <div class="form-group form-check mt-1">
-                                                        <input type="checkbox" class="form-check-input" id="decimal-pay" onchange="CalculateAllDealParam()">
-                                                        <label class="form-check-label" for="exampleCheck2">合同支付</label>
-                                                    </div>
-                                                </div>
-                                                <div class="col-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 form-control-sm" value="2" readonly="" id="decimal-pay-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1"
-                                                        >
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane fade" id="v-pills-3" role="tabpanel" >
-                                        <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
-                                                || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-3" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                            <div>
-                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-3"> 编辑</button>
-                                            </div>
-                                            <div style="display: none">
-                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-3"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-3"><i class="fa fa-close"></i> 取消</button>
-                                            </div>
-                                        </div>
-                                        <% } %>
-                                        <legend class="mt-3">数量精度</legend>
-                                        <!--默认显示-->
-                                        <div class="form-group" id="precision-spread" style="height: 365px; width: 600px;">
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane fade" id="v-pills-4" role="tabpanel" >
-                                        <% if (!lastStage || (lastStage.order === 1 && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-4" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                            <div>
-                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-4"> 编辑</button>
-                                            </div>
-                                            <div style="display: none">
-                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-4"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-4"><i class="fa fa-close"></i> 取消</button>
-                                            </div>
-                                        </div>
-                                        <% } %>
-                                        <legend class="mt-3">合同参数</legend>
-                                        <!--默认显示-->
-                                        <div class="form-group" id="param-spread" style="height: 230px; width: 600px;">
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane fade" id="v-pills-5" role="tabpanel" >
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                        <span>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-5">编辑</button>
-                                        </span>
-                                            <span style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-5"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-5"><i class="fa fa-close"></i>  取消</button>
-                                        </span>
-                                        </div>
-                                        <legend class="mt-3">台帐列显示</legend>
-                                        <div class="form-group">
-                                            <div class="form-group">
-                                                <div class="row">
-                                                    <div class="col">
-                                                        <div class="form-group form-check">
-                                                            <input type="checkbox" class="form-check-input" id="ledger-dgn-qty" checked="">
-                                                            <label class="form-check-label" for="ledger-dgn-qty">项目节数量</label>
-                                                        </div>
-                                                        <div class="form-group form-check">
-                                                            <input type="checkbox" class="form-check-input" id="ledger-cl-qty" checked="">
-                                                            <label class="form-check-label" for="ledger-cl-qty">错漏增减</label>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!--章节设置-->
-                                    <div class="tab-pane fade" id="v-pills-6" role="tabpanel" >
-                                        <!--操作-->
-                                        <div class="d-flex justify-content-end mt-3">
-                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-6" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                            <span>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-6">编辑</button>
-                                        </span>
-                                            <span style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-6"><i class="fa fa-check"></i> 提交</button>
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-6"><i class="fa fa-close"></i>  取消</button>
-                                        </span>
-                                        </div>
-                                        <legend class="mt-3">章节设置</legend>
-                                        <!--默认显示-->
-                                        <div class="form-group" id="chapter-spread" style="height: 330px; width: 600px;">
-                                        </div>
-                                    </div>
-                                </div>
+                        </div>
+                    </div>
+                    <div class="card mb-3 mr-1">
+                        <div class="card-body">
+                            <h5 class="card-title">月进度表</h5>
+                            <div id="chartContainer3" style="height: 300px; width: 100%;">
                             </div>
                         </div>
                     </div>
@@ -771,7 +348,4 @@
     //3 标段月进度//
 </script>
 <script>
-    let property = JSON.parse('<%- JSON.stringify(tenderInfo) %>');
-    let ledgerChecked = <%- tender.ldeger_status === audit.ledger.status.checked %>;
-    let firstStageChecked = <%- lastStage !== undefined && lastStage !== null && (lastStage.order > 1 || (lastStage.order === 1 && lastStage.status === audit.stage.status.checked)) %>;
 </script>

config/config.qa.js

@@ -43,7 +43,8 @@ module.exports = appInfo => {
         version: '1.0.0',
     };
 
-    config.filePath = appInfo.baseDir + '/app/public/files';
+    //config.filePath = appInfo.baseDir + '/app/public/files';
+    config.filePath = '//Mai/share_calc';
 
     // session配置
     config.session = {

config/web.js

@@ -107,11 +107,12 @@ const JsFiles = {
                 files: [
                     "/public/js/echarts/echarts.min.js",
                     "/public/js/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js",
+                    "/public/js/decimal.min.js",
                 ],
                 mergeFiles: [
                     "/public/js/spreadjs_rela/spreadjs_zh.js",
-                    "/public/js/change_calculation.js",
-                    "/public/js/tender.js",
+                    "/public/js/zh_calc.js",
+                    //"/public/js/tender.js",
                 ],
                 mergeFile: 'tender',
             }