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

src/components/Hotel/roomReservationsDetails.vue

@@ -61,7 +61,7 @@
                           {{lItem.UseTimeStr}}
                         </td>
                       <td style="width:280px;">
-                          <el-checkbox :checked="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox>
+                          <el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox>
                       </td>
                     </tr>
                     </template>
@@ -605,7 +605,6 @@
     methods: {
       MoreUpdate(subItem)
       {
-          subItem.IsChecked=!subItem.IsChecked;
           this.IsMoreUpdate=1;
       },
       //付款方式切换
@@ -764,6 +763,7 @@
                           subItem.ContractUrl=fileUrl;
                         }
                         subItem.IsChecked=false;
+                        this.$forceUpdate();
                    });
                 });
                 this.isShowPiliangPop=false;
@@ -772,6 +772,11 @@
             {
                 this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl =  fileUrl;
             }
+            // this.list.forEach((sItem,sIndex)=>{
+            //     sItem.HotelOrderList.forEach((subItem,subIndex)=>{
+            //         subItem.IsChecked=false;
+            //     });
+            // });
           this.IsMoreUpdate=0;
           this.$forceUpdate()
         })

src/components/SalesModule/planeTicketInquiry.vue

@@ -1414,7 +1414,7 @@
         <li>
           <span>
             <em>{{$t('hotel.hotel_SerialNumber')}}</em>
-            <el-input v-model="msg.ID" :placeholder="$t('fnc.jpbianhao')"></el-input>
+            <el-input v-model="msg.ID" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(msg,'ID')" maxlength="8" ></el-input>
           </span>
         </li>
         <li>
@@ -2251,11 +2251,18 @@
       },
       getList() {
         this.loading = true;
+        if(this.msg.ID=="")
+        {
+          this.msg.ID=0;
+        }
         this.apipost(
           "AirTicket_get_GetERPAirTicketPageList",
           this.msg,
           res => {
             this.loading = false;
+            if(this.msg.ID==0) {
+              this.msg.ID="";
+            }
             if (res.data.resultCode == 1) {
               this.total = res.data.data.count;
               this.dataList = res.data.data.pageData;

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -57,11 +57,11 @@
               <!--EnterTime 进店时间-->
             </td>
             <td class="more_td">
-              <el-input type="number" v-model="subItem.EnterNum" maxlength="3"></el-input>
+              <el-input type="number" v-model="subItem.EnterNum" maxlength="3" @keyup.native="checkInteger(subItem,'EnterNum')"  ></el-input>
               <!--EnterNum 进店人数-->
             </td>
             <td class="more_td _height_45">
-              <el-input type="number" v-model="subItem.TotalMoney"></el-input>
+              <el-input type="number" v-model="subItem.TotalMoney" @keyup.native="checkPrice(subItem,'TotalMoney')"></el-input>
               <!--TotalMoney 总金额【公司】-->
             </td>
             <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">

src/components/administrative/ContractManage.vue

@@ -79,19 +79,19 @@
         <li>
           <input
             type="button"
-            @click="goContract('onedayTripContract')"
+            @click="goContract('onedayTripContract',0,'一日游合同')"
             class="normalBtn"
             value="一日游合同"
           />
           <input
             type="button"
-            @click="goContract('DomesticTravelcontract')"
+            @click="goContract('DomesticTravelcontract',0,'境内旅游合同')"
             class="normalBtn"
             value="境内旅游合同"
           />
           <input
             type="button"
-            @click="goContract('SingleContract')"
+            @click="goContract('SingleContract',0,'单项委托合同')"
             class="normalBtn"
             value="单项委托合同"
           />
@@ -108,6 +108,7 @@
       <tr>
         <th width="80">编号</th>
         <th width="120">合同编号</th>
+        <th width="120">合同类型</th>
         <th width="150">客户名称</th>
         <th width="150">客户联系电话</th>
         <th width="150">客户地址</th>
@@ -119,6 +120,14 @@
       <tr v-for="(item, index) in dataList" :key="index">
         <td>{{ item.ID }}</td>
         <td>{{ item.T_ContractNum }}</td>
+        <td>
+          <template v-if="item.CType == 2">
+            境内旅游合同
+          </template>
+          <template v-else-if="item.CType == 3">
+            一日游合同
+          </template>
+        </td>
         <td>{{ item.Tourists_Name }}</td>
         <td>{{ item.Tourists_Tel }}</td>
         <td>{{ item.Tourists_Addres }}</td>
@@ -132,12 +141,22 @@
             content="修改"
             placement="top-start"
           >
-            <el-button
-              type="primary"
-              icon="el-icon-edit"
-              circle
-              @click="goContract('onedayTripContract', item.ID)"
-            ></el-button>
+            <template v-if="item.CType == 3">
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                @click="goContract('onedayTripContract', item.ID,'一日游合同')"
+              ></el-button>
+            </template>
+            <template v-else-if="item.CType == 2">
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                @click="goContract('DomesticTravelcontract', item.ID,'境内旅游合同')"
+              ></el-button>
+            </template>
           </el-tooltip>
           <el-tooltip
             class="item"
@@ -257,7 +276,7 @@ export default {
       this.msg.pageIndex = val;
       this.getList();
     },
-    goContract(path, Id) {
+    goContract(path, Id,title) {
       var nId = 0;
       if (Id && Id > 0) {
         nId = Id;
@@ -267,7 +286,7 @@ export default {
         query: {
           id: nId,
           blank: "y",
-          tab: "一日游合同"
+          tab: title
         }
       });
     }

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue

@@ -12,6 +12,9 @@
         <div v-if="isXuan === true">
             <i :class="'iconfont ' + icon.xuan" @click="toXuan"></i>
         </div>
+        <div v-if="isAdd === true" style="display:none;">
+            <i :class="'' + icon.add" @click="toAdd"></i>
+        </div>
         <div v-if="isDelete === true">
             <i :class="'iconfont ' + icon.delete" @click="toDelete"></i>
         </div>
@@ -75,6 +78,11 @@
                 type: Boolean,
                 default: true
             },
+            //是否显示添加
+            isAdd: {
+                type: Boolean,
+                default: true
+            },
             // 是否显示删除
             isDelete: {
                 type: Boolean,
@@ -100,7 +108,8 @@
                     rightZ: 'icon-right',
                     bottomY: 'icon-arrowdown',
                     bottomZ: 'icon-zhidi',
-                    reset: 'icon-zhongzhi'
+                    reset: 'icon-zhongzhi',
+                    add: 'el-icon-plus'
                 }
             }
         },
@@ -158,6 +167,11 @@
             },
             toReset: function () {
                 this.$emit('toReset', this.name, this.index1, this.index2)
+            },
+            //添加
+            toAdd:function()
+            {
+                 this.$emit('toAdd', this.name, this.index1, this.index2)
             }
         }
     }

src/components/onedayTripContract.vue

@@ -1628,7 +1628,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             var tempObj = res.data.data;
-            console.log(tempObj,'tempobj');
             this.CtObj.ID = tempObj.ID;
             this.CtObj.CType = tempObj.CType;
             this.CtObj.T_ContractNum = tempObj.T_ContractNum;
@@ -1766,7 +1765,6 @@ export default {
                 gItem.IsShow = 0;
               });
             }
-            console.log(this.CtObj.ContractGuestList,'this.CtObj.ContractGuestList');
             if (
               tempObj.ContractTripList &&
               tempObj.ContractTripList != null &&