修改待申请改价提醒

src/components/index.vue

@@ -1936,7 +1936,7 @@
       this.ChangeThePriceList = DateList.filter(x => {
         return x == this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
       })
-      if (this.ChangeThePriceList.length > 0) {
+      if (this.ChangeThePriceList.length > 0) {//1-10每2小时提醒
         if ((!localStorage.getItem("ChangeThePriceDataTime") ||
             (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
           )) {
@@ -1957,6 +1957,13 @@
           }
         }, 7200000)
       }
+      else{//其余时间每天提醒
+        if ((!localStorage.getItem("ChangeThePriceDataTime") ||
+            (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
+          )) {
+          this.GetChangeThePrice()
+        }
+      }
     },
     created() {
       let DateTime = new Date();
@@ -2038,6 +2045,15 @@
       },
       // 获取改价提醒的数据
       GetChangeThePrice(type) {
+        let changedate = new Date();
+        changedate.setDate(changedate.getDate() + 1);
+        let Year = changedate.getFullYear()
+      let Month = changedate.getMonth()+1
+      let Months = Month > 9 ? Month : '0' + Month
+      let day = changedate.getDate()
+      let days =  day > 9 ? day : '0' + Month
+      let DepartETime = Year + '-' + Months + '-' + days
+        console.log("ddddddd",DepartETime);
         let msg = {
           pageIndex: 1,
           pagesize: 5,
@@ -2049,7 +2065,7 @@
           FinishsTime: "",
           FinishETime: "",
           DepartSTime: "",
-          DepartETime: this.ExamineThePriceMsg.DepartETime,
+          DepartETime: DepartETime,
           TCNUM: "",
           ProductName: "",
           CustomerWame: "",

src/components/myOrdersAllType/components/OrderList.vue

 <template>
   <div class="myAllTypeOrder">
-    <div v-if="pagesTitle=='申请'||pagesTitle=='审核'" v-for="(item,index) in OrderList">
+    <div v-if="pagesTitle=='申请'||pagesTitle=='审核'||pagesTitle=='查看'" v-for="(item,index) in OrderList">
       <el-table
       border
       ref="multipleTable"
@@ -146,66 +146,6 @@
       </el-table-column>
       <el-table-column  prop="DiscountsMoney" label="优惠">
       </el-table-column>
-      <!--
-      <template v-if="pagesTitle == '审核'||pagesTitle == '申请'">
-        <el-table-column
-          prop="ApplyForMoney"
-          label="申请改价金额"
-          min-width="120"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span> {{ scope.row.ApplyForMoney }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="ApplyForReason"
-          label="申请理由"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.ApplyForReason }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="pagesTitle=='审核'"
-          prop="ApplyForState"
-          label="改价状态"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span
-              >
-              <template v-if="scope.row.ApplyForState==1">
-                待主管审核
-              </template>
-              <template v-else-if="scope.row.ApplyForState==2">
-                主管审核通过
-              </template>
-              <template v-else-if="scope.row.ApplyForState==3">
-                审核通过
-              </template>
-              <template v-else-if="scope.row.ApplyForState==4">
-                驳回
-              </template>
-            </span>
-          </template>
-        </el-table-column>
-      </template> -->
-      <!--
-      <el-table-column
-        v-if="pagesTitle == '审核'&&userInfo.EmployeeId==1"
-        prop="StateName"
-        label="审核人"
-        show-overflow-tooltip
-        min-width="150"
-      >
-        <template slot-scope="scope">
-          <span v-if="scope.row.ManagerExamineName">{{scope.row.ManagerExamineName }}</span>
-          <p v-if="scene.row.ManagerExamineTimeStr">{{scene.row.ManagerExamineTimeStr}}</p>
-        </template>
-      </el-table-column> -->
       <el-table-column
         v-if="pagesTitle != '审核'"
         prop="StateName"
@@ -220,7 +160,7 @@
 
       <el-table-column label="操作" show-overflow-tooltip
       fixed="right"
-      min-width="105">
+      min-width="105" v-if="pagesTitle!='查看'">
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button> -->
           <template v-if="pagesTitle == '申请'">
@@ -268,7 +208,7 @@
           </template>
         </template>
       </el-table-column>
-      <template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请')
+      <template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请'||pagesTitle=='查看')
       &&(item.SaleRemarks||item.OP_Remarks||item.ApplyForState
       ||(userInfo.EmployeeId==1&&item.ManagerExamineName))">
         <div style="padding:10px;">
@@ -319,7 +259,7 @@
                 审核状态：
                 <span style="color: red;">已驳回</span>
               </span>
-              <template v-if="pagesTitle=='审核'">
+              <template v-if="pagesTitle=='审核'||pagesTitle=='查看'">
                 <span style="margin-left: 20px;">
                   改价状态：<span style="color: red;"
                   >
@@ -963,12 +903,12 @@ export default {
     },
     OrderList: {
       handler(val, oldVal) {
-        if((this.pagesTitle=='申请'||this.pagesTitle=='审核')&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
+        if((this.pagesTitle=='申请'||this.pagesTitle=='审核'||_this.pagesTitle=='查看')&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
         &&this.$route.query.OrderType
         &&this.$route.query.DepartSTime
         &&this.$route.query.DepartSTime
         &&val&&val.length==1){
-          if(this.pagesTitle=='审核'){
+          if(this.pagesTitle=='审核'||this.pagesTitle=='查看'){
             this.ckChangePrice(val[0],2)
           }else{
             this.ckChangePrice(val[0])

src/components/myOrdersAllType/components/allList.vue

@@ -113,22 +113,22 @@
                     </el-select>
                   </span>
                 </li>
-                <li v-if="Title!='申请'&&Title!='审核'">
+                <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                     <span><em>商品名称</em>
                     <el-input clearable type="" v-model="msg.ProductName" placeholder="请输入商品名称" class="w200"/>
                     </span>
                   </li>
-                  <li v-if="Title!='申请'&&Title!='审核'">
+                  <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                     <span><em>订单Id</em>
                     <el-input clearable type="Number" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
                     </span>
                   </li>
-                  <li v-if="Title!='申请'&&Title!='审核'">
+                  <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                       <span><em>团号</em>
                       <el-input clearable type="" v-model="msg.TCNUM" placeholder="请输入团号" class="w200"/>
                       </span>
                     </li>
-                    <template v-if="Title=='审核'">
+                    <template v-if="Title=='审核'||Title=='查看'">
                       <li>
                         <span>
                           <em>公司</em>
@@ -185,7 +185,7 @@
                       </el-select>
                     </span>
                   </li>
-                <li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'">
+                <li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'&&Title!='查看'">
                     <span>
                       <em>引流人</em>
                       <el-select filterable  v-model='msg.LureEmpId' class="w200" clearable>
@@ -198,7 +198,7 @@
                       </el-select>
                     </span>
                   </li>
-                <li v-if="Title!='审核'">
+                <li v-if="Title!='审核'&&Title!='查看'">
                   <span>
                     <em>订单类型</em>
                     <el-select v-model="msg.OrderType" class="w200 HworkInput">
@@ -208,7 +208,7 @@
                 </li>
 
 
-                <li v-if="Title!='申请'&&Title!='审核'">
+                <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                   <span>
                     <em>订单状态</em>
                     <el-select v-model='msg.OrderState' class="w200">
@@ -221,7 +221,7 @@
                     </el-select>
                   </span>
                 </li>
-                <li v-if="Title!='申请'&&Title!='审核'">
+                <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                   <span>
                     <em>收款状态</em>
                     <el-select  v-model='msg.Q_IsCollect' class="w200">
@@ -234,7 +234,7 @@
                   </span>
                 </li>
 
-                <li v-if="Title!='申请'&&Title!='审核'">
+                <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                   <span>
                     <em>报名时间</em>
                     <el-date-picker
@@ -262,7 +262,7 @@
                       </el-date-picker>
                   </span>
                 </li>
-                <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'">
+                <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                   <el-popover width="350" trigger="click">
                     <div class="groupSuperSearchLayer">
                       <p style="padding-bottom: 10px;">订单高级查询</p>
@@ -391,11 +391,11 @@
               v-loading="loading"
               @success="msg.pageIndex=1,msg2.pageIndex=1,GetList()"> </OrderList>
               <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
-              <el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle!='审核'" background
+              <el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle!='审核'&&pagesTitle!='查看'" background
                  @current-change="handleCurrentChange" :current-page.sync="currentPage"
                  layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
               </el-pagination>
-              <el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle=='审核'" background
+              <el-pagination v-if="OrderList&&OrderList.length>0&&(pagesTitle=='审核'||pagesTitle=='查看')" background
                 @current-change="handleCurrentChange2" :current-page.sync="currentPage2"
                 layout="total,prev, pager, next, jumper" :page-size="msg2.pageSize" :total=total2>
              </el-pagination>
@@ -732,13 +732,16 @@
               url = "CarSingle_post_GetChangePriceOrderPageList"
               this.msg.IsMyOrder = '1'
               this.msg.Q_IsCollect = '2'
-            }else if(this.pagesTitle=='审核'){
+            }else if(this.pagesTitle=='审核'||this.pagesTitle=='查看'){
               url = "CarSingle_post_GetExaminePriceOrderPageList"
             } else{
               this.msg.TicketStatus = ''
               this.msg.IsMyOrder = '0'
             }
-            msgObj = this.pagesTitle=='审核'?this.msg2:this.msg
+            msgObj = (this.pagesTitle=='审核'||this.pagesTitle=='查看')?this.msg2:this.msg
+            if(this.pagesTitle=='查看'){
+              msgObj.TicketStatus=5;
+            }
             this.apipost(url, msgObj,
               res => {
                 if (res.data.resultCode == 1) {
@@ -749,7 +752,7 @@
                   }
                   let data = res.data.data.pageData
                   this.OrderList = data;
-                  if(this.pagesTitle=='审核'){
+                  if(this.pagesTitle=='审核'||this.Title=='查看'){
                     this.total2 = res.data.data.count;
                   }else{
                     this.total = res.data.data.count;
@@ -846,9 +849,9 @@
         },
         mounted() {
           this.Title = this.pagesTitle
-          if(this.Title=='OP'||this.Title=='审核'){
+          if(this.Title=='OP'||this.Title=='审核'||this.Title=='查看'){
             this.getEmployee()
-            if(this.Title=='审核'){
+            if(this.Title=='审核'||this.Title=='查看'){
               this.getCompany()
             }
           }