Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2685,10 +2685,10 @@
                       <span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
                       </span>
                       <span v-if="fourthItem.TicketOutType==1"
-                        style="color:rgb(26, 168, 107);">{{fourthItem.TicketOutTypeStr}}
+                        style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}
                       </span>
-                      <span v-if="fourthItem.TicketOutType==2"
-                        style="color:blue;">{{fourthItem.TicketOutTypeStr}}
+                      <span v-else-if="fourthItem.TicketOutType==2"
+                        style="color:#67C23A">{{fourthItem.TicketOutTypeStr}}
                       </span>
                       <span v-else style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}}
                       </span>

src/components/orderCommon/order-form2.vue

@@ -586,7 +586,7 @@
           </el-form-item>
         </el-col>
         <!--报价单-->
-        <el-col :span="4">
+        <el-col :span="4" style="display:none;">
           <el-form-item label="报价单" prop="QuotationUrl" v-show="addMsg.GroupType == '2'">
             <div style="margin-bottom: 10px; width: 32%" v-loading="uploadLloading" element-loading-text="拼命上传中">
               <el-upload ref="my-upload" class="upload-demo" :http-request="uploadFileBtn" :multiple="true"
@@ -2013,10 +2013,10 @@
             this.Error("请填写行业类别！");
             return;
           }
-          if (this.addMsg.QuotationUrl == "") {
-            this.Error("请上传附件！");
-            return;
-          }
+          // if (this.addMsg.QuotationUrl == "") {
+          //   this.Error("请上传附件！");
+          //   return;
+          // }
         } // 选择联运，联运备注必填
         if (
           this.addMsg.IsIntermodal == 1 ||