Forráskód Böngészése

feat: 清单库增加固定类别列

vian 1 éve
szülő
commit
63a0b891f3

+ 24 - 23
modules/all_models/stdBills_bills.js

@@ -5,30 +5,31 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 const stdBills_bills = new Schema({
-            ID: String,
-            ParentID: String,
-            NextSiblingID: String,
-            code: String,
-            name: String,
-            unit: String,
-            ruleText: String,
-            engineering: Number, //工程专业,填计算程序工程专业ID
-            Expression: String,
-            comment: String, //备注,清单精灵处输入
-            jobs: [],
-            items: [],
-            recharge:String,
-            billsLibId: {type:Number,index:true},
-            sectionInfo: Schema.Types.Mixed,
-            //经济指标属性
-            economicType:String,//工程经济指标类别
-            quantityIndexType:String,//工程量指标类别
-            quantityIndexUnit:String,//工程量指标单位
-            quantityIndexCoe:Number,//单位转换系数
+    ID: String,
+    ParentID: String,
+    NextSiblingID: String,
+    code: String,
+    name: String,
+    unit: String,
+    ruleText: String,
+    engineering: Number, //工程专业,填计算程序工程专业ID
+    fixedFlag: Number,  //固定ID
+    Expression: String,
+    comment: String, //备注,清单精灵处输入
+    jobs: [],
+    items: [],
+    recharge: String,
+    billsLibId: { type: Number, index: true },
+    sectionInfo: Schema.Types.Mixed,
+    //经济指标属性
+    economicType: String,//工程经济指标类别
+    quantityIndexType: String,//工程量指标类别
+    quantityIndexUnit: String,//工程量指标单位
+    quantityIndexCoe: Number,//单位转换系数
 
-            deleted: Boolean
-    },
-    {versionKey: false}
+    deleted: Boolean
+},
+    { versionKey: false }
 );
 
 mongoose.model('std_bills_lib_bills', stdBills_bills, 'std_bills_lib_bills');

+ 17 - 10
modules/bills_lib/controllers/views_permissionController.js

@@ -4,23 +4,30 @@
  */
 import baseController from "../../common/base/base_controller";
 let config = require("../../../config/config.js");
-class viewsPermContr extends baseController{
-    redirectStdBillsMain(req, res){
+import { List as BillsFixedFlagList } from "../../common/const/bills_fixed.js";
+class viewsPermContr extends baseController {
+    redirectStdBillsMain(req, res) {
         res.render("maintain/bills_lib/html/main.html",
-            {userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID});
+            {
+                userAccount: req.session.managerData.username,
+                userID: req.session.managerData.userID
+            });
     }
-    redirectStdBills(req, res){
+    redirectStdBills(req, res) {
         res.render("maintain/bills_lib/html/qingdan.html",
-            {userAccount: req.session.managerData.username, LicenseKey:config.getLicenseKey(process.env.NODE_ENV)});
+            {
+                userAccount: req.session.managerData.username,
+                LicenseKey: config.getLicenseKey(process.env.NODE_ENV),
+                BillsFixedFlagList: JSON.stringify(BillsFixedFlagList)
+            });
     }
-    redirectStdJobs(req, res){
+    redirectStdJobs(req, res) {
         res.render('maintain/bills_lib/html/neirong.html',
-            {userAccount: req.session.managerData.username, LicenseKey:config.getLicenseKey(process.env.NODE_ENV)});
+            { userAccount: req.session.managerData.username, LicenseKey: config.getLicenseKey(process.env.NODE_ENV) });
     }
-    redirectStdItems(req, res){
+    redirectStdItems(req, res) {
         res.render('maintain/bills_lib/html/tezheng.html',
-            {userAccount: req.session.managerData.username, LicenseKey:config.getLicenseKey(process.env.NODE_ENV)});
+            { userAccount: req.session.managerData.username, LicenseKey: config.getLicenseKey(process.env.NODE_ENV) });
     }
 }
 

+ 39 - 2
web/maintain/bills_lib/html/qingdan.html

@@ -367,6 +367,7 @@
     });
     codeEditor.setSize('auto','350px');
     autoFlashHeight();
