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

app/const/audit.js

@@ -266,10 +266,61 @@ filter.statusString[filter.status.checking] = '进行中';
 filter.statusString[filter.status.checked] = '已完成';
 // filter.statusString[filter.status.checkNo] = '终止';
 
+// 材料调差审批流程
+const material = (function () {
+    const status = {
+        uncheck: 1, // 待上报
+        checking: 2, // 待审批|审批中
+        checked: 3, // 审批通过
+        checkNo: 4, // 审批退回
+    };
+    // 流程状态提示
+    const statusString = [];
+    statusString[status.uncheck] = '待上报';
+    statusString[status.checking] = '审批中';
+    statusString[status.checked] = '审批通过';
+    statusString[status.checkNo] = '审批退回';
+    // 流程状态样式
+    const statusClass = [];
+    statusClass[status.uncheck] = '';
+    statusClass[status.checking] = '';
+    statusClass[status.checked] = 'text-success';
+    statusClass[status.checkNo] = 'text-warning';
+
+    // 按钮
+    const statusButton = [];
+    statusButton[status.uncheck] = '待上报';
+    statusButton[status.checking] = '审批';
+    statusButton[status.checked] = '';
+    statusButton[status.checkNo] = '重新上报';
+
+    // 按钮样式
+    const statusButtonClass = [];
+    statusButtonClass[status.uncheck] = 'btn-primary';
+    statusButtonClass[status.checking] = 'btn-success';
+    statusButtonClass[status.checked] = '';
+    statusButtonClass[status.checkNo] = 'btn-warning';
+
+    // 描述文本
+    const auditProgress = [];
+    auditProgress[status.uncheck] = '待上报';
+    auditProgress[status.checking] = '审批中';
+    auditProgress[status.checked] = '审批通过';
+    auditProgress[status.checkNo] = '审批退回';
+    // 样式
+    const auditProgressClass = [];
+    auditProgressClass[status.uncheck] = '';
+    auditProgressClass[status.checking] = 'text-warning';
+    auditProgressClass[status.checked] = 'text-success';
+    auditProgressClass[status.checkNo] = 'text-warning';
+    return { status, statusString, statusClass, statusButton, statusButtonClass, auditProgress, auditProgressClass };
+})();
+
 module.exports = {
     ledger,
     stage,
     revise,
+    material,
     flow: {
         status,
         statusString,

app/public/js/profile.js

@@ -97,7 +97,7 @@ $(document).ready(function() {
                 dataTye: 'json',
                 success: function(response) {
                     if (response.err === 0) {
-                        window.location.href = response.data.url;
+                        window.location.href = response.url;
                     } else {
                         toast(response.msg, 'error');
                     }

app/view/tender/manage_modal.ejs

@@ -11,6 +11,17 @@
                     <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
                 </div>
             </div>
+            <div class="form-group">
+                <label ><b class="text-danger">*</b>计价规范</label>
+                <div>
+                    <% for (const v of valuations) { %>
+                        <div class="form-check form-check-inline mt-2">
+                            <input class="form-check-input" name="valuation" type="radio" id="valuation<%- v.id %>" value="<%- v.id %>" checked="">
+                            <label class="form-check-label" for="valuation<%- v.id %>"><%- v.name %></label>
+                        </div>
+                    <% } %>
+                </div>
+            </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 <button type="button" class="btn btn-primary" id="add-bd-ok">确定添加</button>