页面修改

src/components/Ticketing/TicketManager.vue

@@ -1529,6 +1529,7 @@
                               <th>已配数量</th>
                               <th>是否住宿</th>
                               <th>联运备注</th>
+                              <th>票务备注</th>
                             </tr>
                             <tr v-for="(unionItem,x) in item.UnionDetailList" :key="x">
                               <td>{{unionItem.UnionCityName}}</td>
@@ -1540,6 +1541,7 @@
                                 <span v-else>否</span>
                               </td>
                               <td>{{unionItem.UnionRemark}}</td>
+                              <td>{{unionItem.Notes}}</td>
                             </tr>
                           </table>
                           <p slot="reference" class="_wz _yiyong">联运</p>
@@ -3449,7 +3451,7 @@
         }
         this.loading = true;
         this.apipost(
-          "AirTicket_get_GetPageList",
+          "AirTicket_get_GetNewPageList",
           this.msg,
           res => {
             this.loading = false;

src/components/Ticketing/TicketTransport.vue

 <style>
   @import "../../assets/css/newTravelManager.css";
-.DT_rightList {
-  float: left;
-  font-size: 12px;
-  width:100%;
-  margin-top: 10px;
-}
-.DT_rightList ._Checked {
-  padding: 5px 10px;
-  border-radius: 3px;
-  margin-left: 10px;
-}
-/*未选中的状态*/
-.DT_rightList .NoChecked {
-  cursor: pointer;
-  background-color: #c0ebd1;
-}
 
-/*选中的状态*/
-.DT_rightList .YesChecked {
-  cursor: pointer;
-  background-color: #E95252;
-  color:#fff;
-}
+  .DT_rightList {
+    float: left;
+    font-size: 12px;
+    width: 100%;
+    margin-top: 10px;
+  }
 
-.DT_rightList .DT_Table {
-  width: 1100px;
-  border-collapse: collapse;
-}
+  .DT_rightList ._Checked {
+    padding: 5px 10px;
+    border-radius: 3px;
+    margin-left: 10px;
+  }
 
-.DT_rightList .DT_Table tr td {
-  border: 1px solid #e5e5e5;
-}
+  /*未选中的状态*/
+  .DT_rightList .NoChecked {
+    cursor: pointer;
+    background-color: #c0ebd1;
+  }
 
-.DT_rightList .TMTitle {
-  margin-bottom: 20px;
-}
+  /*选中的状态*/
+  .DT_rightList .YesChecked {
+    cursor: pointer;
+    background-color: #E95252;
+    color: #fff;
+  }
+
+  .DT_rightList .DT_Table {
+    width: 1100px;
+    border-collapse: collapse;
+  }
+
+  .DT_rightList .DT_Table tr td {
+    border: 1px solid #e5e5e5;
+  }
+
+  .DT_rightList .TMTitle {
+    margin-bottom: 20px;
+  }
+
+  .DT_rightList .singeRowTable tr:hover {
+    background-color: #fff !important;
+  }
+
+  .DT_rightList .singeRowTable tr:nth-child(2n + 1) {
+    background-color: #fff !important;
+  }
+
+  .DT_rightList .el-button.is-circle {
+    padding: 3px;
+  }
+
+  .DT_ConbinBtn {
+    margin: 10px 0 0 0;
+    padding: 0 10px;
+    height: 25px;
+  }
+
+  .DT_saveBtn {
+    margin: 10px 0 0 165px;
+  }
+
+  .Distri_TeamDayList {
+    display: inline-block;
+  }
 
-.DT_rightList .singeRowTable tr:hover {
-  background-color: #fff !important;
-}
-.DT_rightList .singeRowTable tr:nth-child(2n + 1) {
-  background-color: #fff !important;
-}
-.DT_rightList .el-button.is-circle{
-  padding: 3px;
-}
-.DT_ConbinBtn{
-  margin:10px 0 0 0;
-  padding:0 10px;
-  height:25px;
-}
-.DT_saveBtn{
-  margin:10px 0 0 165px;
-}
-.Distri_TeamDayList{
-  display: inline-block;
-}
 </style>
 <template>
   <div class="clearfix">
@@ -94,22 +103,27 @@
             <th width="110">
               配置数量
             </th>
+            <th width="400">
+              票务备注
+            </th>
           </tr>
         </thead>
         <template v-if="UnionList&&UnionList.length>0">
-          <tbody v-for="(item,index) in UnionList" :key="item.subCode">
+          <tbody v-for="(item,index) in UnionList" :key="index">
             <tr>
               <td rowspan="2">
                 <el-select class="w120" filterable v-model="item.UnionBranchId" :disabled="true">
                   <el-option label='请选择' :value="defaultBranchId"></el-option>
-                  <el-option v-for="subItem in CompanyList" :label='subItem.BName' :value='subItem.Id' :key="subItem.Id">
+                  <el-option v-for="subItem in CompanyList" :label='subItem.BName' :value='subItem.Id'
+                    :key="subItem.Id">
                   </el-option>
                 </el-select>
               </td>
               <td rowspan="2">
                 <el-select class="w80" filterable v-model="item.UnionCityId" :disabled="true">
                   <el-option label='请选择' :value="selectDefauleValue"></el-option>
-                  <el-option v-for="subItem in cityList" :label='subItem.Name' :value='subItem.ID' :key="subItem.subCode">
+                  <el-option v-for="subItem in cityList" :label='subItem.Name' :value='subItem.ID'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
@@ -118,21 +132,25 @@
               </td>
               <td>
                 <el-select class="w95" filterable v-model="item.DayNum" :disabled="true">
-                  <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID' :key="subItem.subCode">
+                  <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
               <td>
-                <el-select class="w180" filterable v-model="item.AirLineId" @change="airLineSelectChange(item,item.AirLineId,1)">
+                <el-select class="w180" filterable v-model="item.AirLineId"
+                  @change="airLineSelectChange(item,item.AirLineId,1)">
                   <el-option label='请选择' :value="selectDefauleValue"></el-option>
-                  <el-option v-for="subItem in AirlineList" :label='subItem.AlName' :value='subItem.AirLineId' :key="subItem.subCode">
+                  <el-option v-for="subItem in AirlineList" :label='subItem.AlName' :value='subItem.AirLineId'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
               <td>
                 <el-select class="w200" filterable v-model="item.FlightId">
                   <el-option label='请选择' :value="selectDefauleValue"></el-option>
-                  <el-option v-for="subItem in item.FlightList" :label='subItem.Flight_number' :value='subItem.ID' :key="subItem.subCode">
+                  <el-option v-for="subItem in item.FlightList" :label='subItem.Flight_number' :value='subItem.ID'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
@@ -141,24 +159,33 @@
                   :false-label="UnCheckedVaule" :disabled="true"></el-checkbox>
               </td>
               <td>
-                <el-input class="w95" v-model="item.AddGoCostPrice" @keyup.native="checkPrice(item,'AddGoCostPrice',true)"></el-input>
+                <el-input class="w95" v-model="item.AddGoCostPrice"
+                  @keyup.native="checkPrice(item,'AddGoCostPrice',true)"></el-input>
+              </td>
+              <td rowspan="2">
+                <el-input class="w95" v-model="item.ConfigNum" @keyup.native="checkInteger(item,'ConfigNum',true)">
+                </el-input>
               </td>
               <td rowspan="2">
-                <el-input class="w95" v-model="item.ConfigNum" @keyup.native="checkInteger(item,'ConfigNum',true)"></el-input>
+                <el-input type="textarea" v-model="item.Notes" placeholder="请填写票务备注">
+                </el-input>
               </td>
             </tr>
             <tr>
               <td>返程</td>
               <td>
                 <el-select class="w95" filterable v-model="item.BackDayNum" :disabled="true">
-                  <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID' :key="subItem.subCode">
+                  <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
               <td>
-                <el-select class="w180" filterable v-model="item.BackAirlineId" @change="airLineSelectChange(item,item.BackAirlineId,2)">
+                <el-select class="w180" filterable v-model="item.BackAirlineId"
+                  @change="airLineSelectChange(item,item.BackAirlineId,2)">
                   <el-option label='请选择' :value="selectDefauleValue"></el-option>
-                  <el-option v-for="subItem in AirlineList" :label='subItem.AlName' :value='subItem.AirLineId' :key="subItem.subCode">
+                  <el-option v-for="subItem in AirlineList" :label='subItem.AlName' :value='subItem.AirLineId'
+                    :key="subItem.subCode">
                   </el-option>
                 </el-select>
               </td>
@@ -171,7 +198,8 @@
                 </el-select>
               </td>
               <td>
-                <el-input class="w95" v-model="item.AddBackCostPrice" @keyup.native="checkPrice(item,'AddBackCostPrice',true)"></el-input>
+                <el-input class="w95" v-model="item.AddBackCostPrice"
+                  @keyup.native="checkPrice(item,'AddBackCostPrice',true)"></el-input>
               </td>
             </tr>
           </tbody>
@@ -239,7 +267,6 @@
           res => {
             this.cityList = res.data.data;
           },
-          err => {}
         );
       },
       getCompanyList() { //获取公司列表
@@ -249,18 +276,19 @@
           }
         }, err => {})
       },
