台账、台账修订，允许配置会签、或签、协同

app/public/js/shares/tender_select.js

@@ -162,11 +162,11 @@ const TenderSelect = function (setting) {
             };
             if (this.setting.type === 'ledger' || this.setting.type === 'revise') {
                 resultSpreadSetting.cols.push(
-                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true}
+                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true, cellType: 'ellipsisAutoTip'}
                 );
             } else if (this.setting.type === 'stage') {
                 resultSpreadSetting.cols.push(
-                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 180, formatter: '@', readOnly: true},
+                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 180, formatter: '@', readOnly: true, cellType: 'ellipsisAutoTip'},
                     {title: '可选期', colSpan: '1', rowSpan: '1', field: 'stage', hAlign: 0, width: 60},
                 )
             }

app/public/js/shenpi.js

@@ -249,7 +249,7 @@ $(document).ready(function () {
         },
         getAuditTypeHtml: function(code, type) {
             const html = [];
-            const hide = ['stage', 'change'].indexOf(code) === -1 ? 'style="display: none;"' : '';
+            const hide = ['stage', 'change', 'ledger', 'revise'].indexOf(code) === -1 ? 'style="display: none;"' : '';
             html.push(`<span class="d-inline-block"><select class="form-control form-control-sm audit-type-key" ${hide} data-type="${type}">`);
             for (const t of auditType.types) {
                 html.push(`<option value="${t.value}" ${t.value === type ? 'selected' : ''}>${t.name}</option>`);

app/public/report/js/rpt_custom.js

@@ -29,7 +29,7 @@ const rptCustomObj = (function () {
     const sStageSelect = 'stage_select';
     const grSpreadSetting = {
         baseCols: [
-            {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 240, formatter: '@', readOnly: true},
+            {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 240, formatter: '@', readOnly: true, cellType: 'ellipsisAutoTip'},
         ],
         extraCols: [
             {title: '%s', colSpan: '1', rowSpan: '1', field: '%s', hAlign: 1, vAlign: '1', width: 60, cellType: 'checkbox', readOnly: true},

app/view/tender/shenpi.ejs

@@ -57,7 +57,7 @@
                                             <span class="col-auto"><%- ctx.helper.transFormToChinese(i+1) %>审</span>
                                             <span class="col-7 spr-span">
                                                 <span class="d-inline-block">
-                                                    <select class="form-control form-control-sm audit-type-key" data-type="<%- auditGroup[0].audit_type %>" <% if (['stage', 'change'].indexOf(sp.code) === -1 ) { %> style="display: none;" <% } %>>
+                                                    <select class="form-control form-control-sm audit-type-key" data-type="<%- auditGroup[0].audit_type %>" <% if (['stage', 'change', 'ledger', 'revise'].indexOf(sp.code) === -1 ) { %> style="display: none;" <% } %>>
                                                         <% for (const at of auditType.types) { %>
                                                         <option value="<%- at.value %>" <% if (auditGroup[0].audit_type === at.value) { %>selected<%} %>><%- at.name %></option>
                                                         <% } %>

sql/update.sql

@@ -452,6 +452,14 @@ ALTER TABLE `zh_stage_audit`
 ADD COLUMN `audit_ledger_id` varchar(5000) NOT NULL DEFAULT '' COMMENT '审批台账id' AFTER `audit_order`,
 ADD COLUMN `audit_locked` tinyint(1) NOT NULL DEFAULT 0  COMMENT '审批锁定（仅协审用）' AFTER `audit_ledger_id`;
 
+ALTER TABLE `zh_ledger_audit`
+ADD COLUMN `audit_type` tinyint(4) NOT NULL DEFAULT 0  COMMENT '审批类型' AFTER `audit_order`,
+ADD COLUMN `audit_ledger_id` varchar(5000) NOT NULL DEFAULT '' COMMENT '审批台账id' AFTER `audit_id`;
+
+ALTER TABLE `calculation`.`zh_revise_audit`
+ADD COLUMN `audit_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '审批类型' AFTER `audit_order`,
+ADD COLUMN `audit_ledger_id` varchar(5000) NOT NULL DEFAULT '' COMMENT '审批台账id' AFTER `audit_type`;
+
 -- update请放在最后
 
 Update zh_filing_template SET is_fixed = 1 WHERE tree_level = 1;