Browse Source

bug fixed

zhangweicheng 6 years ago
parent
commit
3ce12c36a8

+ 1 - 1
modules/ration_glj/facade/ration_glj_facade.js

@@ -602,7 +602,7 @@ async function prepareExtData(projectID,compilation) {
 async function addGLJ(rgList,compilation) {
     let newRecodes = [];
     if (rgList.length <= 0) return {};
-    let [unitFileId,ext] = await  prepareExtData(rgList[0].projectGLJID,compilation);
+    let [unitFileId,ext] = await  prepareExtData(rgList[0].projectID,compilation);
     for (let g of rgList) {
         let projectGljModel = new GLJListModel();
         let result = await projectGljModel.addList(getGLJSearchInfo(g),unitFileId,ext);

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

@@ -183,7 +183,7 @@
                                   <div class="tab-pane active" id="subItems" role="tabpanel">
                                       <div class="main-data-bottom ovf-hidden" id="subSpread" style="display: none" tabindex="0"></div>
                                       <div class="main-data-bottom ovf-hidden" id="rgResize" style="width: 0.2%; height: 100%; resize:horizontal; cursor: w-resize; float: left; background: #F1F1F1"></div>
-                                      <div class="main-data-bottom ovf-hidden item_spread" id="replaceM" style="display: none" ></div>
+                                      <div class="item_spread main-data-bottom ovf-hidden " id="replaceM" style="display: none" ></div>
                                       <div class="main-data-bottom ovf-hidden" id="tabZMHS" style="display: none">
                                           <div class=" main-data-bottom ovf-hidden" style="width: 60%; float: left; margin: 0; padding:0;" id="coeSpread"></div>
                                           <div  id="zmhsResize" style="width: 0.2%; height: 100%; resize:horizontal; cursor: w-resize; float: left; background: #F1F1F1"></div>
@@ -317,7 +317,7 @@
                           <div class="tab-content" style="width: 99%; height: 100%; float: left">
                               <!--查找定位-->
                               <div class="tab-pane" id="locate">
-                                  <div class="sidebar-tools-bar container-fluid tools-bar-height-y">
+                                  <div class="sidebar-tools-bar container-fluid tools-bar-height-y" id="searchPanel">
                                       <div class="p-1 row">
                                           <div class="input-group input-group-sm col-12">
                                               <input type="text" class="form-control form-control-sm" placeholder="查找内容" value="">
@@ -327,15 +327,15 @@
                                           </div>
                                           <div class="form-group col-12 mb-1">
                                               <div class="form-check form-check-inline">
-                                                  <input class="form-check-input" type="radio" name="content_type" id="bills" value="option1">
+                                                  <input class="form-check-input" type="radio" name="content_type" id="bills" value="bills" checked = "true">
                                                   <label class="form-check-label" for="bills">分项/清单</label>
                                               </div>
                                               <div class="form-check form-check-inline">
-                                                  <input class="form-check-input" type="radio" name="content_type" id="ration" value="option2">
+                                                  <input class="form-check-input" type="radio" name="content_type" id="ration" value="ration">
                                                   <label class="form-check-label" for="ration">定额</label>
                                               </div>
                                               <div class="form-check form-check-inline">
-                                                  <input class="form-check-input" type="radio" name="content_type" id="raion_glj" value="option3">
+                                                  <input class="form-check-input" type="radio" name="content_type" id="raion_glj" value="ration_glj">
                                                   <label class="form-check-label" for="raion_glj">人材机</label>
                                               </div>
                                               <!--<div class="form-check form-check-inline">