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

app/const/account_group.js

@@ -14,6 +14,7 @@ const accountGroup = {
     SJDW: 4,
     DJDW: 5,
     GZSJ: 6,
+    QT: 7,
 };
 
 const group = [];
@@ -23,6 +24,7 @@ group[accountGroup.JLDW] = '监理单位';
 group[accountGroup.SGDW] = '施工单位';
 group[accountGroup.SJDW] = '设计单位';
 group[accountGroup.GZSJ] = '跟踪审计';
+group[accountGroup.QT] = '其他';
 
 module.exports = {
     type: accountGroup,

app/view/change/info_modal.ejs

@@ -580,7 +580,7 @@
             </div>
             <div class="modal-body">
                 <p>大小限制：30MB，支持office等文档格式、图片格式、压缩包格式</p>
-                <p><input class="btn btn-primary btn-sm" value="选择文件" type="file" id="upload-file" multiple /></p>
+                <p><input value="选择文件" type="file" id="upload-file" multiple /></p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>

app/view/setting/info.ejs

@@ -25,7 +25,7 @@
                             <input class="form-control form-control-sm" value="<%= projectData.user_account %>" type="text" readonly>
                         </div>
                         <div class="form-group">
-                            <label>销售负责人</label>
+                            <label>负责人</label>
                             <div class="card w-50">
                                 <div class="card-body">
                                     <h4 class="card-title"><%= salesmanData.username %></h4>

app/view/stage/pay_modal.ejs

@@ -78,7 +78,7 @@
                 <% if (uploadPermission) { %>
                 <div class="form-group">
                     <label for="formGroupExampleInput">大小限制：10MB，支持<span data-toggle="tooltip" data-placement="bottom" title="doc,docx,xls,xlsx,ppt,pptx,pdf">office等文档格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="jpg,png,bmp">图片格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="rar,zip">压缩包格式</span></label>
-                    <input type="file" class="form-control form-control-sm" id="upload-file" multiple>
+                    <input type="file" class="" id="upload-file" multiple>
                 </div>
                 <% } %>
                 <div class="modal-height-500" style="overflow:auto;">