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

src/components/Complaints/ComplaintsManage.vue

@@ -129,9 +129,17 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>日期</em>
+            <el-date-picker value-format="yyyy-MM-dd" v-model="queryMsg.startDate" type="date"></el-date-picker>
+            <el-date-picker value-format="yyyy-MM-dd" v-model="queryMsg.endDate" type="date"></el-date-picker>
+          </span>
+        </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="getList(),resetPageIndex()"/>&nbsp;
           <input type="button" class="normalBtn" value="新增" @click="goUrl('AddComplaints',0)"/>
+          <input type="button" class="normalBtn" value="导出"/>
         </li>
       </ul>
     </div>
@@ -168,6 +176,7 @@
           <th>状态</th>
           <th>应赔金额</th>
           <th>实赔金额</th>
+          <th>创建日期</th>
           <th>当前处理人</th>
           <th>处理人耗时</th>
           <th>总耗时</th>
@@ -188,6 +197,7 @@
           <td>{{item.DisposeStatusStr}}</td>
           <td>{{item.DisposeStatus===4?item.ShouldPayMoney:''}}</td>
           <td>{{item.DisposeStatus===4?item.BackMoney:''}}</td>
+          <td>{{item.CreateTime}}</td>
           <td>{{item.CurrentDealEmpName}}</td>
           <td>{{getTimeConsuming(item,1)}}</td>
           <td>{{getTimeConsuming(item,2)}}</td>
@@ -248,7 +258,9 @@
           OrderID: '',
           TCID: '',
           pageIndex: 1,
-          pageSize: 10
+          pageSize: 10,
+          startDate:'',
+          endDate:'',
         },
         complainStatistic: {}
       }
@@ -285,6 +297,7 @@
             this.queryCommonData.total = res.data.data.count
             this.queryCommonData.noData = !this.queryCommonData.total > 0
             this.queryCommonData.dataList = res.data.data.pageData
+            console.log(this.queryCommonData.dataList,'datalist');
           } else {
             this.Error(res.data.message)
           }

src/components/dmc/manager/dmcTotalTable.vue

@@ -225,7 +225,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
+                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay2',item,outItem,'领队报账')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
@@ -453,7 +453,7 @@
         this.$router.push({
           name: path,
           query: {
-            "id": obj.TCIDS,
+            "id": outItem.TCIDs,
             NewCombinationNum:outItem.NewCombinationNum,
             isUpdate: true,
             blank: 'y',