save

src/components/SalesModule/groupTourOrder.vue

@@ -1208,6 +1208,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>
     <!-- 修改房型 -->
@@ -4236,6 +4243,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") {
           if (

src/components/SalesModule/productOrderList.vue

@@ -277,6 +277,15 @@
             <el-input v-model="msg.Title" class="w150" clearable></el-input>
           </span>
         </li>
+        <li>
+          <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
+            <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
+              type="date"></el-date-picker>
+            -
+            <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
+              type="date"></el-date-picker>
+          </span>
+        </li>
       </ul>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -292,7 +301,7 @@
 </template>
 
 <script>
-  import productOrderList from "../orderCommon/productOrderList.vue";
+  import productOrderList from "./Common/productOrderList.vue";
 
   export default {
     data() {

src/components/SalesModule/productQuery.vue

@@ -976,7 +976,13 @@
                   <!-- <i class="el-icon-upload"></i>
                   <div class="el-upload__text">
                     将文件拖到此处，或
-                    <em>点击上传</em>
+                    <em>点击上传</em>  // 选择联运，联运备注必填
+        if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
+          if (!this.addMsg.UnionRemark) {
+            this.Error("请填写联运备注！");
+            return;
+          }
+        }
                   </div> -->
                   <el-button size="small" type="primary">点击上传</el-button>
                 </el-upload>
@@ -1009,6 +1015,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>
     <div class="productQuerySearch" v-if="!TCIDList">
@@ -3064,8 +3077,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/components/TravelManager/TravelList/RegistrationList.vue

@@ -1255,6 +1255,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>
 
@@ -5701,6 +5708,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") {
           if (

src/components/orderCommon/order-form.vue

@@ -488,6 +488,14 @@
           </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>
 </template>
@@ -1426,6 +1434,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") {
           if (this.addMsg.ChirdNoNeedBedNum == "") {

src/components/orderCommon/order-form2.vue

@@ -656,6 +656,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>
 </template>
@@ -1748,7 +1755,13 @@
             this.Error("请上传附件！");
             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") {
           if (this.addMsg.ChirdNoNeedBedNum == "") {