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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1296,7 +1296,7 @@
     </div>
     <!-- 修改出团公司 -->
     <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
-      @Success="queryMsg.pageIndex=1,getControlList()" />
+      @Success="getControlList()" />
   </div>
 </template>
 <script>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -963,7 +963,7 @@
     </el-dialog>
     <!-- 修改出团公司 -->
     <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
-      @Success="queryMsg.pageIndex=1,getControlList()" />
+      @Success="getControlList()" />
   </div>
 </template>
 <script>

src/components/TravelManager/TravelList/components/EditLeaveGroup.vue

@@ -91,7 +91,7 @@ export default {
         return this.$message.error('请选择出团公司');
       }
       if(this.msg.ApplyResion==''){
-        return this.$message.error('请选择申请修改缘由');
+        return this.$message.error('请输入申请修改出团公司缘由');
       }
       this.loading = true
       this.apipost('travel_post_SetApplyPriceTeamType', this.msg, res => {

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -864,7 +864,7 @@
     </el-dialog>
     <!-- 修改出团公司 -->
     <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
-      @Success="queryMsg.pageIndex=1,getControlList()" />
+      @Success="getControlList()" />
   </div>
 </template>
 <script>

src/components/myOrdersAllType/components/OrderList.vue

@@ -596,17 +596,17 @@
       <el-form label-width="100px">
         <el-row>
           <el-col :span="4">
-            <el-form-item label="应收总金额" prop="">
+            <el-form-item label="申请改价金额" prop="" >
               <el-input
-                type="number"
+                type="number"  placeholder="最终的应收总金额"
                 v-model="changePriceMsg.Money"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="改价原因" prop="">
+            <el-form-item label="改价原因" prop="" >
               <el-input
-                type="textarea"
+                type="textarea"  placeholder="填写改价原因，不是价格哟"
                 v-model="changePriceMsg.ApplyForReason"
                 autosize
               ></el-input>

src/components/myOrdersAllType/components/allList.vue

@@ -811,18 +811,17 @@
             this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
           }else{
             var now = new Date();
-            var month = now.getMonth();//js获取到的是月份是 0-11 所以要加1
+            var month = now.getMonth()+1;//js获取到的是月份是 0-11 所以要加1
             var year = now.getFullYear();
-            var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
+            var nextMonthFirstDay = new Date([year,month ,1].join('-')).getTime();
             var oneDay = 1000 * 24 * 60 * 60;
             var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
             if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){
-              this.msg.DepartSTime = '2023-04-01';//[year,month,1].join('-')
+             
+                this.msg.DepartSTime = '2023-04-01';
               this.msg.DepartETime = [year,month,monthLast].join('-');
-              this.msg2.DepartSTime = '2023-04-01';//[year,month,1].join('-')
+              this.msg2.DepartSTime = '2023-04-01';
               this.msg2.DepartETime = [year,month,monthLast].join('-');
-              // this.msg.DepartSTime = this.getBeforeDate(200, new Date())
-              // this.msg.DepartETime = this.getBeforeDate(0, new Date())
             }
             this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
             this.msg.Q_IsCollect = '2'