feat: 调整清单库类型列顺序

web/maintain/bills_lib/html/qingdan.html

@@ -844,13 +844,13 @@
                 }
                 else if(i < controller.tree.items.length && j>= validDatas.length){
                     //reshow orgDatas
-                    sheet.setValue(i, 0, sheetBillsDatas.datasIdx['rowIdx'+ i].code + '');
-                    sheet.setValue(i, 1, sheetBillsDatas.datasIdx['rowIdx'+ i].name);
-                    sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
-                    sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
+                    sheet.setValue(i, 0, sheetBillsDatas.datasIdx['rowIdx'+ i].kind);
+                    sheet.setValue(i, 1, sheetBillsDatas.datasIdx['rowIdx'+ i].code + '');
+                    sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].name);
+                    sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
+                    sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
                     // sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
-                    sheet.setValue(i, 9, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
-                    sheet.setValue(i, 10, sheetBillsDatas.datasIdx['rowIdx'+ i].kind);
+                    sheet.setValue(i, 10, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                 }
                 else {
                     sheet.clear(i, 0, 1, sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport,GC.Spread.Sheets.StorageType.data);

web/maintain/bills_lib/scripts/bills_lib_setting.js

@@ -5,6 +5,23 @@ var billsLibSetting = {
     cols: [
         {
             head: {
+                titleNames: ['类型'],
+                spanCols: [1],
+                spanRows: [2],
+                vAlign: [1, 1],
+                hAlign: [1, 1],
+                font: ' Arial'
+            },
+            data: {
+                field: 'kind',
+                vAlign: 1,
+                hAlign: 1,
+                font: 'Arial'
+            },
+            width: 50
+        },
+        {
+            head: {
                 titleNames: ['编码'],
                 spanCols: [1],
                 spanRows: [2],
@@ -172,23 +189,6 @@ var billsLibSetting = {
                 font: 'Arial'
             },
             width: 100
-        },
-        {
-            head: {
-                titleNames: ['类型'],
-                spanCols: [1],
-                spanRows: [2],
-                vAlign: [1, 1],
-                hAlign: [1, 1],
-                font: ' Arial'
-            },
-            data: {
-                field: 'kind',
-                vAlign: 1,
-                hAlign: 1,
-                font: 'Arial'
-            },
-            width: 100
         }
     ],
     headRows: 1,

web/maintain/bills_lib/scripts/db_controller.js

@@ -1021,10 +1021,9 @@ var tools = {
         else if (classify === 'bills') {
             sheetDatas = { datasIdx: {}, datas: [] };
             for (let i = 0; i < controller.tree.items.length; i++) {
-                let code = sheet.getValue(i, 0), name = sheet.getValue(i, 1),
-                    unit = sheet.getValue(i, 2), ruleText = sheet.getValue(i, 3),
-                    fixedFlag = sheet.getValue(i, 9),
-                    kind = sheet.getValue(i, 10);
+                let kind = sheet.getValue(i, 0), code = sheet.getValue(i, 1), name = sheet.getValue(i, 2),
+                    unit = sheet.getValue(i, 3), ruleText = sheet.getValue(i, 4),
+                    fixedFlag = sheet.getValue(i, 10);
                 let data = { code: code, name: name, unit: unit, ruleText: ruleText, fixedFlag, kind, rowIdx: i };
                 sheetDatas.datas.push(data);
                 sheetDatas.datasIdx['rowIdx' + i] = data;