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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1591,6 +1591,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="联运备注" prop="UnionRemark">
+              <el-input v-model="addMsg.UnionRemark" type="textarea" maxlength="500"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <!-- 修改房型 -->
@@ -5143,6 +5150,13 @@
             return;
           }
         }
+        // 选择联运，联运备注必填
+        if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
+          if (!this.addMsg.UnionRemark) {
+            this.Error("请填写联运备注！");
+            return;
+          }
+        }
         //验证人数和机位数 20190807 修改 如果是不是单地接才判断
 
         if (this.addMsg.GroupType !== "4" && this.addMsg.GroupType !== "3") {

src/plug/index.js

@@ -120,7 +120,7 @@ export default {
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-         domainUrl = "http://192.168.10.226";
+         domainUrl = "http://192.168.10.226:8015";
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";

src/router/config.js

@@ -3243,6 +3243,14 @@ export default {
                 title: '产品查询'
               },
             },
+            { // 团信息列表
+              path: '/productOrderList',
+              name: 'productOrderList',
+              component: resolve => require(['@/components/SalesModule/productOrderList'], resolve),
+              meta: {
+                title: '产品查询'
+              },
+            },
             { // 销售 一日游产品查询
               path: '/productQueryOne',
               name: 'productQueryOne',