Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/category.js

@@ -59,11 +59,11 @@ function getValueHtml(value, index = null) {
     let i = index ? index : 1;
     for (const v of value) {
         html.push('<tr name="value" vid="' + v.id + '">');
-        html.push('<td width="35" class="text-center">'+ i +'</td>');
+        html.push('<td width="10%" class="text-center">'+ i +'</td>');
         html.push('<td><input class="form-control form-control-sm" name="value" placeholder="请输入值" value="' + v.value + '" vid ="' + v.id +  '"></td>');
-        html.push('<td><a href="javascript:void(0);" class="up-btn mr-2" title="上移"><i class="fa fa-caret-up"></i></a><a href="javascript:void(0);" class="down-btn" title="下移"><i class="fa fa-caret-down "></i></a></td>');
-        html.push('<td>', v.relaTenders.length + v.newTenders.length ,'</td>');
-        html.push('<td><a href="javascript: void(0);" class="text-danger" name="del-value" vid="' + v.id + '">删除</a></td>');
+        html.push('<td width="10%">', v.relaTenders.length + v.newTenders.length ,'</td>');
+        html.push('<td width="40px"><a href="javascript:void(0);" class="up-btn mr-2" title="上移"><i class="fa fa-caret-up"></i></a><a href="javascript:void(0);" class="down-btn" title="下移"><i class="fa fa-caret-down "></i></a></td>');
+        html.push('<td width="10%"><a href="javascript: void(0);" class="text-danger" name="del-value" vid="' + v.id + '">删除</a></td>');
         html.push('</tr>');
         i++;
     }

app/view/setting/category_modal.ejs

@@ -50,7 +50,7 @@
 </div>
 <!--弹出添加值-->
 <div class="modal fade" id="add" data-backdrop="static">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">添加值</h5>
@@ -58,7 +58,7 @@
             <div class="modal-body" style="max-height: 500px;overflow: auto">
                 <table class="table table-bordered">
                     <thead>
-                    <tr><th width="35" class="text-center">序号</th><th>值</th><th width="40">排序</th><th>包含标段</th><th>删除</th></tr>
+                    <tr><th width="10%" class="text-center">序号</th><th>值</th><th width="10%">包含标段</th><th width="40px">排序</th><th width="10%">删除</th></tr>
                     </thead>
                     <tbody id="value-list">
                     </tbody>