diff --git a/src/views/accountCenter/account/consume/index.vue b/src/views/accountCenter/account/consume/index.vue
index a49ee5ee..f4766161 100644
--- a/src/views/accountCenter/account/consume/index.vue
+++ b/src/views/accountCenter/account/consume/index.vue
@@ -95,13 +95,14 @@
         <el-table-column label="支付时间" align="center" prop="payTime" :show-overflow-tooltip="true"/>
         <el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true"/>
         <el-table-column label="交易类型" align="center" prop="tradeType" :show-overflow-tooltip="true" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.tradeType==10">充值</span>
+          <template slot-scope="scope"> 
+              <dict-tag :options="dict.type.sm_order_consume_type" :value="scope.row.tradeType"/>  
+            <!-- <span v-if="scope.row.tradeType==10">充值</span>
             <span v-if="scope.row.tradeType==20">补贴</span>
             <span v-if="scope.row.tradeType==30">提现</span>
             <span v-if="scope.row.tradeType==100">清空</span>
             <span v-if="scope.row.tradeType==110">消费</span>
-            <span v-if="scope.row.tradeType==130">消费退款</span>
+            <span v-if="scope.row.tradeType==130">消费退款</span> -->
           </template>
         </el-table-column>
         <el-table-column label="钱包类型" align="center" prop="walletId" :show-overflow-tooltip="true" width="100">
