问题修改

css/welcome/data_detail_list.css

@@ -11,7 +11,7 @@ body {
 
 .tag-box {
     justify-content: flex-start;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
 }
 
 .layui-btn-container .layui-btn {
@@ -19,9 +19,9 @@ body {
     padding: 0 20px;
 }
 
-#demo button {
+/* #demo button {
     margin-bottom: 5px;
-}
+} */
 
 .checkBtn {
     color: #409eff;

js/car_demand_plan/child/apply_plan_detail.js

@@ -267,13 +267,13 @@ function setOperRecordInfo(list, obj) {
             if (item.hours === 0 && item.minutes === 0) {
                 minutes = 1;
             }
-            if (item.auditType === 0 || item.auditType === 1) {
+            if (item.auditType === '0' || item.auditType === '1') {
                 dept = '项目部';
-            } else if (item.auditType === 2) {
+            } else if (item.auditType === '2') {
                 dept = '分公司';
-            } else if (item.auditType === 3) {
+            } else if (item.auditType === '3') {
                 dept = '项管中心';
-            } else if (item.auditType === 4) {
+            } else if (item.auditType === '4') {
                 dept = '机具公司';
             }
             let remark = setNullValue(item.auditRemark);

js/car_demand_plan/child/choose_car_or_user_list.js

@@ -51,7 +51,7 @@ function queryTable(type) {
 
 // 重载表格
 function reloadTable(pageNum) {
-    let params = {};
+    let params = {supId: objParam.supId};
     if (objParam.type === 1) {
         params.carNum = $('#carNum').val();
     } else {
@@ -70,7 +70,7 @@ function reloadTable(pageNum) {
 
 // 车辆表格数据
 function initTable() {
-    let url = dataUrl + "backstage/carCar/getCarPageList";
+    let url = dataUrl + "backstage/carCar/getCarListBySup";
     tableIns = table.render({
         elem: "#currentTableId",
         id: 'currentTableId',
@@ -81,7 +81,8 @@ function initTable() {
         url: url,
         where: {
             encryptedData: JSON.stringify({
-                'carNum': $('#carNum').val(),
+                carNum: $('#carNum').val(),
+                supId:objParam.supId
             }),
         },
         request: {
@@ -156,7 +157,7 @@ function initTable() {
 
 // 驾驶员表格数据
 function initTable2() {
-    let url = dataUrl + "backstage/carDriver/getDriverPageList";
+    let url = dataUrl + "backstage/carDriver/getDriverListBySup";
     tableIns = table.render({
         elem: "#currentTableId",
         id: 'currentTableId',
@@ -167,7 +168,8 @@ function initTable2() {
         url: url,
         where: {
             encryptedData: JSON.stringify({
-                'name': $('#name').val(),
+                name: $('#name').val(),
+                supId: objParam.supId
             }),
         },
         request: {

js/car_demand_plan/child/dispatch_car_edit_form.js

@@ -425,7 +425,8 @@ function chooseCarOrUser(type, formName) {
     }
     let params = {
         type: type,
-        formName: formName
+        formName: formName,
+        supId:objParam.supId
     };
     openIframeByParamObj("chooseCarOrUser", title, "./choose_car_or_user_list.html", '92%', '95%', params);
 }

js/car_demand_plan/child/dispatch_input_edit_form.js

@@ -421,7 +421,8 @@ function chooseCarOrUser(type, formName) {
     }
     let params = {
         type: type,
-        formName: formName
+        formName: formName,
+        supId:objParam.supId
     };
     openIframeByParamObj("chooseCarOrUser", title, "./choose_car_or_user_list.html", '92%', '95%', params);
 }

js/car_demand_plan/child/dispatch_input_form.js

@@ -503,7 +503,8 @@ function chooseCarOrUser(type, formName) {
     }
     let params = {
         type: type,
-        formName: formName
+        formName: formName,
+        supId:objParam.supId
     };
     openIframeByParamObj("chooseCarOrUser", title, "./choose_car_or_user_list.html", '92%', '95%', params);
 }

js/welcome/data_detail_list.js

@@ -15,6 +15,13 @@ function setParams(obj) {
     }
     setFilter(objParam.type);
     setFilterData(objParam.type);
+    if(objParam.type === 1 || objParam.type === 2){
+        let height = $('#demo').height();
+        if(height > 35){
+            $('#open').removeAttr('style');
+            $('#demo button').css('margin-bottom','5px');
+        }
+    }
     layui.config({
         base: "../../lib/layui-v2.9.18/layui/modules/", //此处路径请自行处理, 可以使用绝对路径
     }).extend({
@@ -162,7 +169,7 @@ function setFilter(type) {
             "<p>分公司：</p>" +
             "<div class='layui-btn-container tag' lay-filter='demo' id='demo'>" +
             "</div>" +
-            "<a id='close' onclick='showData(1)'><img src='../../images/welcome/close.png'>收起</a>" +
+            "<a id='close' onclick='showData(1)' style='display: none;'><img src='../../images/welcome/close.png'>收起</a>" +
             "<a id='open' onclick='showData(2)' style='display: none;'><img src='../../images/welcome/show.png'>展开</a>" +
             "</div>" +
             "<hr>" +
@@ -191,7 +198,7 @@ function setFilter(type) {
             "<p>分公司：</p>" +
             "<div class='layui-btn-container tag' lay-filter='demo' id='demo'>" +
             "</div>" +
-            "<a id='close' onclick='showData(1)'><img src='../../images/welcome/close.png'>收起</a>" +
+            "<a id='close' onclick='showData(1)' style='display: none;'><img src='../../images/welcome/close.png'>收起</a>" +
             "<a id='open' onclick='showData(2)' style='display: none;'><img src='../../images/welcome/show.png'>展开</a>" +
             "</div>" +
             "<hr>" +