Explorar o código

其他台账,只读时,去掉表格空行

MaiXinRong %!s(int64=5) %!d(string=hai) anos
pai
achega
c05f339f34

+ 1 - 1
app/public/js/se_bonus.js

@@ -36,7 +36,7 @@ $(document).ready(() => {
             },
             {title: '备注', colSpan: '1', rowSpan: '1', field: 'memo', hAlign: 0, width: 180, formatter: '@', cellType: 'ellipsisAutoTip', readOnly: isPre, }
         ],
-        emptyRows: 3,
+        emptyRows: readOnly ? 0 : 3,
         headRows: 1,
         headRowHeight: [32],
         defaultRowHeight: 21,

+ 1 - 1
app/public/js/se_jgcl.js

@@ -28,7 +28,7 @@ $(document).ready(() => {
             {title: '检验单编号', colSpan: '1', rowSpan: '2', field: 'check_code', hAlign: 0, width: 80, formatter: '@'},
             {title: '备注', colSpan: '1', rowSpan: '2', field: 'memo', hAlign: 0, width: 100, formatter: '@', cellType: 'ellipsisAutoTip'}
         ],
-        emptyRows: 3,
+        emptyRows: readOnly ? 0 : 3,
         headRows: 2,
         headRowHeight: [25, 25],
         defaultRowHeight: 21,

+ 1 - 1
app/public/js/se_other.js

@@ -28,7 +28,7 @@ $(document).ready(() => {
             },
             {title: '备注', colSpan: '1', rowSpan: '1', field: 'memo', hAlign: 0, width: 180, formatter: '@', cellType: 'ellipsisAutoTip'}
         ],
-        emptyRows: 3,
+        emptyRows: readOnly ? 0 : 3,
         headRows: 1,
         headRowHeight: [32],
         defaultRowHeight: 21,

+ 47 - 5
builder_report_index_define.js

@@ -34,9 +34,9 @@ const stage_jgcl = {
         {name: '名称', field: 'name', type: dataType.str},
         {name: '单位', field: 'unit', type: dataType.str},
         {name: '单价', field: 'unit_price', type: dataType.currency, tag: {type: 'up'}},
-        {name: '本期到场-数量', field: 'arrive_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '本期到场-数量', field: 'arrive_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 4}},
         {name: '本期到场-金额', field: 'arrive_tp', type: dataType.currency, tag: {type: 'tp'}},
-        {name: '本期扣回-数量', field: 'deduct_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '本期扣回-数量', field: 'deduct_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 4}},
         {name: '本期扣回-金额', field: 'deduct_tp', type: dataType.currency, tag: {type: 'tp'}},
         {name: '材料来源', field: 'source', type: dataType.str},
         {name: '单据号', field: 'bills_code', type: dataType.str},
@@ -47,9 +47,9 @@ const stage_jgcl = {
         {name: '期历史记录', field: 'shistory', type: dataType.str},
         {name: '排序', field: 'order', type: dataType.int},
         {name: '往期是否已用', field: 'pre_used', type: dataType.int},
-        {name: '截止上期到场-数量', field: 'arrive_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '截止上期到场-数量', field: 'arrive_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 4}},
         {name: '截止上期到场-金额', field: 'arrive_tp', type: dataType.currency, tag: {type: 'tp'}},
-        {name: '截止上期扣回-数量', field: 'deduct_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '截止上期扣回-数量', field: 'deduct_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 4}},
         {name: '截止上期扣回-金额', field: 'deduct_tp', type: dataType.currency, tag: {type: 'tp'}},
     ]
 };
@@ -141,6 +141,48 @@ const change = {
         {name: '金额_9', field: 'tp_9', type: dataType.currency, tag: {type: 'tp'}},
     ]
 };
+const changeBills = {
+    name: '变更清单(mem_change_bills)',
+    remark: '',
+    id: 29,
+    key: 'mem_change_bills',
+    prefix: '变更清单',
+    cols: [
+        {name: '变更令id', field: 'cid', type: dataType.str},
+        {name: '签约清单id或台账id', field: 'lid', type: dataType.str},
+        {name: '清单编号', field: 'code', type: dataType.str},
+        {name: '名称', field: 'name', type: dataType.str},
+        {name: '单位', field: 'unit', type: dataType.str},
+        {name: '单价', field: 'unit_price', type: dataType.currency, tag: {type: 'up'}},
+        {name: '原-数量', field: 'o_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '原-金额', field: 'o_tp', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '变更-数量', field: 'c_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '变更-金额', field: 'c_tp', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '审批变更后-数量', field: 's_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '审批变更后-金额', field: 's_tp', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '部位明细', field: 'bwmx', type: dataType.str},
+        {name: '变更详情', field: 'detail', type: dataType.str},
+        {name: '数量_1', field: 'qty_1', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_1', field: 'tp_1', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_2', field: 'qty_2', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_2', field: 'tp_2', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_3', field: 'qty_3', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_3', field: 'tp_3', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_4', field: 'qty_4', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_4', field: 'tp_4', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_5', field: 'qty_5', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_5', field: 'tp_5', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_6', field: 'qty_6', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_6', field: 'tp_6', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_7', field: 'qty_7', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_7', field: 'tp_7', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_8', field: 'qty_8', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_8', field: 'tp_8', type: dataType.currency, tag: {type: 'tp'}},
+        {name: '数量_9', field: 'qty_9', type: dataType.currency, tag: {type: 'qty', unitKey: 5}},
+        {name: '金额_9', field: 'tp_9', type: dataType.currency, tag: {type: 'tp'}},
+
+    ]
+};
 
 const recursiveMkdirSync = async function (pathName) {
     if (!fs.existsSync(pathName)) {
@@ -228,7 +270,7 @@ const exportTableDefine = async function (define) {
     await saveTableDefine(tableDefine, path.join(savePath, define.key + '.json'));
 };
 
-const defines = [change];
+const defines = [change, changeBills];
 for (const d of defines) {
     exportTableDefine(d);
 }