@@ -138,7 +139,7 @@
   import { accountFlowPageApi } from "@/api/accountCenter/consume";
   export default {
     name: "",
-    dicts: ['sys_user_type'], 
+    dicts: ['sys_user_type','sm_order_consume_type'], 
     data() {
       return {
         // 遮罩层
@@ -254,7 +255,7 @@
             console.log(this.dateRange) 
             let param = { 
                 ...this.queryParams, 
-                "tradeType":110,
+                // "tradeType":110,
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             }
diff --git a/src/views/accountCenter/account/wallet/returnRecord.vue b/src/views/accountCenter/account/wallet/returnRecord.vue
index a9a1556f..c3693f98 100644
--- a/src/views/accountCenter/account/wallet/returnRecord.vue
+++ b/src/views/accountCenter/account/wallet/returnRecord.vue
@@ -18,8 +18,8 @@
             <el-form-item label="关键字"> 
                 <el-input v-model="queryParams2.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
             </el-form-item>  
-            <el-form-item label="组织" prop="deptIds">  
-                <el-cascader v-model="queryParams2.deptIds"
+            <el-form-item label="组织" prop="deptIdList">  
+                <el-cascader v-model="queryParams2.deptIdList"
                 :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                 :props="{ 
                     multiple: true,
@@ -31,10 +31,7 @@
             </el-form-item>
             <el-form-item label="操作员">
                 <el-input v-model="queryParams2.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
-            </el-form-item>
-            <!-- <el-form-item label="订单号">
-                <el-input v-model="queryParams2.accTradeId" placeholder="请输入订单号" maxlength="20" clearable style="width: 240px"/>
-            </el-form-item> -->
+            </el-form-item> 
         
             <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -138,9 +135,8 @@
           pageNum: 1,
           pageSize: 10, 
           searchValue:null,  
-          deptIds:[],
-          createBy:null,
-          accTradeId:null,  
+          deptIdList:[],
+          createBy:null, 
         },    // 总条数
         total2: 0,
         //表格数据
@@ -187,9 +183,8 @@
                 pageNum: 1,
                 pageSize: 10, 
                 searchValue:null,  
-                deptIds:[], 
-                createBy:null,
-                accTradeId:null
+                deptIdList:[], 
+                createBy:null, 
             }
             this.resetForm("queryForm2"); 
             this.handleQuery();
@@ -198,16 +193,19 @@
         //补贴清空明细
         getList2() {
             this.loading = true;
-            let param = { 
-                ...this.queryParams2, 
+            let param = {  
+                "pageNum": this.queryParams2.pageNum,
+                "pageSize": this.queryParams2.pageSize,
+                "searchValue": this.queryParams2.searchValue,
+                "createBy": this.queryParams2.createBy,
+                "deptIdList": this.queryParams2.deptIdList, 
                 "orderState": 3,
                 "orderRefundState": 2,
                 "payState": 3,
                 "startDateTime":this.formatDate(this.dateRange[0]),
                 "endDateTime":this.formatDate(this.dateRange[1])
             }
-            this.tableListData2 = []
-            this.total2 = 0
+            this.tableListData2 = [] 
             orderHistoryListApi(param).then(response => {
                 this.tableListData2 = response.rows;
                 this.total2 = Number(response.total);
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index 74c6ee37..ba290272 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -215,7 +215,7 @@
           </el-table-column> -->
           <el-table-column label="营养信息名称" align="center" key="nutritionName" prop="nutritionName" :show-overflow-tooltip="true"/>
           <!-- <el-table-column label="条码" align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" width="150"/> -->
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="180">
             <template slot-scope="scope">
               <el-button
                 size="mini"
diff --git a/src/views/order/offlineManagement/index.vue b/src/views/order/offlineManagement/index.vue
index 96c278cf..f5ceb6bc 100644
--- a/src/views/order/offlineManagement/index.vue
+++ b/src/views/order/offlineManagement/index.vue
@@ -18,7 +18,7 @@
             <el-input v-model="queryParams.custSearchInfo" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 220px"/>
         </el-form-item>
         <el-form-item label="订单号">
-            <el-input v-model="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px"/>
+            <el-input v-model.number="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px"/>
         </el-form-item> 
         <!-- <el-form-item label="交易号">
             <el-input v-model="queryParams.tradeNo" placeholder="请输入交易号" maxlength="20" clearable style="width: 220px"/>
@@ -74,7 +74,7 @@
                     />
             </el-select>  
         </el-form-item>
-        <el-form-item label="支付方式">
+        <!-- <el-form-item label="支付方式">
             <el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px"> 
                 <el-option
                     v-for="dict in dict.type.sm_order_pay_type"
@@ -83,7 +83,7 @@
                     :value="Number(dict.value)"
                     />
             </el-select>  
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="用户类别">
             <el-select v-model="queryParams.psnType" style="width: 220px" clearable> 
                 <el-option
@@ -199,11 +199,11 @@
                 type="text" v-if="scope.row.orderState==1||scope.row.orderState==4"
                 @click="handleRefund(scope.row)" 
             >退单</el-button>
-            <el-button
+            <!-- <el-button
                 size="mini" 
                 type="text" v-if="scope.row.orderState==1"
                 @click="writeOffOrder(scope.row)" 
-            >核销</el-button>  
+            >核销</el-button>   -->
           </template>
         </el-table-column>
       </el-table>
@@ -224,35 +224,35 @@
                     <template slot="label">订单号</template>
                     {{orderInfoData.orderId}}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">设备订单号</template>
                     {{ orderInfoData.macOrderId }}
-                </el-descriptions-item>
-                <el-descriptions-item>
+                </el-descriptions-item> -->
+                <!-- <el-descriptions-item>
                     <template slot="label">订单来源</template>
                     
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">订餐员</template>
                     
-                </el-descriptions-item>
-                <el-descriptions-item>
+                </el-descriptions-item> -->
+                <!-- <el-descriptions-item>
                     <template slot="label">设备编号</template>
                     {{ orderInfoData.machineNum }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">设备名称</template>
                     {{ orderInfoData.deviceName }}
                 </el-descriptions-item>
 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">设备型号</template>
                     {{ orderInfoData.deviceModel }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">设备SN</template>
                     {{ orderInfoData.machineSn }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	所属区域</template>
                     {{ orderInfoData.areaName }}
@@ -268,12 +268,12 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">	用户姓名</template>
-                    {{ orderInfoData.custName }}
+                    {{ orderInfoData.nickName }}
                 </el-descriptions-item>
 
                 <el-descriptions-item>
                     <template slot="label">	用户编号</template>
-                    {{ orderInfoData.custNum }}
+                    {{ orderInfoData.userId }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">	用户手机号</template>
@@ -281,13 +281,13 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">	所属组织</template>
-                    {{ orderInfoData.orgFullName }}
+                    {{ orderInfoData.deptFullName }}
                 </el-descriptions-item>
 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	用户类别</template>
                     {{ orderInfoData.psnTypeName }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	就餐日期</template>
                     {{ orderInfoData.orderDate }}
@@ -297,15 +297,15 @@
                     {{ orderInfoData.mealtimeName }}
                 </el-descriptions-item>
 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	餐桌名称</template>
                     
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	订单金额</template> 
                     {{ (orderInfoData.payableAmount/100).toFixed(2) }}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	餐券名称</template>
                     {{ orderInfoData.couponName }}
                 </el-descriptions-item>
@@ -313,21 +313,21 @@
                 <el-descriptions-item>
                     <template slot="label">	餐券支付金额</template>
                     {{ (orderInfoData.couponAmount/100).toFixed(2) }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	实付金额</template>
                     {{ (orderInfoData.realAmount/100).toFixed(2) }}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	核身方式</template> 
                     <div v-for="item in nuclearModeOptions" :key="item.key" v-if="item.key==orderInfoData.nuClearMode">
                         {{ item.value }}
                     </div>
-                </el-descriptions-item>
+                </el-descriptions-item> -->
 
                 <el-descriptions-item>
                     <template slot="label">	支付方式</template>
-                    {{orderInfoData.payTypesStr}}
+                    <dict-tag :options="dict.type.sm_order_pay_type" :value="orderInfoData.payType"/> 
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">	下单时间</template>
@@ -340,34 +340,32 @@
 
                 <el-descriptions-item>
                     <template slot="label">	订单状态</template>
-                    <div v-for="item in orderStateOptions" :key="item.key" v-if="item.key==orderInfoData.orderStateMix">
-                        {{ item.value }}
-                    </div>
+                    <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> 
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	流水号</template>
                     {{ orderInfoData.mealCode }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	备注</template>
                     {{ orderInfoData.remark }}
                 </el-descriptions-item>
 
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	人脸照片</template>
                     无
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">	菜品图片</template>
                     无
-                </el-descriptions-item>
+                </el-descriptions-item> -->
             </el-descriptions>
             <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">菜品信息</div>
             <el-table :data="orderInfoData.orderDetailList">
-                <el-table-column label="菜品名称" align="center" prop="goodsDishesName" :show-overflow-tooltip="true"/>
-                <el-table-column label="单价(元)" align="center" prop="prefPrice" :show-overflow-tooltip="true">
+                <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
+                <el-table-column label="单价(元)" align="center" prop="salePrice" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
-                        <span>{{ (scope.row.prefPrice/100).toFixed(2) }}</span>
+                        <span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
                     </template> 
                 </el-table-column>
                 <el-table-column label="数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
@@ -376,19 +374,19 @@
                         <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
                     </template> 
                 </el-table-column>
-                <el-table-column label="退款数量" align="center" prop="goodsRefundNum" :show-overflow-tooltip="true"/>
+                <el-table-column label="退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
                 <el-table-column label="退款金额(元)" align="center" prop="refundAmount" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
                     </template> 
                 </el-table-column>
             </el-table>
-            <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">优惠明细</div>
+            <!-- <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">优惠明细</div>
             <el-table :data="orderInfoData.discountList">
                 <el-table-column label="优惠项名称" align="center" prop="" :show-overflow-tooltip="true"/>
                 <el-table-column label="变动类型" align="center" prop="" :show-overflow-tooltip="true"/>
                 <el-table-column label="优惠/上浮金额" align="center" prop="" :show-overflow-tooltip="true"/> 
-            </el-table>
+            </el-table> -->
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="open=false">确 定</el-button>
@@ -411,7 +409,7 @@
 
             <el-table :data="orderDetailList"  @selection-change="handleSelectionChange" v-if="refundType==1">
                 <el-table-column type="selection" width="50" align="center"/>
-                <el-table-column label="菜品名称" align="center" prop="goodsDishesName" :show-overflow-tooltip="true"/>
+                <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
                 <el-table-column label="菜品价格" align="center" prop="prefPrice" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.prefPrice/100).toFixed(2) }}</span>
@@ -424,7 +422,7 @@
                     </template> 
                 </el-table-column>
                 <el-table-column label="可退款数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
-                <el-table-column label="已退款数量" align="center" prop="goodsRefundNum" :show-overflow-tooltip="true"/>
+                <el-table-column label="已退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
                 <el-table-column label="退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
@@ -471,10 +469,10 @@
       <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
         <div class="remind-question">请问是否对以下可{{handleType}}订单进行{{handleType}}操作？</div>
         <div class="remind-title">可{{handleType}}订单 {{ableList.length}} 笔</div>
-        <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+        <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
 
         <div class="remind-title">不可{{handleType}}订单 {{unableList.length}}  笔</div>
-        <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+        <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
 
         <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
@@ -691,13 +689,14 @@
         },
         /** 修改按钮操作 */
         handleView(row) { 
-            let param = {
-                orderId:row.orderId
-            }
-            orderDetailInfoApi(param).then(response => {
-                this.orderInfoData = response.data
-            }); 
-            this.open = true; 
+            // let param = {
+            //     orderId:row.orderId
+            // }
+            // orderDetailInfoApi(param).then(response => {
+            //     this.orderInfoData = response.data
+            // }); 
+            this.orderInfoData = Object.assign({}, row) 
+            this.open = true;  
         },
         /** 部分退款按钮操作 */
         handleRefundPart(row) {
diff --git a/src/views/order/reserveManagement/index.vue b/src/views/order/reserveManagement/index.vue
index 0561505e..82733be9 100644
--- a/src/views/order/reserveManagement/index.vue
+++ b/src/views/order/reserveManagement/index.vue
@@ -18,7 +18,7 @@
           <el-input v-model="queryParams.custSearchInfo" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 220px"/>
       </el-form-item>
       <el-form-item label="订单号">
-          <el-input v-model="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px"/>
+          <el-input v-model.number="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px"/>
       </el-form-item>
       <el-form-item label="菜品名称">
           <el-input v-model="queryParams.goodsSearchInfo" placeholder="请输入菜品名称" maxlength="20" clearable style="width: 220px"/>
@@ -70,7 +70,7 @@
                 />
           </el-select>  
       </el-form-item>
-      <el-form-item label="支付方式">
+      <!-- <el-form-item label="支付方式">
           <el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px"> 
             <el-option
                 v-for="dict in dict.type.sm_order_pay_type"
@@ -79,7 +79,7 @@
                 :value="Number(dict.value)"
                 />
           </el-select>  
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="用户类别">
           <el-select v-model="queryParams.psnType" style="width: 220px" clearable> 
                 <el-option
@@ -208,7 +208,7 @@
           >部分退款</el-button>-->
           <el-button
             size="mini" 
-            type="text" v-if="scope.row.orderState==1||scope.row.orderState==4"
+            type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==4"
             @click="handleRefund(scope.row)" 
           >退单</el-button>
           <el-button
@@ -256,12 +256,12 @@
 
               <el-descriptions-item>
                   <template slot="label">	用户姓名</template>
-                  {{ orderInfoData.userId }}
+                  {{ orderInfoData.nickName }}
               </el-descriptions-item>
 
               <el-descriptions-item>
                   <template slot="label">	用户编号</template>
-                  {{ orderInfoData.nickName }}
+                  {{ orderInfoData.userId }}
               </el-descriptions-item>
               <el-descriptions-item>
                   <template slot="label">	用户手机号</template>
@@ -435,10 +435,10 @@
     <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
       <div class="remind-question">请问是否对以下可{{handleType}}订单进行{{handleType}}操作？</div>
       <div class="remind-title">可{{handleType}}订单 {{ableList.length}} 笔</div>
-      <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+      <div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
 
       <div class="remind-title">不可{{handleType}}订单 {{unableList.length}}  笔</div>
-      <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
+      <div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
 
       <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>