Browse Source

1. 阶段进度,参考文件显示列调整
2. 显示/隐藏项目特征调整

MaiXinRong 3 months ago
parent
commit
b348ae481f
3 changed files with 12 additions and 7 deletions
  1. 3 3
      app/public/js/ledger.js
  2. 2 2
      app/public/js/sp_progress.js
  3. 7 2
      sql/update.sql

+ 3 - 3
app/public/js/ledger.js

@@ -64,8 +64,8 @@ const featureShowCache = 'zh-feature-show';
 $(document).ready(function() {
     let stdXmj, stdGcl, dealBills, searchLedger, featureDisplay;
     autoFlashHeight();
-    const changeFeaturesDisplay = function (show, init = 0) {
-        $('#features-show').html(show ? '<i class="fa fa-eye"></i> 显示特征' : '<i class="fa fa-eye-slash"></i> 隐藏特征');
+    const changeFeaturesDisplay = function (show, init = false) {
+        $('#features-show').html(show ? '<i class="fa fa-eye"></i> 隐藏特征' : '<i class="fa fa-eye-slash"></i> 显示特征');
         const featureCols = ledgerSpreadSetting.cols.find(x => { return x.field === 'features'; });
         if (!featureCols) return;
         featureCols.visible = show ? true : false;
@@ -81,7 +81,7 @@ $(document).ready(function() {
             $('#features-show').show();
             featureDisplay = getLocalCache(featureShowCache);
             featureDisplay = featureDisplay ? parseInt(featureDisplay) : 1;
-            changeFeaturesDisplay(featureDisplay, 1);
+            changeFeaturesDisplay(featureDisplay, true);
         } else {
             $('#features-show').hide();
         }

+ 2 - 2
app/public/js/sp_progress.js

@@ -540,8 +540,8 @@ $(document).ready(() => {
                         },
                         spreadSetting: {
                             cols: [
-                                {title: '名称', field: 'name', hAlign: 0, width: 420, formatter: '@', cellType: 'tree', wordWrap: true},
-                                {title: '备注', field: 'remark', hAlign: 1, width: 150, formatter: '@'}
+                                {title: '编号', field: 'code', hAlign: 0, width: 200, formatter: '@', cellType: 'tree'},
+                                {title: '名称', field: 'name', hAlign: 0, width: 370, formatter: '@'},
                             ],
                             emptyRows: 0,
                             headRows: 1,

+ 7 - 2
sql/update.sql

@@ -32,17 +32,22 @@ MODIFY COLUMN `rela_tender` varchar(5000) CHARACTER SET ascii COLLATE ascii_gene
 ALTER TABLE `zh_budget`
 MODIFY COLUMN `rela_tender` varchar(5000) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '' COMMENT '关联标段id(\',\'分隔)' AFTER `std_id`;
 
-ALTER TABLE `calculation`.`zh_sub_project_permission`
+ALTER TABLE `zh_sub_project_permission`
 ADD COLUMN `info_permission` varchar(255) NOT NULL DEFAULT '' COMMENT '项目概况,权限id列表(\',\'分隔)' AFTER `self_category_level`,
 ADD COLUMN `fund_trans_permission` varchar(255) NOT NULL DEFAULT '' COMMENT '资金划拨,权限id列表(\',\'分隔)' AFTER `info_permission`,
 ADD COLUMN `fund_pay_permission` varchar(255) NOT NULL DEFAULT '' COMMENT '资金支付,权限id列表(\',\'分隔)' AFTER `fund_trans_permission`,
 ADD COLUMN `contract_permission` varchar(255) NOT NULL DEFAULT '' COMMENT '合同管理,权限id列表(\',\'分隔)' AFTER `fund_pay_permission`,
 ADD COLUMN `datacollect_permission` varchar(255) NOT NULL DEFAULT '' COMMENT '决策大屏,权限id列表(\',\'分隔)' AFTER `contract_permission`;
 
-ALTER TABLE `calculation`.`zh_file_reference_list`
+ALTER TABLE `zh_file_reference_list`
 ADD COLUMN `file_type` tinyint(4) UNSIGNED NOT NULL DEFAULT 1 COMMENT '文件类型' AFTER `remark`,
 ADD COLUMN `file_type_str` varchar(50) NOT NULL DEFAULT '资料归集' COMMENT '文件类型-文本' AFTER `file_type`;
 
+ALTER TABLE `zh_file_reference`
+MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '名称' AFTER `is_leaf`,
+ADD COLUMN `code` varchar(50) NOT NULL DEFAULT '' COMMENT '序号/编号' AFTER `name`,
+MODIFY COLUMN `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '备注' AFTER `name`;
+
 ------------------------------------
 -- 表数据
 ------------------------------------