合同备注列复原

app/const/contract.js

@@ -29,7 +29,7 @@ const colSet = {
         { name: '应付进度', field: 'stackedBar', fixed: ['alias'] },
         { name: '累计实付', field: 'sf_price', fixed: ['alias'] },
         { name: '实付进度', field: 'stackedBarSf', fixed: ['alias'] },
-        { name: '备注1', field: 'remark', fixed: [] },
+        { name: '备注1', field: 'remark1', fixed: [] },
         { name: '备注2', field: 'remark2', fixed: [] },
         { name: '计算1', field: 'calc', fixed: [] },
         { name: '计算2', field: 'calc2', fixed: [] },
@@ -39,7 +39,7 @@ const colSet = {
         { name: '应回进度', field: 'stackedBar', fixed: ['alias'] },
         { name: '累计实回', field: 'sf_price', fixed: ['alias'] },
         { name: '实回进度', field: 'stackedBarSf', fixed: ['alias'] },
-        { name: '备注1', field: 'remark', fixed: [] },
+        { name: '备注1', field: 'remark1', fixed: [] },
         { name: '备注2', field: 'remark2', fixed: [] },
         { name: '计算1', field: 'calc', fixed: [] },
         { name: '计算2', field: 'calc2', fixed: [] },
@@ -52,7 +52,7 @@ const defaultColSet = {
         { field: 'stackedBar', show: 1 },
         { field: 'sf_price', show: 0 },
         { field: 'stackedBarSf', show: 0 },
-        { field: 'remark', show: 0, alias: '备注1' },
+        { field: 'remark1', show: 0, alias: '备注1' },
         { field: 'remark2', show: 0, alias: '备注2' },
         { field: 'calc', show: 0, alias: '计算1' },
         { field: 'calc2', show: 0, alias: '计算2' },
@@ -62,7 +62,7 @@ const defaultColSet = {
         { field: 'stackedBar', show: 1 },
         { field: 'sf_price', show: 0 },
         { field: 'stackedBarSf', show: 0 },
-        { field: 'remark', show: 0, alias: '备注1' },
+        { field: 'remark1', show: 0, alias: '备注1' },
         { field: 'remark2', show: 0, alias: '备注2' },
         { field: 'calc', show: 0, alias: '计算1' },
         { field: 'calc2', show: 0, alias: '计算2' },

app/public/js/contract_detail.js

@@ -12,6 +12,7 @@ $(document).ready(function() {
             {title: '合同金额', colSpan: '1', rowSpan: '2', field: 'total_price', hAlign: 2, width: 120, formatter: '@', readOnly: true},
             {title: '合同类型', colSpan: '1', rowSpan: '2', field: 'type', hAlign: 0, width: 120, readOnly: 'readOnly.type', cellType: 'customizeCombo', comboItems: types, cellTypeKey: 1},
             {title: '合同状态', colSpan: '1', rowSpan: '2', field: 'status', hAlign: 1, width: 100, formatter: '@', readOnly: true, getValue:'getValue.status', foreColor:'foreColor.status'},
+            {title: '备注', colSpan: '1', rowSpan: '2', field: 'remark', hAlign: 0, width: 120, formatter: '@', cellType: 'ellipsisAutoTip', scrollHeightClass: '.sjs-height-1'},
         ],
         emptyRows: 0,
         headRows: 2,
@@ -76,7 +77,7 @@ $(document).ready(function() {
       stackedBar: {title: '应付进度', colSpan: '1', rowSpan: '2', formatter: '@', readOnly: true, field: 'stackedBar', hAlign: 0, width: 200, cellType: 'stackedBar', stackedBarCover: true, bc_type: 'grid', getTip: getStackedBarTip, hintNum: true},
       sf_price: {title: '累计实付', colSpan: '1', rowSpan: '2', field: 'sf_price', hAlign: 2, width: 120, formatter: '@', readOnly: true},
       stackedBarSf: {title: '实付进度', colSpan: '1', rowSpan: '2', formatter: '@', readOnly: true, field: 'stackedBarSf', hAlign: 0, width: 200, cellType: 'stackedBar', stackedBarCover: true, bc_type: 'grid', getTip: getStackedBarTipSf, hintNum: true},
-      remark: {title: '备注1', colSpan: '1', rowSpan: '2', field: 'remark', hAlign: 0, width: 120, formatter: '@', cellType: 'ellipsisAutoTip', scrollHeightClass: '.sjs-height-1'},
+      remark1: {title: '备注1', colSpan: '1', rowSpan: '2', field: 'remark1', hAlign: 0, width: 120, formatter: '@', cellType: 'ellipsisAutoTip', scrollHeightClass: '.sjs-height-1'},
       remark2: {title: '备注2', colSpan: '1', rowSpan: '2', field: 'remark2', hAlign: 0, width: 120, formatter: '@', cellType: 'ellipsisAutoTip', scrollHeightClass: '.sjs-height-1'},
       calc: {title: '计算1', colSpan: '1', rowSpan: '2', field: 'calc', hAlign: 2, width: 120, type: 'Number', readOnly: 'readOnly.calc'},
       calc2: {title: '计算2', colSpan: '1', rowSpan: '2', field: 'calc2', hAlign: 2, width: 120, type: 'Number', readOnly: 'readOnly.calc'},

sql/update.sql

@@ -8,7 +8,16 @@
 ------------------------------------
 
 ALTER TABLE `zh_contract`
-ADD COLUMN `type` varchar(255) NULL DEFAULT '' COMMENT '合同类型（筛选的字段）' AFTER `name`;
+ADD COLUMN `type` varchar(255) NULL DEFAULT '' COMMENT '合同类型（筛选的字段）' AFTER `name`,
+ADD COLUMN `remark1` varchar(1000) NULL DEFAULT '' COMMENT '备注1' AFTER `remark`;
+
+ALTER TABLE `zh_contract_tree`
+ADD COLUMN `remark1` varchar(1000) NULL DEFAULT '' COMMENT '备注1' AFTER `remark`;
+
+ALTER TABLE `zh_contract`
+
+ADD COLUMN `calc` decimal(30, 6) NULL DEFAULT NULL COMMENT '计算1' AFTER `remark2`,
+ADD COLUMN `calc2` decimal(30, 6) NULL DEFAULT NULL COMMENT '计算2' AFTER `calc`;
 
 ALTER TABLE `zh_shenpi_audit`
 ADD COLUMN `audit_group` varchar(20) NOT NULL DEFAULT '' COMMENT '审批分组' AFTER `audit_ledger_id`,