金额宽度

apps/foundation/models.py

@@ -11,7 +11,7 @@ from libs.utils import strftime, strfdate
 from managers import OptionManager
 
 class Option(models.Model):
-    PAYMENT_MODE = 0
+    # PAYMENT_MODE = 0
     MATERIAL_MODE = 1
     CONSUMABLE_MODE = 2
     GOODS_MODE = 3
@@ -20,7 +20,7 @@ class Option(models.Model):
     SALE_MESSAGE = 6
 
     TYPE_CHOICES = (
-        (PAYMENT_MODE, u'付款方式'),
+        # (PAYMENT_MODE, u'付款方式'),
         (MATERIAL_MODE, u'原料类别'),
         (CONSUMABLE_MODE, u'耗材类别'),
         (GOODS_MODE, u'成品类别'),

uis/views/foundation/option.html

@@ -47,7 +47,6 @@
                 <div class="layui-input-block">
                     <select name="type">
                         <option value=""></option>
-                        <option value="0">付款方式</option>
                         <option value="1">原料类别</option>
                         <option value="2">耗材类别</option>
                         <option value="3">成品类别</option>

uis/views/goods/goods_godownentry.html

@@ -136,10 +136,10 @@
         var cols = [];
         cols.push({type: 'checkbox', width: 50});
         cols.push({field: 'no', title: '入库单号', width: 140});
-        cols.push({field: 'total_count', title: '数量合计', align:'right', width: 100});
+        cols.push({field: 'total_count', title: '数量合计', align:'right', width: 130});
         if (is_has){
-          cols.push({field: 'total_amount', title: '金额合计', align:'right', width: 100});
-          cols.push({field: 'total_invoice_amount', title: '发票金额合计', align:'right', width: 100});
+          cols.push({field: 'total_amount', title: '金额合计', align:'right', width: 130});
+          cols.push({field: 'total_invoice_amount', title: '发票金额合计', align:'right', width: 130});
         }
         cols.push({field: 'warehouse_text', align:'right', title: '仓别', width: 100});
         cols.push({field: 'create_user_text', title: '创建人', width: 150});
@@ -389,4 +389,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/goods/goods_godownentry_edit.html

@@ -155,7 +155,7 @@ layui.config({
                     return '<input id="price' + d.id + '" value="' + d.price + '" type="text" lay-event="onNumberChange" lay-verify="required|numberGeZ" autocomplete="off" class="layui-input">';
 
                 }},
-            {field: 'amount', title: '发票金额', width: 120, templet: function (d) {
+            {field: 'amount', title: '发票金额', width: 130, templet: function (d) {
 
                     return '<input id="amount' + d.id + '" value="' + d.amount + '" type="text" lay-event="onAmountChange" lay-verify="required|numberGeZ" autocomplete="off" class="layui-input">';
 
@@ -363,4 +363,4 @@ layui.config({
 })
   </script>
 </body>
-</html>
+</html>

uis/views/goods/goods_godownentry_query.html

@@ -129,7 +129,7 @@
         }
         cols.push({field: 'count', align:'right', title: '数量', width: 110});
         if (is_has){
-           cols.push({field: 'amount', align:'right', title: '合计金额', width: 110});
+           cols.push({field: 'amount', align:'right', title: '合计金额', width: 130});
         }
         cols.push({field: 'deliver_count', align:'right', title: '出库数量', width: 110});
         cols.push({field: 'surplus_count', align:'right', title: '剩余数量', width: 110});
@@ -238,4 +238,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/goods/goods_inventory.html

@@ -137,7 +137,7 @@
         cols.push({field:'type_text', title:'类别', width:80});
         cols.push({field:'total_count', title:'合计数量', align:'right', width:100});
         if (is_has){
-            cols.push({field:'total_amount', title:'合计金额', align:'right', width:100});
+            cols.push({field:'total_amount', title:'合计金额', align:'right', width:130});
         }
         cols.push({field:'warehouse_text', title:'仓别', width:120});
         cols.push({field:'create_time', title:'创建时间', width:150});

uis/views/goods/goods_stock.html

@@ -153,7 +153,7 @@
     cols.push({field:'warehouse_place', title:'存放库位', width: 120});
     if (is_has){
         cols.push({field:'avg_cost_price', align:'right', title:'成本价', width:120});
-        cols.push({field:'warehouse_amount', align:'right', title:'库存金额', width:100});
+        cols.push({field:'warehouse_amount', align:'right', title:'库存金额', width:130});
     }
     cols.push({field:'product_code', title:'助记码', width:100});
     cols.push({field:'last_entry_time', title:'最后入库时间', width:150});

uis/views/goods/goods_stock_ledger.html

@@ -119,28 +119,28 @@
         var title2 = [
             {field: 'prev_count', align:'right', title: '数量', width: 100},
             {field: 'prev_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'prev_amount', align:'right', title: '金额', width: 100},
+            {field: 'prev_amount', align:'right', title: '金额', width: 130},
             {field: 'in_count', align:'right', title: '总数量', width: 100},
             {field: 'in_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'in_amount', align:'right', title: '总金额', width: 100},
+            {field: 'in_amount', align:'right', title: '总金额', width: 130},
             {field: 'rk_count', align:'right', title: '入库数量', width: 100},
-            {field: 'rk_amount', align:'right', title: '入库金额', width: 100},
+            {field: 'rk_amount', align:'right', title: '入库金额', width: 130},
             {field: 'py_count', align:'right', title: '盘盈数量', width: 100},
-            {field: 'py_amount', align:'right', title: '盘盈金额', width: 100},
+            {field: 'py_amount', align:'right', title: '盘盈金额', width: 130},
             {field: 'th_count', align:'right', title: '退货数量', width: 100},
-            {field: 'th_amount', align:'right', title: '退货金额', width: 100},
+            {field: 'th_amount', align:'right', title: '退货金额', width: 130},
             {field: 'out_count', align:'right', title: '总数量', width: 100},
             {field: 'out_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'out_amount', align:'right', title: '总金额', width: 100},
+            {field: 'out_amount', align:'right', title: '总金额', width: 130},
             {field: 'ck_count', align:'right', title: '出库数量', width: 100},
-            {field: 'ck_amount', align:'right', title: '出库金额', width: 100},
+            {field: 'ck_amount', align:'right', title: '出库金额', width: 130},
             {field: 'pk_count', align:'right', title: '盘亏数量', width: 100},
-            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 100},
+            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 130},
             {field: 'tl_count', align:'right', title: '退料数量', width: 100},
-            {field: 'tl_amount', align:'right', title: '退料金额', width: 100},
+            {field: 'tl_amount', align:'right', title: '退料金额', width: 130},
             {field: 'remain_count', align:'right', title: '数量', width: 100},
             {field: 'remain_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'remain_amount', align:'right', title: '金额', width: 100}
+            {field: 'remain_amount', align:'right', title: '金额', width: 130}
         ];
         _data_list=[title1,title2];
 
@@ -250,4 +250,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/goods/goods_stock_log.html

@@ -86,7 +86,7 @@
         cols.push({field:'warehouse_text', title:'仓别', width:120, align:'left'});
         cols.push({field:'cur_count', title:'剩余数量', width:100, align:'right'});
         if(utils.isHasPermissions('goods.view_goods_cost')){
-            cols.push({field:'cur_amount', title:'剩余金额', width:120, align:'right'});
+            cols.push({field:'cur_amount', title:'剩余金额', width:130, align:'right'});
         }
         table.render({
             elem: '#datagrid'

uis/views/material/consumable_stock_ledger.html

@@ -119,28 +119,28 @@
         var title2 = [
             {field: 'prev_count', align:'right', title: '数量', width: 100},
             {field: 'prev_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'prev_amount', align:'right', title: '金额', width: 100},
+            {field: 'prev_amount', align:'right', title: '金额', width: 130},
             {field: 'in_count', align:'right', title: '总数量', width: 100},
             {field: 'in_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'in_amount', align:'right', title: '总金额', width: 100},
+            {field: 'in_amount', align:'right', title: '总金额', width: 130},
             {field: 'rk_count', align:'right', title: '入库数量', width: 100},
-            {field: 'rk_amount', align:'right', title: '入库金额', width: 100},
+            {field: 'rk_amount', align:'right', title: '入库金额', width: 130},
             {field: 'py_count', align:'right', title: '盘盈数量', width: 100},
-            {field: 'py_amount', align:'right', title: '盘盈金额', width: 100},
+            {field: 'py_amount', align:'right', title: '盘盈金额', width: 130},
             {field: 'th_count', align:'right', title: '退货数量', width: 100},
-            {field: 'th_amount', align:'right', title: '退货金额', width: 100},
+            {field: 'th_amount', align:'right', title: '退货金额', width: 130},
             {field: 'out_count', align:'right', title: '总数量', width: 100},
             {field: 'out_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'out_amount', align:'right', title: '总金额', width: 100},
+            {field: 'out_amount', align:'right', title: '总金额', width: 130},
             {field: 'ck_count', align:'right', title: '出库数量', width: 100},
-            {field: 'ck_amount', align:'right', title: '出库金额', width: 100},
+            {field: 'ck_amount', align:'right', title: '出库金额', width: 130},
             {field: 'pk_count', align:'right', title: '盘亏数量', width: 100},
-            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 100},
+            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 130},
             {field: 'tl_count', align:'right', title: '退料数量', width: 100},
-            {field: 'tl_amount', align:'right', title: '退料金额', width: 100},
+            {field: 'tl_amount', align:'right', title: '退料金额', width: 130},
             {field: 'remain_count', align:'right', title: '数量', width: 100},
             {field: 'remain_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'remain_amount', align:'right', title: '金额', width: 100}
+            {field: 'remain_amount', align:'right', title: '金额', width: 130}
         ];
         _data_list=[title1,title2];
 
@@ -250,4 +250,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/material/material_inventory.html

@@ -137,7 +137,7 @@
     cols.push({field:'type_text', title:'类别', width:80});
     cols.push({field:'total_count', align:'right', title:'合计数量', width:100});
     if (is_has){
-      cols.push({field:'total_amount', align:'right', title:'合计金额', width:100});
+      cols.push({field:'total_amount', align:'right', title:'合计金额', width:130});
     }
     cols.push({field:'warehouse_text', title:'仓别', width:120});
     cols.push({field:'create_time', title:'创建时间', width:150});

uis/views/material/material_stock.html

@@ -159,7 +159,7 @@
     cols.push({field:'warehouse_place', title:'存放库位', width: 120});
     if (is_has){
         cols.push({field:'avg_cost_price', align:'right', title:'成本价', width:120});
-        cols.push({field:'warehouse_amount', align:'right', title:'库存金额', width:100});
+        cols.push({field:'warehouse_amount', align:'right', title:'库存金额', width:130});
     }
     cols.push({field:'product_code', title:'助记码', width:100});
     cols.push({field:'last_entry_time', title:'最后入库时间', width:150});

uis/views/material/material_stock_ledger.html

@@ -119,28 +119,28 @@
         var title2 = [
             {field: 'prev_count', align:'right', title: '数量', width: 100},
             {field: 'prev_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'prev_amount', align:'right', title: '金额', width: 100},
+            {field: 'prev_amount', align:'right', title: '金额', width: 130},
             {field: 'in_count', align:'right', title: '总数量', width: 100},
             {field: 'in_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'in_amount', align:'right', title: '总金额', width: 100},
+            {field: 'in_amount', align:'right', title: '总金额', width: 130},
             {field: 'rk_count', align:'right', title: '入库数量', width: 100},
-            {field: 'rk_amount', align:'right', title: '入库金额', width: 100},
+            {field: 'rk_amount', align:'right', title: '入库金额', width: 130},
             {field: 'py_count', align:'right', title: '盘盈数量', width: 100},
-            {field: 'py_amount', align:'right', title: '盘盈金额', width: 100},
+            {field: 'py_amount', align:'right', title: '盘盈金额', width: 130},
             {field: 'th_count', align:'right', title: '退货数量', width: 100},
-            {field: 'th_amount', align:'right', title: '退货金额', width: 100},
+            {field: 'th_amount', align:'right', title: '退货金额', width: 130},
             {field: 'out_count', align:'right', title: '总数量', width: 100},
             {field: 'out_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'out_amount', align:'right', title: '总金额', width: 100},
+            {field: 'out_amount', align:'right', title: '总金额', width: 130},
             {field: 'ck_count', align:'right', title: '出库数量', width: 100},
-            {field: 'ck_amount', align:'right', title: '出库金额', width: 100},
+            {field: 'ck_amount', align:'right', title: '出库金额', width: 130},
             {field: 'pk_count', align:'right', title: '盘亏数量', width: 100},
-            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 100},
+            {field: 'pk_amount', align:'right', title: '盘亏金额', width: 130},
             {field: 'tl_count', align:'right', title: '退料数量', width: 100},
-            {field: 'tl_amount', align:'right', title: '退料金额', width: 100},
+            {field: 'tl_amount', align:'right', title: '退料金额', width: 130},
             {field: 'remain_count', align:'right', title: '数量', width: 100},
             {field: 'remain_avg', align:'right', title: '平均单价', width: 100},
-            {field: 'remain_amount', align:'right', title: '金额', width: 100}
+            {field: 'remain_amount', align:'right', title: '金额', width: 130}
         ];
 
         _data_list=[title1,title2];
@@ -250,4 +250,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/order/sale_order.html

@@ -214,14 +214,14 @@
                 , {field: 'customer_tel', title: '客户电话', width: 150}
                 , {field: 'products', title: '产品', width: 120}
                 , {field: 'count', title: '合计数量', width: 100, align: 'right'}
-                , {field: 'amount', title: '合计金额', width: 100, align: 'right'}
+                , {field: 'amount', title: '合计金额', width: 130, align: 'right'}
                 , {field: 'receive_count', title: '收货数量', width: 100, align: 'right'}
-                , {field: 'receive_amount', title: '收货金额', width: 100, align: 'right'}
-                , {field: 'loss_amount', title: '扣减金额', width: 100, align: 'right'}
-                , {field: 'total_amount', title: '应付金额', width: 100, align: 'right'}
-                , {field: 'pay_amount', title: '结算金额', width: 100, align: 'right'}
-                , {field: 'put_amount', title: '装车费用', width: 100, align: 'right'}
-                , {field: 'fare_amount', title: '运输费用', width: 100, align: 'right'}
+                , {field: 'receive_amount', title: '收货金额', width: 130, align: 'right'}
+                , {field: 'loss_amount', title: '扣减金额', width: 130, align: 'right'}
+                , {field: 'total_amount', title: '应付金额', width: 130, align: 'right'}
+                , {field: 'pay_amount', title: '结算金额', width: 130, align: 'right'}
+                , {field: 'put_amount', title: '装车费用', width: 130, align: 'right'}
+                , {field: 'fare_amount', title: '运输费用', width: 130, align: 'right'}
                 , {field: 'clear_text', title: '结清', width: 60}
                 , {field: 'loss_notes', title: '扣减备注', width: 100, align: 'right'}
                 , {field: 'create_time', title: '创建时间', width: 150}

uis/views/purchase/consumable_godownentry_query.html

@@ -141,7 +141,7 @@
         cols.push({field: 'count', align:'right', title: '数量', width: 110});
         cols.push({field: 'return_count', align:'right', title: '退货数量', width: 110});
         if (is_has){
-            cols.push({field: 'amount', align:'right', title: '合计金额', width: 110});
+            cols.push({field: 'amount', align:'right', title: '合计金额', width: 130});
         }
         cols.push({field: 'deliver_count', align:'right', title: '出库数量', width: 110});
         cols.push({field: 'surplus_count', align:'right', title: '剩余数量', width: 110});
@@ -278,4 +278,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/purchase/consumable_godownentry_return.html

@@ -132,7 +132,7 @@
         cols.push({field: 'supplier_text', title: '供应商', width: 145});
         cols.push({field: 'total_count', align:'right', title: '合计数量', width: 100});
         if (is_has){
-           cols.push({field: 'total_amount', align:'right', title: '合计金额', width: 100});
+           cols.push({field: 'total_amount', align:'right', title: '合计金额', width: 130});
         }
         cols.push({field: 'create_user_text', title: '创建人', width: 150});
         cols.push({field: 'create_time', title: '创建时间', width: 150});
@@ -332,4 +332,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/purchase/consumable_godownentry_return_query.html

@@ -122,7 +122,7 @@
         }
         cols.push({field: 'count', title: '数量', width: 110, align:'right'});
         if(is_has){
-            cols.push({field: 'amount', title: '合计金额', width: 110, align:'right'});
+            cols.push({field: 'amount', title: '合计金额', width: 130, align:'right'});
         }
         cols.push({field: 'main_create_user', title: '创建人', width: 120});
         cols.push({field: 'main_create_time', title: '创建时间', width: 160});
@@ -225,4 +225,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/purchase/material_godownentry_return.html

@@ -133,7 +133,7 @@
         cols.push({field: 'supplier_text', title: '供应商', width: 145});
         cols.push({field: 'total_count', align:'right', title: '合计数量', width: 100});
         if(is_has){
-            cols.push({field: 'total_amount', align:'right', title: '合计金额', width: 100});
+            cols.push({field: 'total_amount', align:'right', title: '合计金额', width: 130});
         }
         cols.push({field: 'create_user_text', title: '创建人', width: 150});
         cols.push({field: 'create_time', title: '创建时间', width: 150});
@@ -333,4 +333,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/purchase/purchase_invoice.html

@@ -115,9 +115,9 @@
                 ,{field:'name', title:'产品名称', width:120}
                 ,{field:'model', title:'产品代码', width:120}
                 ,{field:'supplier_name', title:'供应商', width:100}
-                ,{field:'amount', align:'right', title:'金额', width:100}
+                ,{field:'amount', align:'right', title:'金额', width:130}
                 ,{field:'invoice_no', title:'发票号', width:80}
-                ,{field:'invoice_amount', align:'right', title:'发票金额', width:100}
+                ,{field:'invoice_amount', align:'right', title:'发票金额', width:130}
                 ,{field:'invoice_date', title:'开票日期', width:150}
                 ,{field:'create_time', title:'创建时间', width:150}
                 ,{field:'create_user_text', title:'创建人', width:100}
@@ -295,4 +295,4 @@
         })
     </script>
 </body>
-</html>
+</html>

uis/views/statistics/department_ledger.html

@@ -109,7 +109,7 @@
             for (var i in data) {
                 title1.push({align: 'center', title: data[i].name, colspan: 2});
                 title2.push({field: data[i].id+'_count', align:'right', title: '数量', width: 80});
-                title2.push({field: data[i].id+'_amount', align:'right', title: '金额', width: 100});
+                title2.push({field: data[i].id+'_amount', align:'right', title: '金额', width: 130});
             }
             _data_list=[title1,title2];
 
@@ -201,4 +201,4 @@
     })
 </script>
 </body>
-</html>
+</html>

uis/views/statistics/finance_index.html

@@ -125,7 +125,7 @@
                 , {field: 'referer_no', title: '引用单号', width: 150}
                 , {field: 'type_text', title: '收支类型', width: 120}
                 , {field: 'account_text', title: '收支账户', width: 120}
-                , {field: 'amount', align: 'right', title: '收支金额', width: 100}
+                , {field: 'amount', align: 'right', title: '收支金额', width: 130}
                 , {field: 'purpose_text', align: 'right', title: '收支用途', width: 100}
 
                 , {field: 'create_time', title: '创建时间', width: 150}