ソースを参照

导入完善取费专业

zhongzewei 6 年 前
コミット
90822459db

+ 3 - 0
modules/pm/facade/pm_facade.js

@@ -1443,6 +1443,9 @@ async function setupStdData(tenderData) {
             r.stdID = stdRation.ID;
             r.prefix = stdRation.rationRepId == tenderData.tender.defaultRationLib ? '' : '借';
             r.content = stdRation.jobContent;
+            if (stdRation.feeType) {
+                r.programID = stdRation.feeType;
+            }
         } else {
             r.from = 'cpt';
             r.prefix = '补';

+ 2 - 2
web/building_saas/main/html/main.html

@@ -2036,7 +2036,7 @@
                 </div>
                 <div class="form-group">
                     <div class="form-check ml-4">
-                        <input class="form-check-input" type="checkbox" value="2" id="ex-bid">
+                        <input class="form-check-input" type="checkbox" value="2" id="ex-bid" checked>
                         <label class="form-check-label" for="ex-bid">
                             招标工程量清单
                         </label>
@@ -2057,7 +2057,7 @@
                 </div>
                 <div class="form-group">
                     <div class="form-check ml-4">
-                        <input class="form-check-input" type="checkbox" value="1" id="ex-tender">
+                        <input class="form-check-input" type="checkbox" value="1" id="ex-tender" checked>
                         <label class="form-check-label" for="ex-tender">
                             投标文件
                         </label>

+ 1 - 0
web/building_saas/main/js/models/importStandardInterface.js

@@ -1465,6 +1465,7 @@ const ImportXML = (() => {
                 billsHasRations.forEach(bills => {
                     //处理定额
                     bills.rations.forEach(ration => {
+                        ration.programID = tenderData.property.engineering; //默认取定额取费类别,后台匹配到标准的再设置
                         ration.ID = uuid.v1();
                         ration.projectID = tenderData.ID;
                         ration.billsItemID = bills.ID;

+ 1 - 1
web/building_saas/main/js/views/project_view.js

@@ -3390,7 +3390,7 @@ $('#export').on('hide.bs.modal', function() {
     xmlObj = null;
     //恢复设置提示弹窗 因为是共用的alert
     $('#hintBox_caption').removeClass('export-check');
-    $('#export input[type="checkbox"]').prop('checked', false);
+    $('#export input[type="checkbox"]:eq(0)').prop('checked', true);
 });
 $('#export input[type="checkbox"]').click(function () {
     xmlObj = null;