Browse Source

fix: 信息价为空

zhangweicheng 4 years ago
parent
commit
4e9613df94

+ 1 - 1
web/building_saas/main/js/models/project_glj.js

@@ -319,7 +319,7 @@ ProjectGLJ.prototype.updatePrice = function (recode, updateField, newval,from,td
     let pgljID = from=="rg"?recode.projectGLJID:recode.id;//和定额工料机统一接口,项目工料机ID取值不一样
     let glj = _.find(projectGljs, {'id': pgljID});
     let udoc = tdoc?tdoc:{};//20200728 新增价格来源,默认为空
-    if(updateField == 'market_price') udoc = {"priceFrom":"",infoPrice:null};
+    if(updateField == 'market_price') udoc = {"priceFrom":"",infoPrice:null,...udoc};
     if (glj) {
         if(glj.unit_price[updateField] == newval){
             return;

+ 0 - 1
web/building_saas/main/js/views/calc_base_view.js

@@ -291,7 +291,6 @@ let calcBaseView = {
             if(!toggle || toggle !== 'calcBase'){
                 return;
             }
-            debugger;
             //bills
             if(me.curType === me.type.bills){
                 let selected = projectObj.project.mainTree.selected;

+ 0 - 1
web/building_saas/main/js/views/project_property_projFeature.js

@@ -446,7 +446,6 @@ let projFeatureView = {
                 var offset = margin + rectW + indent;
                 var recode = data[options.row];
                 if (recode && recode.hasOwnProperty('items')) {
-                    debugger;
                     drowRect(ctx, x, y, w, h);
                     var collapsed = recode.collapsed == undefined ? true : recode.collapsed;//options.sheet.getTag(options.row,options.col);
                     drowSymbol(ctx, x, y, w, h, collapsed);

+ 0 - 1
web/building_saas/pm/js/pm_import.js

@@ -313,7 +313,6 @@ const importView = (() => {
         });
         //下一步
         $('#import-next').click(function () {
-            debugger;
             let file = $('#customFile')[0].files[0];
             if (!file) {
                 showUploadAlert(false, '请选择导入文件。');

+ 0 - 1
web/over_write/js/chongqing_2018_import.js

@@ -1606,7 +1606,6 @@ const importXML = (() => {
 
     //从xml文件中提取数据
     async function extractData(file, escape = false) {
-        debugger;
         //将二进制文件转换成字符串
         let xmlStr = await util.readAsTextSync(file);
         if (escape) {