[user3] 4 năm trước cách đây
mục cha
commit
ef9786fa80

+ 15 - 14
src/main/webapp/webpage/modules/sg/financial/settlement/donorMaterialList.js

@@ -98,55 +98,56 @@
                 $("#search-collapse").slideToggle();
             },
             columns: [{
-                     checkbox: true
-                 }
+                checkbox: true
+            }
                 ,
                 {
                     field: 'projectId',
                     title: '项目编码'
                 }
-                ,{
+                , {
                     field: 'projectName',
+                    width: '20%',
                     title: '项目名称'
                 }
-                ,{
+                , {
                     field: 'materialType',
                     title: '物料类别'
                 }
-                ,{
+                , {
                     field: 'materialCode',
                     title: '物料编码'
                 }
-                ,{
+                , {
                     field: 'materialName',
                     title: '材料名称'
                 }
-                ,{
+                , {
                     field: 'materialDescribe',
                     title: '物料描述'
                 }
-                ,{
+                , {
                     field: 'unit',
                     title: '单位'
                 }
-                ,{
+                , {
                     field: 'examinedNum',
                     title: '审定数量',
                 }
-                ,{
+                , {
                     field: 'erpNum',
                     title: 'erp数量'
                 }
-                ,{
+                , {
                     field: 'erpDifferent',
                     title: '差额'
-                },{
+                }, {
                     field: 'remarks',
                     title: '备注',
                     events: operateEvents,
-                    formatter: function (value,row,index) {
+                    formatter: function (value, row, index) {
                         let option
-                        option = '<input id="operate'+index+'" type="input" value="' + (row.remarks==undefined?"":row.remarks) +'" class="form-control operate">'
+                        option = '<input id="operate' + index + '" type="input" value="' + (row.remarks == undefined ? "" : row.remarks) + '" class="form-control operate">'
                         return option
                     }
                 }

+ 16 - 7
src/main/webapp/webpage/modules/sg/financial/settlement/financeList.js

@@ -87,6 +87,7 @@
                     title: '项目编号',
                     valign:"middle",
                     align:"center",
+                    width: '10%',
                     rowspan: 2
                 }
                 ,{
@@ -94,6 +95,7 @@
                     title: '项目名称',
                     valign:"middle",
                     align:"center",
+                    width: '20%',
                     rowspan: 2
                 }
                 ,{
@@ -101,6 +103,7 @@
                     title: '项目类型',
                     valign:"middle",
                     align:"center",
+                    width:'10%',
                     rowspan: 2
                 }
                 ,{
@@ -108,22 +111,22 @@
                     title: '概预算信息',
                     valign:"middle",
                     align:"center",
+                    width:'10%',
                     rowspan: 2
                 }
                 ,{
                     field: 'donorMaterialCheck',
-                    title: '甲供材领退料检查',
+                    title: '甲供材领退料检查'
+                    ,
                     valign:"middle",
                     align:"center",
+                    width:'10%',
                     rowspan: 2
-                    , formatter: function (value, row, index) {
-                    value = jp.unescapeHTML(value);
-                    return "<a href='javascript:view(\"" + row.projectId + "\")'>" + value + "</a>";
-                    }
                 },{
                     title: '费用检查',
                     valign:"middle",
                     align:"center",
+                    width:'40%',
                     colspan: 3,
                     rowspan: 1
                 }
@@ -132,18 +135,24 @@
                     field: 'constructionCostCheck',
                     valign:"middle",
                     align:"center",
-                    title: '施工费检查'
+                    width:'10%',
+                    title: '施工费检查',
+                    colspan: 1
                 }
                 ,{
                     field: 'designCostCheck',
                     valign:"middle",
                     align:"center",
+                    width:'10%',
                     title: '设计费检查',
+                    colspan: 1
                 },{
                     field: 'supervisorCostCheck',
                     valign:"middle",
                     align:"center",
+                    width:'10%',
                     title: '监理费检查',
+                    colspan: 1
                 }
             ]]
     });
@@ -219,7 +228,7 @@ function getIdSelections() {
 
 function getTdValue() {
     var tableId = document.getElementById("dataTable");
-    if (tableId.rows.length>2){
+    if (tableId.rows.length>3){
         for(var i = 2;i < tableId.rows.length;i++) {
             if(tableId.rows[i].cells[4].innerHTML!="-" && tableId.rows[i].cells[4].innerHTML=="未通过"){
                 tableId.rows[i].cells[4].setAttribute("style","color: red;text-align:center;vertical-align:middle;");