页面修改

src/components/WebSet/plug-in/choose_trip.vue

@@ -60,41 +60,50 @@
     background-size: cover;
   }
 
+  .choose_trip .title {
+    word-wrap: break-word;
+    word-break: normal;
+  }
+
 </style>
 <template>
   <div class="choose_trip">
     <table>
       <thead>
-        <span>
-          <em>{{$t('system.table_ssLine')}}</em>
+        <td>
+          {{$t('system.table_ssLine')}}
+        </td>
+        <td>
           <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
             @change="getLinePlaceList()">
             <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
             <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
               :key="item.LineID"></el-option>
           </el-select>
-        </span>
-
-        <span>
-          <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+        </td>
+        <td>
+          {{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}
+        </td>
+        <td>
           <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
             @change="getLineTeamList()">
             <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
             <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
               :key="item.LtID"></el-option>
           </el-select>
-        </span>
-
-        <span>
-          <em>{{$t('active.ad_xlmc')}}</em>
+        </td>
+        <td>
+          {{$t('active.ad_xlmc')}}
+        </td>
+        <td>
           <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
             <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
             <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
               :key="item.LtID"></el-option>
           </el-select>
-        </span>
-        <button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),GetList()">{{$t('pub.searchBtn')}}
-        </button>
+        </td>
+        <td><button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),GetList()">{{$t('pub.searchBtn')}}</button>
+        </td>
       </thead>
       <thead>
         <tr>
@@ -104,12 +113,9 @@
           <td>
             出發日
           </td>
-          <td>
+          <td colspan="2">
             團號
           </td>
-          <td>
-            團名
-          </td>
           <td>
             天數
           </td>
@@ -121,20 +127,17 @@
           </td>
         </tr>
       </thead>
-      <tbody>
-        <tr v-for="(item,index) in dataList" :key="index">
-          <td>
+      <tbody v-for="(item,index) in dataList" :key="index">
+        <tr>
+          <td rowspan="2">
             <el-checkbox v-model="item.Checked" @change="changeTrip(item)"></el-checkbox>
           </td>
           <td>
             {{item.StartDate}}
           </td>
-          <td>
+          <td colspan="2">
             {{item.TCNUM}}({{item.TCID}})
           </td>
-          <td>
-            {{item.Title}}
-          </td>
           <td>
             {{item.DayNum}}
           </td>
@@ -145,10 +148,19 @@
             {{(item.SurplusFSeat+item.SurplusCSeat+item.SurplusYSeat)}}
           </td>
         </tr>
+        <tr>
+
+          <td colspan="6">
+            團名：
+            <span class="title">
+              {{item.Title}}
+            </span>
+          </td>
+        </tr>
       </tbody>
       <tfoot>
         <tr>
-          <td>
+          <td colspan="7">
             <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
             <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
               layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
@@ -304,7 +316,6 @@
           if (item.Checked) {
             tempArray.push(item);
           }
-
         });
         return tempArray;
       }

src/components/WebSet/plug-in/group_dialog.vue

@@ -4,36 +4,43 @@
       <el-form-item label="標題">
         <el-input type="text" v-model="plugData.Title"></el-input>
       </el-form-item>
-      <el-form-item label="行程名稱">
-        <el-select v-model="plugData.QLineId" style="width:100%">
-          <el-option label="不限" :value="0"></el-option>
-          <el-option label="B2B前台菜单" :value="-1">B2B前台菜单</el-option>
-          <el-option label="个人中心菜单" :value="-2">个人中心菜单</el-option>
-        </el-select>
+      <el-form-item label="选择行程">
+        <el-button type="primary" size="small" @click="isShowTripDailog=true">选择行程</el-button>
       </el-form-item>
-      <el-button type="primary" size="small" @click="isShowTripDailog=true">选择行程</el-button>
-
       <el-row>
         <el-col :span="24">
           <el-table :data="plugData.GroupSelfItems" style="width: 100%">
-            <el-table-column label="出發日" width="180">
+            <el-table-column prop="StartDate" label="出發日" width="180">
             </el-table-column>
             <el-table-column label="團號" width="180">
+              <template slot-scope="scope">
+                {{scope.row.TCNUM}}({{scope.row.TCID}})
+              </template>
+            </el-table-column>
+            <el-table-column label="團名">
+              <template slot-scope="scope">
+                {{scope.row.Title}}
+              </template>
             </el-table-column>
-            <el-table-column prop="" label="團名">
+            <el-table-column prop="DayNum" label="天數">
             </el-table-column>
-            <el-table-column prop="" label="天數">
+            <el-table-column prop="Price" label="價格">
             </el-table-column>
-            <el-table-column prop="" label="價格">
+            <el-table-column prop="Seat" label="團位狀況">
             </el-table-column>
-            <el-table-column prop="" label="團位狀況">
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
+                  <el-button type="danger" icon="el-icon-delete" circle @click="deleteData(scope.$index)"></el-button>
+                </el-tooltip>
+              </template>
             </el-table-column>
           </el-table>
         </el-col>
       </el-row>
     </el-form>
 
-    <el-dialog title="选择行程" :visible.sync="isShowTripDailog" width="1000px">
+    <el-dialog title="选择行程" :visible.sync="isShowTripDailog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseTrip ref="chooseTrip" :IsMultiple="true"></chooseTrip>
       <span slot="footer" class="dialog-footer">
@@ -60,8 +67,39 @@
       //获取选择行程数据
       getChooseTripData() {
         var tempArray = this.$refs.chooseTrip.getChooseData();
-        console.log("tempArray", tempArray);
         this.isShowTripDailog = false;
+        if (tempArray && tempArray.length > 0) {
+          tempArray.forEach(item => {
+            var totalSeat = 0;
+            if (item.SurplusFSeat) {
+              totalSeat += item.SurplusFSeat;
+            }
+            if (item.SurplusCSeat) {
+              totalSeat += item.SurplusCSeat;
+            }
+
+            if (item.SurplusYSeat) {
+              totalSeat += item.SurplusYSeat;
+            }
+            var obj = {
+              StartDate: item.StartDate,
+              TCNUM: item.TCNUM,
+              TCID: item.TCID,
+              Title: item.Title,
+              DayNum: item.DayNum,
+              Price: item.B2BPrice,
+              Seat: totalSeat
+            };
+            this.plugData.GroupSelfItems.push(obj);
+          });
+        }
+      },
+      //删除行程
+      deleteData(index) {
+        var that = this;
+        that.Confirm("是否删除?", function () {
+          that.plugData.GroupSelfItems.splice(index, 1);
+        });
       }
     },
     mounted() {