Browse Source

档案管理,工序报表,url显示调整

MaiXinRong 3 years ago
parent
commit
a6b5b185e9
2 changed files with 7 additions and 6 deletions
  1. 2 2
      app/public/js/shares/sjs_setting.js
  2. 5 4
      app/view/stage/bwtz.ejs

+ 2 - 2
app/public/js/shares/sjs_setting.js

@@ -72,9 +72,9 @@ const sjsSettingObj = (function () {
             const col = _.find(cols, {field: r.field});
             if (col) {
                 col.getValue = r.getValue;
-                col.cellType = 'activeImageBtn';
+                col.cellType = 'imageBtn';
                 col.normalImg = '#rela-file-icon';
-                col.indent = 5;
+                col.indent = 12;
                 col.imgAlign = 2;
                 col.showImage = function (data) { return data && data[r.url_field]; }
             }

+ 5 - 4
app/view/stage/bwtz.ejs

@@ -119,6 +119,7 @@
         const def = thirdParty.dagl.find(function (x) {
             return x.value === data.dagl_status;
         });
+        if (data.code === '1-2-6-1-1-1') console.log(def);
         return def ? def.name : '';
     }
     function getColor (sheet, data, row, col, defaultColor) {
@@ -181,14 +182,14 @@
             <% if (ctx.session.sessionProject.gxby) { %>
             {
                 title: '工序报验', colSpan: '1', rowSpan: '2', field: 'gxby', hAlign: 1, width: 80, formatter: '@',
-                readOnly: true, getValue: getGxbyText, cellType: 'activeImageBtn', normalImg: '#rela-file-icon', indent: 5,
+                readOnly: true, getValue: getGxbyText, cellType: 'imageBtn', normalImg: '#rela-file-icon', indent: 12,
                 imgAlign: 2, showImage: function (data) { return data && data.gxby_url }
             },
             <% } %>
             <% if (ctx.session.sessionProject.dagl) { %>
             {
                 title: '档案管理', colSpan: '1', rowSpan: '2', field: 'dagl', hAlign: 1, width: 80, formatter: '@',
-                readOnly: true, getValue: getDaglText, cellType: 'activeImageBtn', normalImg: '#rela-file-icon', indent: 5,
+                readOnly: true, getValue: getDaglText, cellType: 'imageBtn', normalImg: '#rela-file-icon', indent: 12,
                 imgAlign: 2, showImage: function (data) { return data && data.dagl_url }
             },
             <% } %>
@@ -256,14 +257,14 @@
             <% if (ctx.session.sessionProject.gxby) { %>
             {
                 title: '工序报验', colSpan: '1', rowSpan: '2', field: 'gxby', hAlign: 1, width: 80, formatter: '@',
-                readOnly: true, getValue: getGxbyText, cellType: 'activeImageBtn', normalImg: '#rela-file-icon', indent: 5,
+                readOnly: true, getValue: getGxbyText, cellType: 'imageBtn', normalImg: '#rela-file-icon', indent: 5,
                 imgAlign: 2, showImage: function (data) { return data && data.gxby_url },
             },
             <% } %>
             <% if (ctx.session.sessionProject.dagl) { %>
             {
                 title: '档案管理', colSpan: '1', rowSpan: '2', field: 'dagl', hAlign: 1, width: 80, formatter: '@',
-                readOnly: true, getValue: getDaglText, cellType: 'activeImageBtn', normalImg: '#rela-file-icon', indent: 5,
+                readOnly: true, getValue: getDaglText, cellType: 'imageBtn', normalImg: '#rela-file-icon', indent: 5,
                 imgAlign: 2, showImage: function (data) { return data && data.dagl_url },
             },
             <% } %>