Compare commits
	
		
			No commits in common. "9650b67bb1e2dd92ac911f046646f74c3880c6f7" and "6d0599644493672bc3f5ee8562881f2a8ed06fac" have entirely different histories.
		
	
	
		
			9650b67bb1
			...
			6d05996444
		
	
		
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 834 B | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 872 B | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 813 B | 
| @ -1,7 +1,7 @@ | |||||||
| <!-- 收银台订单--> | <!-- 收银台订单--> | ||||||
| <template> | <template> | ||||||
|   <div style=""> |   <div style=""> | ||||||
|     <div class="new-top" > |     <div class="card-change-1-search"> | ||||||
|       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> |       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> | ||||||
|         <el-form-item label=""> |         <el-form-item label=""> | ||||||
|           <el-input v-model="queryParams.orderNo" placeholder="流水编号"></el-input> |           <el-input v-model="queryParams.orderNo" placeholder="流水编号"></el-input> | ||||||
| @ -67,7 +67,7 @@ | |||||||
|             <el-option label="已退款" value="refund"/> |             <el-option label="已退款" value="refund"/> | ||||||
|           </el-select> |           </el-select> | ||||||
|         </el-form-item> |         </el-form-item> | ||||||
|         <el-form-item  style="float: right; margin-right: 0px "> |         <el-form-item class="f-button" style="text-align: right;"> | ||||||
|           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> |           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> | ||||||
|           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> |           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> | ||||||
| <!--          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>--> | <!--          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>--> | ||||||
| @ -260,6 +260,7 @@ | |||||||
|     <el-dialog |     <el-dialog | ||||||
|       title="订单信息" |       title="订单信息" | ||||||
|       :visible.sync="dialogVisible"> |       :visible.sync="dialogVisible"> | ||||||
|  | 
 | ||||||
|       <el-descriptions :title="'订单号:'+ordersInfo.orderNo"> |       <el-descriptions :title="'订单号:'+ordersInfo.orderNo"> | ||||||
|         <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item> |         <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item> | ||||||
|         <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item> |         <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item> | ||||||
| @ -524,7 +525,7 @@ import { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|   .el-form--inline .el-form-item { |   .el-form--inline .el-form-item { | ||||||
|    margin-bottom: 0px; |     margin-right: 44px; | ||||||
|   } |   } | ||||||
|   .icon-img{ |   .icon-img{ | ||||||
| 
 | 
 | ||||||
| @ -585,12 +586,5 @@ import { | |||||||
|     color: grey; |     color: grey; | ||||||
|     margin: 10px 0; |     margin: 10px 0; | ||||||
|   } |   } | ||||||
|   .new-top{ |  | ||||||
|     width: 98%; |  | ||||||
|     background: #FFFFFF; |  | ||||||
|     margin: 15px auto; |  | ||||||
|     height: 60px; |  | ||||||
|     padding: 5px; |  | ||||||
|   } |  | ||||||
| 
 | 
 | ||||||
| </style> | </style> | ||||||
|  | |||||||
| @ -158,7 +158,7 @@ | |||||||
| 
 | 
 | ||||||
|     <!-- 添加或修改对话框 --> |     <!-- 添加或修改对话框 --> | ||||||
|     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body> |     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body> | ||||||
|       <el-form ref="form" :model="form" :rules="rules" label-width="80px"> |       <el-form ref="form" :model="form" :rules="rules" label-width="120px"> | ||||||
| 
 | 
 | ||||||
|         <el-form-item label="车队名称" prop="fleetId"> |         <el-form-item label="车队名称" prop="fleetId"> | ||||||
|           <el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;"> |           <el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;"> | ||||||
| @ -490,7 +490,6 @@ export default { | |||||||
|       endTime: "", |       endTime: "", | ||||||
|       beginTime1: "", |       beginTime1: "", | ||||||
|       endTime1: "", |       endTime1: "", | ||||||
| 
 |  | ||||||
|       // 收银台订单列表 |       // 收银台订单列表 | ||||||
|       orderList: [], |       orderList: [], | ||||||
|       deptList: [], |       deptList: [], | ||||||
| @ -841,7 +840,7 @@ export default { | |||||||
| 
 | 
 | ||||||
| .table-box { | .table-box { | ||||||
|   width: 100%; |   width: 100%; | ||||||
|   height: 73.5vh; |   height: 73vh; | ||||||
|   overflow: auto; |   overflow: auto; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -185,19 +185,7 @@ | |||||||
|         </div> |         </div> | ||||||
|         <div style="overflow: auto; scrollbar-width: none; height: 74% "> |         <div style="overflow: auto; scrollbar-width: none; height: 74% "> | ||||||
|           <div class="hang-box" v-for="(item,index) in employeList" :key="index"> |           <div class="hang-box" v-for="(item,index) in employeList" :key="index"> | ||||||
| 
 |             <div style="width: 10%">{{index +1}}</div> | ||||||
|             <div style="width: 10%" v-if="index == 0"> |  | ||||||
|               <img src="../assets/images/one_icon.png"  style="width: 22px;height: 22px"> |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
|             </div> |  | ||||||
|             <div style="width: 10%" v-if="index == 1"> |  | ||||||
|               <img src="../assets/images/two_icon.png"  style="width: 22px;height: 22px"> |  | ||||||
|             </div> |  | ||||||
|             <div style="width: 10%" v-if="index == 2"> |  | ||||||
|               <img src="../assets/images/three_icon.png"  style="width: 22px;height: 22px"> |  | ||||||
|             </div> |  | ||||||
|             <div style="width: 10%" v-if="index>2">{{index +1}}</div> |  | ||||||
|             <div>{{ item.realName }}</div> |             <div>{{ item.realName }}</div> | ||||||
|             <div style="width: 25%">{{item.cardSum}}</div> |             <div style="width: 25%">{{item.cardSum}}</div> | ||||||
|             <div style="width: 25%">{{item.oilSum}}</div> |             <div style="width: 25%">{{item.oilSum}}</div> | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user