-
       //获取联运数据
       getList() {
         this.UnionList = [];
         this.loading = true;
         this.apipost(
-          "AirTicket_get_GetUnionTicketListByTCID", {
+          "AirTicket_get_GetNewUnionTicketListByTCID", {
             TCID: this.TCID
           },
           res => {
+            this.loading = false;
             if (res.data.resultCode == 1) {
               var array = res.data.data;
+              console.log("array", array);
               if (array != null && array.length > 0) {
                 array.forEach(item => {
                   this.airLineSelectChange(item, item.AirLineId, 1);
@@ -269,12 +297,9 @@
               }
               this.UnionList = array;
             }
-            this.loading = false;
           }
         );
-
       },
-
       //初始化航空公司下拉
       initAirlines() {
         this.apipost(
@@ -286,7 +311,6 @@
               this.Warning(res.data.message);
             }
           },
-          err => {}
         );
       },
       //航空公司切换
@@ -325,15 +349,12 @@
               } else {
                 item.BackFlightList = tempArray;
               }
-
             } else {
               this.Warning(res.data.message);
             }
           },
-          err => {}
         );
       },
-
       //保存联运信息数据
       SaveUnion() {
         this.UnionList.forEach(item => {
@@ -344,7 +365,7 @@
           SaveData: this.UnionList,
           TCID: this.TCID
         };
-        this.apipost("AirTicket_get_SetUnionTicket", msg, res => {
+        this.apipost("AirTicket_get_SetNewUnionTicket", msg, res => {
           if (res.data.resultCode == 1) {
             this.Success("设置联运成功!");
             this.ArrList = [];
@@ -355,12 +376,14 @@
         });
       },
     },
-    mounted() {
+    created() {
+      this.getCompanyList();
+      this.getCityList()
       this.initAirlines();
       this.TCID = this.$route.query.tcid;
+    },
+    mounted() {
       this.getList();
-      this.getCompanyList();
-      this.getCityList()
     }
   };