Merge remote-tracking branch 'origin/main'

js/car_demand_plan/child/dispatch_input_form.js

@@ -2,6 +2,7 @@ let idParam, objParam, fileList = new Array(), imgListUp = new Array();;
 let form, laydate, layer, upload, table, util;
 let pageNum = 1, tableIns; // 定义分页
 let formNum = 1;
+let carType;
 function setParams(obj) {
     objParam = JSON.parse(obj);
     $('#titleName').html(objParam.proName);;
@@ -186,10 +187,12 @@ function selectAll(selectStatus) {//传入参数（全选框的选中状态）
             n.checked = true;
             let item = JSON.parse($(this).parents('tr').attr('item'));
             if (item.type === '车辆') {
+                carType=1;
                 for (let i = 1; i <= item.needNum; i++) {
                     addCarFormData(item.modelId, i, item);
                 }
             } else if (item.type === '吊车') {
+                carType=2;
                 for (let i = 1; i <= item.needNum; i++) {
                     addCraneFormData(item.modelId, i, item.isDriverSet, item);
                 }
@@ -222,10 +225,12 @@ function sel(selectStatus, that, id) {
     if (selectStatus) {
         $(that).prop('checked', true);
         if (item.type === '车辆') {
+            carType=1;
             for (let i = 1; i <= item.needNum; i++) {
                 addCarFormData(item.modelId, i, item);
             }
         } else if (item.type === '吊车') {
+            carType=2;
             for (let i = 1; i <= item.needNum; i++) {
                 addCraneFormData(item.modelId, i, item.isDriverSet, item);
             }
@@ -233,11 +238,13 @@ function sel(selectStatus, that, id) {
     } else {
         $(that).prop('checked', false);
         if (item.type === '车辆') {
+            carType=1;
             removeCarFormData(item.modelId);
             fileList = fileList.filter(l => {
                 return l.class !== item.modelId;
             })
         } else if (item.type === '吊车') {
+            carType=2;
             removeCraneFormData(item.modelId);
             fileList = fileList.filter(l => {
                 return l.class !== item.modelId;
@@ -324,7 +331,7 @@ function submitApply(data) {
     if (num === 0) {
         return layer.msg('未添加派车详细信息', { icon: 7 });
     }
-    if (!flag) {
+    if (!flag && carType===1) {
         return layer.msg('派车详细信息存在未上传导航图的数据，请仔细检查', { icon: 7 });
     }
     let url = dataUrl + 'backstage/supDispatchCar/addDispatchCarData';
@@ -753,7 +760,7 @@ function addCraneFormData(id, num, isDriverSet, item) {
         '</form>' +
         '<div class="layui-upload" style="padding: 0 59px;">' +
         '<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;width: auto;border: none;">' +
-        '<p>导航截图<span class="required">*</span></p>' +
+        '<p>导航截图</p>' +
         '<div class="layui-upload-list uploader-list" style="overflow: auto;" id="uploader-list' + formNum + '"></div>' +
         '<div class="test" id="test' + formNum + '" style="margin-left: 10px;">' +
         '<img src="../../../images/add.png">' +