新增新品信息

src/components/common/choiceDmc.vue

@@ -7,35 +7,69 @@
       <el-tab-pane label="线路" name="4"></el-tab-pane>
     </el-tabs>
     <div>
-      <span>类型：</span>
-      <el-select v-if="activeName=='1'" size="mini" v-model="msg.HotelProductType"
-        @change="msg.pageIndex=1,getCommonSerch()" clearable @clear="msg.pageIndex=1,getCommonSerch()">
-        <el-option label="国际酒店" value='1'></el-option>
-        <el-option label="国内酒店" value='2'></el-option>
-      </el-select>
-      <el-select v-if="activeName=='2'" size="mini" v-model="msg.DinnerProductType"
-        @change="msg.pageIndex=1,getCommonSerch()" clearable @clear="msg.pageIndex=1,getCommonSerch()">
-        <el-option label="国际餐厅" value='0'></el-option>
-        <el-option label="国内餐厅" value='1'></el-option>
-      </el-select>
-      <el-select v-if="activeName=='3'" size="mini" v-model="msg.TicketProductType"
-        @change="msg.pageIndex=1,getCommonSerch()" clearable @clear="msg.pageIndex=1,getCommonSerch()">
-        <el-option label="国际景点" value='0'></el-option>
-        <el-option label="国内景点" value='1'></el-option>
-      </el-select>
-      <el-input size="mini" style="width:350px;" v-if="activeName!='4'" v-model="msg.Name" placeholder="根据名称搜索"
-        :clearable="true" @clear="msg.pageIndex=1,getCommonSerch()"
-        @keyup.enter.native="msg.pageIndex=1,getCommonSerch()">
-        <el-button slot="append" @click="msg.pageIndex=1,getCommonSerch()">搜索</el-button>
-      </el-input>
-      <template v-else>
-        <el-select size="mini" v-model="travelMsg.QTeamType" @change="msg.pageIndex=1,getCommonSerch()" clearable
+      <template v-if="activeName=='1'">
+        <span>类型：</span>
+        <el-select size="mini" v-model="msg.HotelProductType" @change="msg.pageIndex=1,getCommonSerch()" clearable
           @clear="msg.pageIndex=1,getCommonSerch()">
+          <el-option label="国际酒店" value='1'></el-option>
+          <el-option label="国内酒店" value='2'></el-option>
+        </el-select>
+        <el-input size="mini" style="width:350px;" v-model="msg.Name" placeholder="根据名称搜索" :clearable="true"
+          @clear="msg.pageIndex=1,getCommonSerch()" @keyup.enter.native="msg.pageIndex=1,getCommonSerch()">
+          <el-button slot="append" @click="msg.pageIndex=1,getCommonSerch()">搜索</el-button>
+        </el-input>
+      </template>
+      <template v-if="activeName=='2'">
+        <span>类型：</span>
+        <el-select size="mini" v-model="msg.DinnerProductType" @change="msg.pageIndex=1,getCommonSerch()" clearable
+          @clear="msg.pageIndex=1,getCommonSerch()">
+          <el-option label="国际餐厅" value='0'></el-option>
+          <el-option label="国内餐厅" value='1'></el-option>
+        </el-select>
+        <el-input size="mini" style="width:350px;" v-model="msg.Name" placeholder="根据名称搜索" :clearable="true"
+          @clear="msg.pageIndex=1,getCommonSerch()" @keyup.enter.native="msg.pageIndex=1,getCommonSerch()">
+          <el-button slot="append" @click="msg.pageIndex=1,getCommonSerch()">搜索</el-button>
+        </el-input>
+      </template>
+      <template v-if="activeName=='3'">
+        <span>类型：</span>
+        <el-select size="mini" v-model="msg.TicketProductType" @change="msg.pageIndex=1,getCommonSerch()" clearable
+          @clear="msg.pageIndex=1,getCommonSerch()">
+          <el-option label="国际景点" value='0'></el-option>
+          <el-option label="国内景点" value='1'></el-option>
+        </el-select>
+        <el-input size="mini" style="width:350px;" v-model="msg.Name" placeholder="根据名称搜索" :clearable="true"
+          @clear="msg.pageIndex=1,getCommonSerch()" @keyup.enter.native="msg.pageIndex=1,getCommonSerch()">
+          <el-button slot="append" @click="msg.pageIndex=1,getCommonSerch()">搜索</el-button>
+        </el-input>
+      </template>
+      <template v-if="activeName=='4'">
+        <span>类型：</span>
+        <el-select size="mini" v-model="travelMsg.QTeamType" clearable>
           <el-option label="常规团" value='0'></el-option>
           <el-option label="小包团" value='1'></el-option>
           <el-option label="一日游" value='2'></el-option>
           <el-option label="地接团" value='3'></el-option>
         </el-select>
