1. 小修保养改为养护

2. 清单对比，工程量清单模式改为台账模式

app/const/spread.js

@@ -552,7 +552,7 @@ const ProjectSpreadTemplate = [
     { code: 'gl', name: '公路', template: glSpreadTemplate, isDefault: 1 },
     { code: 'sz', name: '市政', template: szSpreadTemplate },
     { code: 'fj', name: '房建', template: fjSpreadTemplate },
-    { code: 'xxby', name: '小修保养', template: glSpreadTemplate },
+    { code: 'xxby', name: '养护', template: glSpreadTemplate },
 ];
 const BaseSpreadColSetting = {
     tz_ledger_set: {

app/controller/ledger_controller.js

@@ -791,8 +791,7 @@ module.exports = app => {
         async loadGatherData(ctx) {
             try {
                 const billsData = await ctx.service.ledger.getData(ctx.tender.id);
-                const posData = this.ctx.tender.data.measure_type === measureType.tz.value
-                    ? await ctx.service.pos.getPosData({ tid: ctx.tender.id }) : [];
+                const posData = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
                 const dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: this.ctx.tender.id } });
                 const ancGcl = this.ctx.tender.data.measure_type === measureType.tz.value
                     ? await ctx.service.ancillaryGcl.getAllDataByCondition({ where: { tid: ctx.tender.id } }) : [];

app/public/js/ledger_gather.js

@@ -99,7 +99,6 @@ $(document).ready(() => {
             colWidth: true,
         },
     };
-    if (!isTz) leafXmjSpreadSetting.cols.splice(1, 1);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(leafXmjSpreadSetting);
     SpreadJsObj.initSheet(leafXmjSpread.getActiveSheet(), leafXmjSpreadSetting);
     const leafXmjSheet = leafXmjSpread.getActiveSheet();
@@ -192,39 +191,39 @@ $(document).ready(() => {
     // 获取项目节数据
     function loadLeafXmjData(iGclRow) {
         const gcl = iGclRow ? gclGatherData[iGclRow] : SpreadJsObj.getSelectObject(gclSheet);
-        SpreadJsObj.resetTopAndSelect(leafXmjSheet);
         if (gcl) {
             SpreadJsObj.loadSheetData(leafXmjSheet, SpreadJsObj.DataType.Data, gcl.leafXmjs);
         } else {
             SpreadJsObj.loadSheetData(leafXmjSheet, SpreadJsObj.DataType.Data, []);
         }
+        SpreadJsObj.resetTopAndSelect(leafXmjSheet);
     }
     function loadGatherLeafXmjData(iGclRow) {
         const gcl = iGclRow ? gclGatherData[iGclRow] : SpreadJsObj.getSelectObject(gclSheet);
-        SpreadJsObj.resetTopAndSelect(gatherLeafXmjSheet);
         if (gcl) {
             SpreadJsObj.loadSheetData(gatherLeafXmjSheet, SpreadJsObj.DataType.Data, gcl.gatherLeafXmjs);
         } else {
             SpreadJsObj.loadSheetData(gatherLeafXmjSheet, SpreadJsObj.DataType.Data, []);
         }
+        SpreadJsObj.resetTopAndSelect(gatherLeafXmjSheet);
     }
     function loadGatherAncGclData(iGclRow) {
         const gcl = iGclRow ? gclGatherData[iGclRow] : SpreadJsObj.getSelectObject(gclSheet);
-        SpreadJsObj.resetTopAndSelect(gatherAncGclSheet);
         if (gcl) {
             SpreadJsObj.loadSheetData(gatherAncGclSheet, SpreadJsObj.DataType.Data, gcl.gatherAncGcl);
         } else {
             SpreadJsObj.loadSheetData(gatherAncGclSheet, SpreadJsObj.DataType.Data, []);
         }
+        SpreadJsObj.resetTopAndSelect(gatherAncGclSheet);
     }
     function loadChangeData(iGclRow) {
         const gcl = iGclRow ? gclGatherData[iGclRow] : SpreadJsObj.getSelectObject(gclSheet);
-        SpreadJsObj.resetTopAndSelect(changeSheet);
         if (gcl) {
             SpreadJsObj.loadSheetData(changeSheet, SpreadJsObj.DataType.Data, gcl.change);
         } else {
             SpreadJsObj.loadSheetData(changeSheet, SpreadJsObj.DataType.Data, []);
         }
+        SpreadJsObj.resetTopAndSelect(changeSheet);
     }
     function loadGclGatherRelaData(iGclRow) {
         loadLeafXmjData(iGclRow);

sql/update.sql

@@ -65,3 +65,5 @@ ADD COLUMN `check_api` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NO
 ------------------------------------
 -- 表数据
 ------------------------------------
+
+Update zh_project_spread Set name = '养护' Where code = 'xxby';