+    let BillsFixedFlagList = JSON.parse('<%- BillsFixedFlagList %>');
     let userAccount = '<%= userAccount %>';
     let maxJobsNumber;
     let maxItemsNumber;
@@ -467,13 +468,31 @@
         });
     }
 
+    function setCombo(sheet, col, comboDatas) {
+        sheet.suspendPaint();
+        sheet.suspendEvent();
+        let combo = sheetCommonObj.getDynamicCombo();
+        combo.items(comboDatas).itemHeight(10).editable(false);
+        sheet.getRange(-1, col, -1, 1).cellType(combo);
+        sheet.resumePaint();
+        sheet.resumeEvent();
+    }
 
     function showBillsSheet(datas, jobsSheet, itemsSheet, setting) {
         billsSpread = new GC.Spread.Sheets.Workbook($('#spreadBills')[0], {sheetCount: 1});
+        let billsSheet = billsSpread.getSheet(0);
         sheetCommonObj.bindEscKey(billsSpread, [{sheet: billsSpread.getSheet(0), editStarting: dbController.onEditStart, editEnded: dbController.onEditEnded}]);
         billsSpread.focus(true);
         setSheet.initSheet(billsSpread, setting, true);
         myKey.delKey(billsSpread);
+        for (let data of datas) {
+            if (data.fixedFlag) {
+                let findData = BillsFixedFlagList.find((x) => data.fixedFlag === x.value);
+                if (findData) {
+                    data.fixedFlag = findData.name;
+                }
+            }
+        }
         billsTree.loadDatas(datas);
         let controller = TREE_SHEET_CONTROLLER.createNew(billsTree.tree, billsSpread.getActiveSheet(), setting);
         controller.showTreeData();
@@ -508,6 +527,10 @@
                 nodeOpration(controller, totalJobs, totalItems);
             });
         });
