ソースを参照

导出重庆招投标接口,人材机代号,改为取值人材机编码

zhongzewei 6 年 前
コミット
3512be0c25
1 ファイル変更15 行追加8 行削除
  1. 15 8
      web/building_saas/main/js/models/exportStandardInterface.js

+ 15 - 8
web/building_saas/main/js/models/exportStandardInterface.js

@@ -793,7 +793,8 @@ const XMLStandard = (function () {
         //如果是“投标”,且采用了信息价差额法,则导出;如果采用了指数法,则导出,但数量、风险系数、基准单价、投标单价,都取0。
         function DifferentiaGljDetail(adjustType, source) {
             let attrs = [
-                {name: '关联材料号', value: getGljCode(source.id), minLen: 1, maxLen: 20, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
+                //getGljCode(source.id)
+                {name: '关联材料号', value: source.code, minLen: 1, maxLen: 20, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
                 {name: '名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
                 {name: '规格', value: source.specs, maxLen: 255, whiteSpace: _config.WHITE_SPACE.COLLAPSE},
                 {name: '单位', value: source.unit, minLen: 1, maxLen: 20, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
@@ -819,7 +820,8 @@ const XMLStandard = (function () {
         //如果是“投标”,且采用了指数法,则导出;如果采用了信息价差额法,则导出,但定值权重A取1,变值权重B、基本价格指数、现行价格指数取0。
         function ExponentialGljDetail(adjustType, source) {
             let attrs = [
-                {name: '关联材料号', value: getGljCode(source.id), minLen: 1, maxLen: 20, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
+                // getGljCode(source.id)
+                {name: '关联材料号', value: source.code, minLen: 1, maxLen: 20, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
                 {name: '名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true},
                 {name: '规格', value: source.specs, maxLen: 255, whiteSpace: _config.WHITE_SPACE.COLLAPSE},
                 {name: '变值权重B', value: adjustType === _config.ADJUST_TYPE.coe ? source.varWeight : '0', type: _config.TYPE.DECIMAL, required: true},
@@ -1393,8 +1395,8 @@ const XMLStandard = (function () {
                         continue;
                     }
                     let gljSource = {
-                        //code: rGlj.code,
-                        code: getGljCode(rGlj.projectGLJID),
+                        code: rGlj.code,
+                        //code: getGljCode(rGlj.projectGLJID),
                         quantity: rGlj.quantity,
                         totalQuantity: gljUtil.getTotalQuantity(rGlj,  rationData, decimal.glj.quantity, decimal.ration.quantity)
                     };
@@ -1948,8 +1950,8 @@ const XMLStandard = (function () {
                         feeType = '4';
                     }
                     let gljSource = {
-                        //code: glj.code,
-                        code: getGljCode(glj.id),
+                        code: glj.code,
+                        //code: getGljCode(glj.id),
                         name: glj.name,
                         specs: glj.specs,
                         unit: glj.unit,
@@ -1982,7 +1984,11 @@ const XMLStandard = (function () {
                         for (let ratio of ratioData) {
                             let pGLJ = detail.projectGLJ.datas.gljList.find(d => d.original_code === ratio.code);
                             if (pGLJ) {
-                                let gljRatio = new GljRatio({code: getGljCode(pGLJ.id), quantity: ratio.consumption});
+                                let gljRatio = new GljRatio({
+                                    code: pGLJ.code,
+                                    //code: getGljCode(pGLJ.id),
+                                    quantity: ratio.consumption
+                                });
                                 gljEle.children.push(gljRatio);
                             }
                         }
@@ -1990,7 +1996,8 @@ const XMLStandard = (function () {
                     gljSummary.children.push(gljEle);
                     gljSource.totalPrice = scMathUtil.roundForObj(gljSource.quantity * gljSource.marketPrice,
                         detail.projectInfo.property.decimal.bills.totalPrice);
-                    //评标和暂估材料表下的材料明细中的人材机代码,要求单位工程内唯一,由于人材机汇总也有这个限制,所以这里不再处理
+                    //评标和暂估材料表下的材料明细中的人材机代码,要求单位工程内唯一,由于人材机汇总也有这个限制,所以
+                    // 这里不再处理
                     if (glj.is_eval_material) { //评标
                         gljSource.serialNo = evalBidSeq++;
                         evalBidMaterial.children.push(new MaterialDetail('evalBidMaterial', gljSource));