+        <span>线路：</span>
+        <el-select size="mini" v-model="travelMsg.LineId" @change="getLineTeamList()" clearable filterable>
+          <el-option v-for="(item) in LineList" :key="item.LineID" :value="item.LineID" :label="item.LineName">
+          </el-option>
+        </el-select>
+        <span>系列：</span>
+        <el-select size="mini" v-model="travelMsg.ltID" clearable filterable>
+          <el-option v-for="(item) in LineTeamList" :key="item.LtID" :value="item.LtID" :label="item.LtName">
+          </el-option>
+        </el-select>
+        <br />
+        <span>出发时间：</span>
+        <el-date-picker v-model="travelMsg.QStartDate" size="mini" value-format="yyyy-MM-dd" type="date"
+          placeholder="出发日期">
+        </el-date-picker>
+        <el-date-picker v-model="travelMsg.QEndDate" size="mini" value-format="yyyy-MM-dd" type="date"
+          placeholder="结束日期">
+        </el-date-picker>
+        <el-button size="mini" icon="el-icon-search" @click="msg.pageIndex=1,getCommonSerch()">搜索</el-button>
       </template>
     </div>
     <template v-if="activeName=='1'">
@@ -143,6 +177,13 @@
         <el-table-column label="出发日期" width="100px">
           <template slot-scope="scope">{{ scope.row.StartDate }}</template>
         </el-table-column>
+        <el-table-column label="线路/系列" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.LineName }}
+            <br />
+            {{ scope.row.LtName }}
+          </template>
+        </el-table-column>
         <el-table-column prop="Title" label="名称">
           <template slot-scope="scope">
             <div flex="cross:center dir:left">
@@ -177,6 +218,10 @@
           pageSize: 15,
           Title: "",
           QTeamType: "", //团队使用
+          LineId: "", //线路Id
+          ltID: "", //系列Id
+          QStartDate: "", //开始日期
+          QEndDate: "", //结束日期
         },
         activeName: "1",
         currentPage: 1,
@@ -186,6 +231,8 @@
         selectRow2: [],
         selectRow3: [],
         selectRow4: [],
+        LineList: [], //线路
+        LineTeamList: [], //系列
         loading: false,
       };
     },
@@ -348,9 +395,33 @@
           this.$refs.multipleTable.clearSelection();
         }
       },
+      //获取线路列表
+      getLineList() {
+        this.apipost("/api/Hotel/GetLineList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.LineList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+      },
+      //获取系列列表
+      getLineTeamList() {
+        var postMsg = {
+          LineID: this.travelMsg.LineId
+        }
+        this.apipost("/api/Hotel/GetLineTeamList", postMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.LineTeamList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+      },
     },
     mounted() {
       this.getHotelPage();
+      this.getLineList();
     }
   };
 

src/components/sallCenter/plugin/goods.vue

@@ -497,6 +497,7 @@
             <el-form-item v-show="data.addGoodsType == 0" label="商品类型">
               <el-radio v-model="data.orderByType" :label="1">日期</el-radio>
               <el-radio v-model="data.orderByType" :label="2">点击量</el-radio>
+              <el-radio v-model="data.orderByType" :label="3">新品</el-radio>
             </el-form-item>
             <el-form-item v-show="data.addGoodsType == 1" label="商品列表">
               <draggable v-model="data.list" class="goods-list" style="display:flex;">