Parcourir la source

更新数据库连接

zhongzewei il y a 8 ans
Parent
commit
005714fad1

+ 5 - 4
modules/bills_lib/models/bills_lib_interfaces.js

@@ -861,8 +861,9 @@ billsLibDao.prototype.updateValue = function(uData, callback){
     let updateId = uData.updateId;
     let data = uData.data;
     let deleteCodes = uData.deleteCodes;
+    let billsLibId = uData.billsLibId;
     if(type === 'create'){
-        ItemCharacter.update({id: updateId}, {$addToSet: {itemValue: data}}, function(err){
+        ItemCharacter.update({billsLibId: billsLibId, id: updateId}, {$addToSet: {itemValue: data}}, function(err){
             if(err){
                 callback(1, 'Error');
             }
@@ -873,7 +874,7 @@ billsLibDao.prototype.updateValue = function(uData, callback){
     }
     else if(type === 'update'){
         if(data.field === 'code'){
-            ItemCharacter.update({id: updateId,  'itemValue.code': data.code}, {$set: {'itemValue.$.code': data.newData}}, function(err){
+            ItemCharacter.update({billsLibId: billsLibId, id: updateId,  'itemValue.code': data.code}, {$set: {'itemValue.$.code': data.newData}}, function(err){
                 if(err){
                     callback(1, 'Error');
                 }
@@ -883,7 +884,7 @@ billsLibDao.prototype.updateValue = function(uData, callback){
             });
         }
         else {
-            ItemCharacter.update({id: updateId,  'itemValue.code': data.code}, {$set: {'itemValue.$.value': data.newData}}, function(err){
+            ItemCharacter.update({billsLibId: billsLibId, id: updateId,  'itemValue.code': data.code}, {$set: {'itemValue.$.value': data.newData}}, function(err){
                 if(err){
                     callback(1, 'Error');
                 }
@@ -897,7 +898,7 @@ billsLibDao.prototype.updateValue = function(uData, callback){
     else {
         if(deleteCodes.length > 0){
             deleteCodes.forEach(function(code){
-                ItemCharacter.update({id: updateId}, {$pull: {itemValue: {code: code}}}, function(err){
+                ItemCharacter.update({billsLibId: billsLibId, id: updateId}, {$pull: {itemValue: {code: code}}}, function(err){
                     if(err){
                         callback(1, 'Error');
                     }

+ 2 - 2
modules/bills_lib/models/bills_lib_model.js

@@ -4,8 +4,8 @@
 let dbm = require("../../../config/db/db_manager");
 let schemas = require("./bills_lib_schemas.js");
 //var db = dbm.getLocalConnection("stdBillsEditor");
-//let db = dbm.getCfgConnection("stdBillsEditor");
-let db = dbm.getLocalConnection("stdBillsEditor");
+let db = dbm.getCfgConnection("scConstruct");
+//let db = dbm.getLocalConnection("stdBillsEditor");
 let stdBillsLibMod = db.model("stdBillsLib", schemas.stdBillsLibSchema);
 let billsMod = db.model("billsLib", schemas.billsSchema);
 let jobContentMod = db.model("jobContent", schemas.jobContentSchema);

+ 2 - 2
web/maintain/bills_lib/scripts/bills_lib_ajax.js

@@ -372,11 +372,11 @@ var itemsAjax = {
             }
         });
     },
-    updateValue: function(id, data, deleteCodes, type){
+    updateValue: function(billsLibId, id, data, deleteCodes, type){
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateValue',
-            data: {data: JSON.stringify({updateId: id, data: data, type: type, deleteCodes: deleteCodes})},
+            data: {data: JSON.stringify({billsLibId: billsLibId, updateId: id, data: data, type: type, deleteCodes: deleteCodes})},
             dataType: 'json',
             success: function(reslut){
 

+ 7 - 3
web/maintain/bills_lib/scripts/db_controller.js

@@ -367,6 +367,7 @@ var tools = {
 
     reSetCell: function(sheet, rowIdx, colIdx, value, id){
         if(value && colIdx){
+            console.log(`enterResetCell`);
             sheet.getCell(rowIdx, colIdx, GC.Spread.Sheets.SheetArea.viewport).value(value);
         }
         sheet.setTag(rowIdx, 0, id);
@@ -1413,6 +1414,9 @@ var valueController = {
         if(field === 'value'){
             var newCode = valueController.getCode(totalItems, id);
             newData = {code: newCode, value: newValue};
+            console.log(`newCode: ${newCode}`);
+            console.log(`id: ${id}`);
+            console.log(sheet.getActiveRowIndex());
             tools.reSetCell(sheet, sheet.getActiveRowIndex(), 0, newCode, newCode);
         }
         else {
@@ -1426,7 +1430,7 @@ var valueController = {
             }
         }
         totalItems.findItem(id).data.itemValue.push(newData);
-        itemsAjax.updateValue(id, newData, null, 'create');
+        itemsAjax.updateValue(billsLibId, id, newData, null, 'create');
     },
 
     updateValue: function(totalItems, tagId, newData, field){
@@ -1444,7 +1448,7 @@ var valueController = {
                 });
                 itemVals.splice(index, 0, updateEle);
             }
-            itemsAjax.updateValue(selectedId, updateData, null, 'update');
+            itemsAjax.updateValue(billsLibId, selectedId, updateData, null, 'update');
         }
         else {
             if(typeof newData === 'number'){
@@ -1460,7 +1464,7 @@ var valueController = {
                     });
                     itemVals.splice(index, 0, updateEle);
                 }
-                itemsAjax.updateValue(selectedId, updateData, null, 'update');
+                itemsAjax.updateValue(billsLibId, selectedId, updateData, null, 'update');
             }
             else {
                 //编号只能为数字!

+ 1 - 1
web/maintain/bills_lib/scripts/set_sheets.js

@@ -213,7 +213,7 @@ var myKey = {
                 });
                 tools.reshowValue(sheet, valsArr, setting, true);
                 //deleteDb
-                itemsAjax.updateValue(selectedId, null, ids, 'delete');
+                itemsAjax.updateValue(billsLibId, selectedId, null, ids, 'delete');
                 spread.resumeEvent();
             });
             spread.commandManager().setShortcutKey(null, GC.Spread.Commands.Key.del, false, false, false, false);