导出bug

web/building_saas/main/js/models/exportStandardInterface.js

@@ -616,7 +616,7 @@ const XMLStandard = (function () {
             let attrs = [
                 {name: '人材机代码', value: source.code, required: true, minLen: 1, maxLen: 20, whiteSpace: WHITE_SPACE.COLLAPSE},
                 {name: '消耗量', value: source.quantity, required: true, type: TYPE.DECIMAL},
-                {name: '总消耗量', value: source.totalQuantity, required: true, type: TYPE.DECIMAL},
+                {name: '数量', value: source.totalQuantity, required: true, type: TYPE.DECIMAL},
                 {name: '数量计算方式', value: 1, required: true, type: TYPE.INT, enumeration: ['1', '2']},
             ];
             element.call(this, '人材机含量', attrs);
@@ -634,8 +634,8 @@ const XMLStandard = (function () {
                 {name: '基价机械费合价', value: getFee(source.fees, 'machine.totalFee'), type: TYPE.NUM2, required: true},
                 {name: '定额机上人工基价调整单价', value: 0, type: TYPE.DECIMAL, required: true},
                 {name: '定额机上人工基价调整合价', value: 0, type: TYPE.NUM2, required: true},
-                {name: '未计材料单价', value: getFee(source.fees, 'unratedMaterial.unitFee'), type: TYPE.DECIMAL, required: true},
-                {name: '未计材料合价', value: getFee(source.fees, 'unratedMaterial.totalFee'), type: TYPE.NUM2, required: true},
+                {name: '未计价材料单价', value: getFee(source.fees, 'unratedMaterial.unitFee'), type: TYPE.DECIMAL, required: true},
+                {name: '未计价材料合价', value: getFee(source.fees, 'unratedMaterial.totalFee'), type: TYPE.NUM2, required: true},
                 {name: '人材机价差单价', value: scMathUtil.roundForObj(getFee(source.fees, 'labourDiff.unitFee') +
                     getFee(source.fees, 'materialDiff.unitFee') + getFee(source.fees, 'machineDiff.unitFee'), 2),
                     type: TYPE.DECIMAL, required: true},   //人材机价差通过人工、材料、机械价差相加得出
@@ -1880,9 +1880,6 @@ const XMLStandard = (function () {
                             feeType: FEE_TYPE[getNodeFlag(node)] || FEE_TYPE['0']
                         };
                         source.calcBaseState = transformCalcBaseState(detail, source.calcBase);
-                        /*if (source.feeType === '1800') {
-                            debugger;
-                        }*/
                         let formula = new FormulaCalcMeasure(source);
                         parent.children.push(formula);
                     }
@@ -2346,9 +2343,7 @@ const XMLStandard = (function () {
                     //如果是有[]的基数则转换为其简称，如“[定额人工费]”对应的检查是"RGF"
                     let calcBase = calcItem.dispExpr.replace(/\[[\u4e00-\u9fa5]+\]/g, str => rationBaseShort[str] ? rationBaseShort[str] : '');
                     let feeType = calcProgram.feeTypes.find(data => data.type === calcItem.fieldName);
-                    if (feeType) {
-                        feeType = feeType.code;
-                    }
+                    feeType = feeType ? feeType.code : '1800';
                     let source = {
                         serialNo: idx + 1,
                         rowCode: `F${idx + 1}`,

web/building_saas/pm/js/pm_newMain.js

@@ -2165,10 +2165,11 @@ $(document).ready(function() {
             let opts = data.options.split('@');
             $cell = $(`<select name="${data.key}" class="form-control form-control-sm"><option>请选择</option></select>`);
             for (let opt of opts) {
-                $cell.append($(`<option value="${opt}">${opt}</option>`));
+                $cell.append($(`<option ${data.value === opt ? 'selected' : ''} value="${opt}">${opt}</option>`));
             }
         } else {
-            $cell = $(`<input type="${cellType}" ${cellType === 'number' ? 'min="0"' : ''} name="${data.key}" class="form-control form-control-sm" placeholder="请输入">`);
+            $cell = $(`<input type="${cellType}" ${cellType === 'number' ? 'min="0"' : ''} name="${data.key}"
+                       value="${data.value}" class="form-control form-control-sm" placeholder="请输入">`);
         }
         let $row = $(`<div class="form-group row"></div>`),
             $col = $(`<div class="col"></div>`);