Начало Каталог Помощ
Вход
maixinrong
/
Calculation
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

MaiXinRong преди 5 години
родител
693447ac4b 1b9a41b57f
ревизия
f139704990
променени са 3 файла, в които са добавени 106 реда и са изтрити 3 реда
Разделен изглед Покажи статистика за разликите
  1. 5 2
      app/public/js/material.js
  2. 0 1
      app/view/material/info.ejs
  3. 101 0
      app/view/wap/dashboard.ejs

+ 5 - 2
app/public/js/material.js
Целия файл 

@@ -334,6 +334,8 @@ $(document).ready(() => {
 
                 select.m_spread = materialCol.getValue.m_spread(select);
 
                 select.m_tp = materialCol.getValue.m_tp(select);
 
 
+                // console.log(select);
 
+
 
                 // 更新至服务器
 
                 postData(window.location.pathname + '/save', { type:'update', updateData: select }, function (result) {
 
                     m_tp = result.m_tp;
 
@@ -439,6 +441,7 @@ $(document).ready(() => {
 
                         }
 
                     }
 
                     materialData[colSetting.field] = validText;
 
+                    sortData[curRow][colSetting.field] = validText;
 
                 }
 
                 if (materialData.code === '' || materialData.code === null) {
 
                     toastMessageUniq(getPasteHint(hint.codeEmpty, hintRow));
 
@@ -458,7 +461,7 @@ $(document).ready(() => {
 
                 SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
 
                 return;
 
             }
 
-            console.log(data);
 
+            // console.log(data);
 
             // 更新至服务器
 
             postData(window.location.pathname + '/save', { type:'paste', updateData: data }, function (result) {
 
                 materialBillsData = result.info;
 
@@ -534,7 +537,7 @@ $(document).ready(() => {
 
             const rate = parseInt($(this).val());
 
             postData(window.location.pathname + '/save', { type:'rate', rate: rate }, function (result) {
 
                 const bqhs = ZhCalc.round(ZhCalc.mul(m_tp, 1+rate/100), 2);
 
-                const jzbqhs = ZhCalc.round(ZhCalc.mul(ZhCalc.add(pre_tp, m_tp), 1+rate/100), 2);
 
+                const jzbqhs = ZhCalc.round(ZhCalc.add(pre_tp_hs, bqhs), 2);
 
                 $('#rate_set').find('td').eq(1).text(bqhs !== 0 ? bqhs : '');
 
                 $('#rate_set').find('td').eq(2).text(jzbqhs !== 0 ? jzbqhs : '');
 
             });

+ 0 - 1
app/view/material/info.ejs
Целия файл 

@@ -79,6 +79,5 @@
 
     let m_tp = <%= material.m_tp !== null ? material.m_tp : 0 %>;
 
     const pre_tp = <%= material.pre_tp !== null ? material.pre_tp : 0 %>;
 
     const pre_tp_hs = <%= pre_tp_hs !== null ? pre_tp_hs : 0 %>;
 
-    console.log(pre_tp_hs);
 
     const calcBase = JSON.parse('<%- JSON.stringify(calcBase) %>');
 
 </script>

+ 101 - 0
app/view/wap/dashboard.ejs
Целия файл 

@@ -0,0 +1,101 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
 
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
 
+    <title>待审批-计量支付</title>
 
+    <link rel="stylesheet" href="/public/css/bootstrap/bootstrap.min.css">
 
+    <link rel="stylesheet" href="/public/css/wap/main.css">
 
+    <link rel="stylesheet" href="/public/css/toast.css">
 
+    <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
 
+    <link rel="shortcut icon" href="/public/images/favicon.ico">
 
+<style>
 
+</style>
 
+</head>
 
+<body>
 
+    <div class="container">
 
+        <!--顶部-->
 
+        <nav class="fixed-top bg-dark">
 
+            <div class="my-2 d-flex justify-content-between">
 
+                <span class="text-white ml-3">待审批</span>
 
+                <div class="mr-3">
 
+                    <div class="dropdown">
 
+                      <button class="btn btn-sm btn-light dropdown-toggle" type="button" data-toggle="dropdown">
 
+                        张三
 
+                      </button>
 
+                      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 
+                        <a class="dropdown-item" href="#">退出登录</a>
 
+                      </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </nav>
 
+        <!--待审批期列表-->
 
+        <div class="py-6">
 
+            <h3 class="text-center text-muted">暂无待审批期计量</h3>
 
+            <div class="card mb-3">
 
+                <div class="card-header">
 
+                    建设项目名称
 
+                </div>
 
+                <div class="bg-light p-2 px-3"><b>A1标段</b></div>
 
+                <div class="card-body">
 
+                    <div class="d-flex justify-content-between"><span>第1期</span><span>2017-10</span></div>
 
+                    <div class="my-2">
 
+                        <table class="table table-sm table-bordered">
 
+                            <tr><th>本期合同计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期数量变更计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>截止上期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>截止本期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期应付</th><td class="text-right">34234234.00</td></tr>
 
+                        </table>
 
+                    </div>
 
+                    <div class="">
 
+                        <a href="" class="btn btn-block btn-success">审批</a>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="card mb-3">
 
+                <div class="card-header">
 
+                    建设项目名称
 
+                </div>
 
+                <div class="bg-light p-2 px-3"><b>A2标段</b></div>
 
+                <div class="card-body">
 
+                    <div class="d-flex justify-content-between"><span>第1期</span><span>2017-10</span></div>
 
+                    <div class="my-2">
 
+                        <table class="table table-sm table-bordered">
 
+                            <tr><th>本期合同计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期数量变更计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>截止上期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>截止本期完成计量</th><td class="text-right">34234234.00</td></tr>
 
+                            <tr><th>本期应付</th><td class="text-right">34234234.00</td></tr>
 
+                        </table>
 
+                    </div>
 
+                    <div class="">
 
+                        <a href="" class="btn btn-block btn-success">审批</a>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <!--底栏菜单-->
 
+        <nav class="fixed-bottom navbar-dark bg-light border-top">
 
+          <ul class="nav nav-fill my-2">
 
+              <li class="nav-item">
 
+                <a class="nav-link active" href="todo.html"><i class="fa fa-check-square-o"></i> 待审批</a>
 
+              </li>
 
+              <li class="nav-item">
 
+                <a class="nav-link text-muted" href="biaoduan.html"><i class="fa fa-list-ul"></i> 项目</a>
 
+              </li>
 
+            </ul>
 
+        </nav>
 
+    </div>
 
+
 
+    <!-- JS. -->
 
+    <script src="/public/js/jquery/jquery-3.2.1.min.js"></script>
 
+    <script src="/public/js/popper/popper.min.js"></script>
 
+    <script src="/public/js/bootstrap/bootstrap.min.js"></script>
 
+</body>
 
+
 
+</html>