+        // 设置固定清单下拉
+        let nameList = BillsFixedFlagList.map((data) => data.name);
+        let comboCol = setting.cols.findIndex((data) => data.data.field === 'fixedFlag');
+        setCombo(billsSheet, comboCol, nameList);
     }
 
     function switchFcs(controller, billsSheet, billsSpread, jobsSheet, itemsSheet){
@@ -811,6 +834,7 @@
                     sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
                     sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
                     sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
+                    sheet.setValue(i, 9, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                 }
                 else {
                     sheet.clear(i, 0, 1, sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport,GC.Spread.Sheets.StorageType.data);
@@ -841,16 +865,29 @@
                 }
                 curRow = row;
                 const field = setting.cols[col].data.field;
-                const value = sheet.getValue(row, col);
+                let value = sheet.getValue(row, col);
+                if (field === 'fixedFlag') {
+                    const findData = BillsFixedFlagList.find((x) => x.name === value);
+                    if (findData) {
+                        value = findData.value;
+                    }
+                }
                 curData[field] = value;
             });
             billsAjax.pasteBills(userAccount, billsLibId, postData, function () {
                 info.changedCells.forEach(({ row, col }) => {
                     const node = controller.tree.items[row];
                     const field = setting.cols[col].data.field;
-                    const value = sheet.getValue(row, col);
+                    let value = sheet.getValue(row, col);
+                    if (field === 'fixedFlag') {
+                        const findData = BillsFixedFlagList.find((x) => x.value === value);
+                        if (findData) {
+                        value = findData.name;
+                    }
+                    }
                     node.data[field] = value;
                     sheetBillsDatas.datasIdx['rowIdx' + row][field] = value;
+                    sheet.setValue(row, col, node.data[field] || '');
                 });
             }, function () {
                 info.changedCells.forEach(({ row, col }) => {

+ 171 - 165
web/maintain/bills_lib/scripts/bills_lib_ajax.js

@@ -10,9 +10,9 @@ var mainAjax = {
             dataType: 'json',
             success: function (result) {
                 //addoptions
-                for(let i = 0; i < result.data.length; i++){
-                    let $option =  $("<option >"+ result.data[i].name +"</option>");
-                    $option.val( result.data[i]._id);
+                for (let i = 0; i < result.data.length; i++) {
+                    let $option = $("<option >" + result.data[i].name + "</option>");
+                    $option.val(result.data[i]._id);
                     $('#compilationSels').append($option);
                 }
                 $('#compilationSels').on("change", function () {
@@ -20,30 +20,30 @@ var mainAjax = {
             }
         });
     },
-    getMaxNumber: function(billsLibId, field, callback){
+    getMaxNumber: function (billsLibId, field, callback) {
         $.ajax({
             type: 'post',
             url: '/stdBillsEditor/getMaxNumber',
-            data: {data: JSON.stringify({billsLibId: billsLibId, field: field})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId, field: field }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error){
-                    if(callback){
+            success: function (result) {
+                if (!result.error) {
+                    if (callback) {
                         callback(result.data);
                     }
                 }
             }
         });
     },
-    getABillsLib: function(billsLibId, callback){
+    getABillsLib: function (billsLibId, callback) {
         $.ajax({
             type: 'post',
             url: '/stdBillsEditor/getABillsLib',
-            data: {data: JSON.stringify({billsLibId: billsLibId})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error){
-                    if(callback){
+            success: function (result) {
+                if (!result.error) {
+                    if (callback) {
                         callback(result.data);
                     }
                 }
@@ -53,69 +53,69 @@ var mainAjax = {
     getLibsHtml: function (data) {
         const libHtml = data.reduce((acc, libData) => {
             const id = libData.billsLibId;
-            const libType=libData.libType?libData.libType:"1";
-            const libTypeName = libData.libType==="2"?'指标':'清单';
+            const libType = libData.libType ? libData.libType : "1";
+            const libTypeName = libData.libType === "2" ? '指标' : '清单';
             const billsLibName = libData.billsLibName;
             const createDateFmt = new Date(libData.createDate).format("yyyy-MM-dd");
-            const html = 
+            const html =
                 `<tr id="${id}">
                     <td><a href="/stdBills?billsLibId=${id}&locked=true">${billsLibName}</a></td>
                     <td>${libTypeName}</td>
                     <td>${createDateFmt}</td>
                     <td>
-                    ${ isTemporary !== 'true' ? `
+                    ${isTemporary !== 'true' ? `
                         <a class="lock-btn-control disabled" data-toggle="modal" data-target="#edit" href="javascript:void(0);" title="编辑"><i class="fa fa-pencil-square-o"></i></a>
                         <a class="text-danger lock-btn-control disabled" data-toggle="modal" data-target="#del" href="javascript:void(0);" title="删除"><i class="fa fa-remove"></i></a>
-                    ` : '' }
+                    ` : ''}
                         <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
                     </td>
-                    ${ isTemporary !== 'true' ? `
+                    ${isTemporary !== 'true' ? `
                     <td>
                         <a class="btn btn-secondary btn-sm import-data lock-btn-control disabled" data-id="${id}" href="javascript:void(0);" title="导入数据"><i class="fa fa-sign-in fa-rotate-90"></i>导入</a>
                     </td>
                     <td>
                         <a class="btn btn-secondary btn-sm copy-data lock-btn-control disabled" data-id="${id}" data-type="${libType}" href="javascript:void(0);" title="复制数据"><i class="fa fa-clone"></i>复制</a>
                     </td>
-                    ` : '' }
+                    ` : ''}
                  </tr>`;
             return acc += html;
         }, '');
         return libHtml;
     },
-    getStdBillsLib: function(){
+    getStdBillsLib: function () {
         const me = this;
         $.ajax({
             type: "post",
             url: "/stdBillsEditor/getStdBillsLib",
             dataType: "json",
-            success: function(result){
-                if(result.data){
+            success: function (result) {
+                if (result.data) {
                     $('#showArea').append(me.getLibsHtml(result.data));
                 }
             }
         });
     },
-    createStdBillsLib: function(userAccount, billsLibName,billsLibType){
+    createStdBillsLib: function (userAccount, billsLibName, billsLibType) {
         const me = this;
         $.ajax({
             type: "POST",
             url: "/stdBillsEditor/createStdBillsLib",
-            data: {data: JSON.stringify({userAccount: userAccount, name: billsLibName,libType:billsLibType}) },
+            data: { data: JSON.stringify({ userAccount: userAccount, name: billsLibName, libType: billsLibType }) },
             dataType: "json",
-            success: function(result){
-                if(!result.error){
+            success: function (result) {
+                if (!result.error) {
                     $('#showArea').append(me.getLibsHtml(result.data));
                     $('#add').modal('hide');
                 }
             }
         });
     },
-    copyBillsLib: function (libId, libName,libType) {
+    copyBillsLib: function (libId, libName, libType) {
         const me = this;
         $.ajax({
             type: 'post',
             url: '/stdBillsEditor/copyStdBillsLib',
-            data: {data: JSON.stringify({libId, libName,libType})},
+            data: { data: JSON.stringify({ libId, libName, libType }) },
             dataType: 'json',
             timeout: 150000,
             beforeSend: function () {
@@ -132,29 +132,29 @@ var mainAjax = {
             }
         });
     },
-    deleteStdBillsLib: function(lastOperator, billsLibId){
+    deleteStdBillsLib: function (lastOperator, billsLibId) {
         $.ajax({
             type: "POST",
             url: "/stdBillsEditor/deleteStdBillsLib",
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId }) },
             dataType: "json",
-            success: function(result){
-                if(!result.error){
-                    var jqSel = "#"+billsLibId;
+            success: function (result) {
+                if (!result.error) {
+                    var jqSel = "#" + billsLibId;
                     $(jqSel).remove();
                     $('#del').modal('hide');
                 }
             }
         });
     },
-    renameStdBillsLib: function(lastOperator, billsLibId, newName){
+    renameStdBillsLib: function (lastOperator, billsLibId, newName) {
         $.ajax({
             type: "post",
             url: "/stdBillsEditor/renameStdbillsLib",
-            data: {data: JSON.stringify({lastOperator: lastOperator, id: billsLibId, value: newName})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, id: billsLibId, value: newName }) },
             dataType: "json",
-            success: function(result){
-                if(!result.error){
+            success: function (result) {
+                if (!result.error) {
                     var jqSel = "#" + billsLibId + " td:first" + " a";
                     $(jqSel).text(newName);
                 }
@@ -166,8 +166,8 @@ var mainAjax = {
             type: 'post',
             url: 'stdBillsEditor/getCurrentUniqId',
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
@@ -176,32 +176,32 @@ var mainAjax = {
 }
 
 var billsAjax = {
-    getStdBillsLibName: function(billsLibId) {
+    getStdBillsLibName: function (billsLibId) {
         $.ajax({
             type: "post",
             url: "/stdBillsEditor/getStdBillsLibName",
-            data: {data: JSON.stringify({billsLibId: billsLibId})},
-            success: function(result){
-                if(!result.error){
+            data: { data: JSON.stringify({ billsLibId: billsLibId }) },
+            success: function (result) {
+                if (!result.error) {
                     $(".navbar-text").append(
-                    "<a href='stdBillsmain'>清单规则</a><i class='fa fa-angle-right fa-fw'></i>"+result.data[0].billsLibName
+                        "<a href='stdBillsmain'>清单规则</a><i class='fa fa-angle-right fa-fw'></i>" + result.data[0].billsLibName
                     );
                 }
             }
         });
     },
-    getBills: function(billsLibId, callback){
+    getBills: function (billsLibId, callback) {
         $.ajax({
             type: "post",
             url: "/stdBillsEditor/getBills",
-            data: {data: JSON.stringify({billsLibId: billsLibId})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId }) },
             dataType: "json",
             beforeSend: function () {
                 $.bootstrapLoading.start();
             },
-            success: function(result){
-                if(!result.error){
-                    if(callback) {
+            success: function (result) {
+                if (!result.error) {
+                    if (callback) {
                         callback(result.data);
                     }
                 }
@@ -211,29 +211,29 @@ var billsAjax = {
             }
         });
     },
-    createBills: function(lastOperator, billsLibId, newId, pid, nid, updatePreData, sectionInfo, callback){
+    createBills: function (lastOperator, billsLibId, newId, pid, nid, updatePreData, sectionInfo, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/createBills',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, newId: newId, ParentID: pid, NextSiblingID: nid, updatePreData: updatePreData, sectionInfo: sectionInfo})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, newId: newId, ParentID: pid, NextSiblingID: nid, updatePreData: updatePreData, sectionInfo: sectionInfo }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error){
-                    if(callback){
+            success: function (result) {
+                if (!result.error) {
+                    if (callback) {
                         callback();
                     }
                 }
             }
         });
     },
-    upMove: function(lastOperator, billsLibId, updateDatas, callback){
+    upMove: function (lastOperator, billsLibId, updateDatas, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/upMove',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback();
                 }
             }
@@ -243,24 +243,24 @@ var billsAjax = {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/downMove',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback();
                 }
             }
         })
     },
-    updatePNId: function(billsLibId, updateData, callback){
+    updatePNId: function (billsLibId, updateData, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updatePNId',
-            data: {data: JSON.stringify({billsLibId: billsLibId, updateData: updateData})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId, updateData: updateData }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
                 console.log(`entersFuc`);
-                if(!result.error && callback){
+                if (!result.error && callback) {
                     console.log(`enterSc`);
                     callback();
                 }
@@ -268,19 +268,19 @@ var billsAjax = {
                     //提示窗口:更新失败
                 }
             },
-            error: function(){
+            error: function () {
                 console.log(`error`);
             }
         });
     },
-    upLevel: function(lastOperator, billsLibId, updateDatas, callback){
+    upLevel: function (lastOperator, billsLibId, updateDatas, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/upLevel',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas }) },
             dataType: 'json',
             success: function (result) {
-                if(!result.error && callback){
+                if (!result.error && callback) {
                     callback();
                 }
             }
@@ -290,25 +290,25 @@ var billsAjax = {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/downLevel',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas }) },
             dataType: 'json',
             success: function (result) {
-                if(!result.error && callback){
+                if (!result.error && callback) {
                     callback();
                 }
             }
         })
     },
-    deleteBills: function(lastOperator, billsLibId, deleteIds, updateNode, callback){
+    deleteBills: function (lastOperator, billsLibId, deleteIds, updateNode, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/deleteBills',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, deleteIds: deleteIds, updateNode: updateNode})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, deleteIds: deleteIds, updateNode: updateNode }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error){
+            success: function (result) {
+                if (!result.error) {
                     console.log(result.message);
-                    if(callback){
+                    if (callback) {
                         callback();
                     }
                 }
@@ -316,25 +316,31 @@ var billsAjax = {
 
         });
     },
-    updateBills: function(lastOperator, billsLibId, updateId, field, data){
+    updateBills: function (lastOperator, billsLibId, updateId, field, data) {
+        if (field === 'fixedFlag') {
+            let findData = BillsFixedFlagList.find((x) => x.name === data);
+            if (findData) {
+                data = findData.value;
+            }
+        }
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateBills',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, field: field, data: data})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, field: field, data: data }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
     },
-    updateSectionInfo: function(data, callback){
+    updateSectionInfo: function (data, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateSectionInfo',
-            data: {data: JSON.stringify({updateData: data})},
+            data: { data: JSON.stringify({ updateData: data }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback();
                 }
             }
@@ -344,9 +350,9 @@ var billsAjax = {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/removeTotal',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsIds: billsIds, delIds: delIds, field: field})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, billsIds: billsIds, delIds: delIds, field: field }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         })
@@ -355,35 +361,35 @@ var billsAjax = {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateSerialNo',
-            data: {data: JSON.stringify({lastOperator: userAccount, billsLibId: billsLibId, billsId: billsId, updateArr: updateArr, field: field})},
+            data: { data: JSON.stringify({ lastOperator: userAccount, billsLibId: billsLibId, billsId: billsId, updateArr: updateArr, field: field }) },
             dataType: 'json',
             success: function (result) {
-                if(!result.error && callback){
+                if (!result.error && callback) {
                     callback();
                 }
             }
         });
     },
-    updateBillsArr: function(lastOperator, billsLibId, updateId, orgId, newId, type, classify, callback){
+    updateBillsArr: function (lastOperator, billsLibId, updateId, orgId, newId, type, classify, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateBillsArr',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, orgId: orgId, newId: newId, type: type, classify: classify})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, orgId: orgId, newId: newId, type: type, classify: classify }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback();
                 }
             }
         });
     },
-    pasteBills: function(lastOperator, billsLibId, datas, successCallback, errorCallback){
+    pasteBills: function (lastOperator, billsLibId, datas, successCallback, errorCallback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/pasteBills',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, datas: datas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, datas: datas }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
                 if (!result.error && successCallback) {
                     successCallback();
                 } else if (result.error && errorCallback) {
@@ -399,13 +405,13 @@ var billsAjax = {
             }
         });
     },
-    updateRecharge: function(lastOperator, billsLibId, updateId, data){
+    updateRecharge: function (lastOperator, billsLibId, updateId, data) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateRecharge',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, data: data})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: updateId, data: data }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
@@ -414,10 +420,10 @@ var billsAjax = {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/pasteRel',
-            data: {data:JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas, createDatas: createDatas, field: field})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateDatas: updateDatas, createDatas: createDatas, field: field }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
@@ -426,102 +432,102 @@ var billsAjax = {
 };
 
 var jobsAjax = {
-    getJobContent: function(billsLidId, callback){
+    getJobContent: function (billsLidId, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/getJobContent',
-            data: {data: JSON.stringify({billsLibId: billsLidId})},
+            data: { data: JSON.stringify({ billsLibId: billsLidId }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    getSomeJobs: function(billsLibId, ids, callback){
+    getSomeJobs: function (billsLibId, ids, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/getSomeJobs',
-            data: {data: JSON.stringify({billsLibId: billsLibId, ids: ids})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId, ids: ids }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    createJobContent: function(lastOperator, billsLibId, data, serialNo, callback){
+    createJobContent: function (lastOperator, billsLibId, data, serialNo, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/createJobContent',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, data: data, serialNo: serialNo})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, data: data, serialNo: serialNo }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    updateJobContent: function(lastOperator, billsLibId, id, field, data){
+    updateJobContent: function (lastOperator, billsLibId, id, field, data) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateJobContent',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, field: field, data: data })},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, field: field, data: data }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
     },
-    deleteJobContent: function(lastOperator, billsLibId, ids){
+    deleteJobContent: function (lastOperator, billsLibId, ids) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/deleteJobContent',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, ids: ids})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, ids: ids }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
     },
-    pasteJobs: function(lastOperator, billsLibId, pasteDatas, callback){
+    pasteJobs: function (lastOperator, billsLibId, pasteDatas, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/pasteJobs',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
 
         });
     },
-    edCreateJob: function(lastOperator, billsLibId, billsId, data, code, serialNo, callback){
+    edCreateJob: function (lastOperator, billsLibId, billsId, data, code, serialNo, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/edCreateJob',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsId:billsId, data: data, code: code, serialNo: serialNo})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, billsId: billsId, data: data, code: code, serialNo: serialNo }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    edUpdateJob: function(lastOperator, billsLibId, billsId, content, code, orgJobId, callback){
+    edUpdateJob: function (lastOperator, billsLibId, billsId, content, code, orgJobId, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/edUpdateJob',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsId:billsId, content: content, code: code, orgJobId: orgJobId})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, billsId: billsId, content: content, code: code, orgJobId: orgJobId }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
@@ -530,76 +536,76 @@ var jobsAjax = {
 };
 
 var itemsAjax = {
-    getItemCharacter: function(billsLibId, callback){
+    getItemCharacter: function (billsLibId, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/getItemCharacter',
-            data: {data: JSON.stringify({billsLibId: billsLibId})},
+            data: { data: JSON.stringify({ billsLibId: billsLibId }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error){
-                    if(callback){
+            success: function (result) {
+                if (!result.error) {
+                    if (callback) {
                         callback(result.data);
                     }
                 }
             }
         });
     },
-    createItemCharacter: function(lastOperator, billsLibId,  data, code, callback){
+    createItemCharacter: function (lastOperator, billsLibId, data, code, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/createItemCharacter',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, data: data, code: code})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, data: data, code: code }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    updateItemCharacter: function(lastOperator, billsLibId, id, field, data){
+    updateItemCharacter: function (lastOperator, billsLibId, id, field, data) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateItemCharacter',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, field: field, data: data })},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, field: field, data: data }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
     },
-    updateValue: function(lastOperator, billsLibId, id, data, deleteCodes, type){
+    updateValue: function (lastOperator, billsLibId, id, data, deleteCodes, type) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateValue',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, data: data, type: type, deleteCodes: deleteCodes})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, updateId: id, data: data, type: type, deleteCodes: deleteCodes }) },
             dataType: 'json',
-            success: function(reslut){
+            success: function (reslut) {
 
             }
         });
     },
-    deleteItemCharacter: function(lastOperator, billsLibId, ids){
+    deleteItemCharacter: function (lastOperator, billsLibId, ids) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/deleteItemCharacter',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, ids: ids})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, ids: ids }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
 
             }
         });
     },
-    pasteItems: function(lastOperator, billsLibId, pasteDatas, callback){
+    pasteItems: function (lastOperator, billsLibId, pasteDatas, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/pasteItems',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas }) },
             dataType: 'json',
-            success: function(result){
+            success: function (result) {
                 console.log(result);
-                if(!result.error){
+                if (!result.error) {
                     console.log(result.data);
                     callback(result.data);
                 }
@@ -607,40 +613,40 @@ var itemsAjax = {
 
         });
     },
-    pasteValues: function(lastOperator, billsLibId, pasteDatas, callback){
+    pasteValues: function (lastOperator, billsLibId, pasteDatas, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/pasteValues',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, pasteDatas: pasteDatas }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    edCreateItem: function(lastOperator, billsLibId, billsId, data, code, serialNo, callback){
+    edCreateItem: function (lastOperator, billsLibId, billsId, data, code, serialNo, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/edCreateItem',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsId:billsId, data: data, code: code, serialNo: serialNo})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, billsId: billsId, data: data, code: code, serialNo: serialNo }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }
         });
     },
-    edUpdateItem: function(lastOperator, billsLibId, billsId, content, code, orgItemId, callback){
+    edUpdateItem: function (lastOperator, billsLibId, billsId, content, code, orgItemId, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/edUpdateItem',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsId:billsId, content: content, code: code, orgItemId: orgItemId})},
+            data: { data: JSON.stringify({ lastOperator: lastOperator, billsLibId: billsLibId, billsId: billsId, content: content, code: code, orgItemId: orgItemId }) },
             dataType: 'json',
-            success: function(result){
-                if(!result.error && callback){
+            success: function (result) {
+                if (!result.error && callback) {
                     callback(result.data);
                 }
             }

+ 23 - 6
web/maintain/bills_lib/scripts/bills_lib_setting.js

@@ -2,7 +2,7 @@
  * Created by vian on 2017/4/10.
  */
 var billsLibSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编码'],
@@ -155,6 +155,23 @@ var billsLibSetting = {
                 font: 'Arial'
             },
             width: 60
+        },
+        {
+            head: {
+                titleNames: ['固定ID'],
+                spanCols: [1],
+                spanRows: [2],
+                vAlign: [1, 1],
+                hAlign: [1, 1],
+                font: ' Arial'
+            },
+            data: {
+                field: 'fixedFlag',
+                vAlign: 1,
+                hAlign: 1,
+                font: 'Arial'
+            },
+            width: 100
         }
     ],
     headRows: 1,
@@ -164,7 +181,7 @@ var billsLibSetting = {
 };
 
 var jobsSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编号'],
@@ -207,7 +224,7 @@ var jobsSetting = {
 };
 
 var itemsSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编号'],
@@ -250,7 +267,7 @@ var itemsSetting = {
 };
 
 var totalJobsSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编号'],
@@ -293,7 +310,7 @@ var totalJobsSetting = {
 };
 
 var totalItemsSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编号'],
@@ -336,7 +353,7 @@ var totalItemsSetting = {
 };
 
 var eigenValueSetting = {
-    cols:[
+    cols: [
         {
             head: {
                 titleNames: ['编号'],

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 669 - 656
web/maintain/bills_lib/scripts/db_controller.js