diff --git a/src/api/consumable.js b/src/api/consumable.js
index ece7e69..d2dc2d2 100644
--- a/src/api/consumable.js
+++ b/src/api/consumable.js
@@ -154,17 +154,6 @@ export function deletetbProskuCon(data) {
     data
   });
 }
-/**
- * 查询耗材流水信息
- * @returns
- */
-export function gettbConsInfoFlow(data) {
-  return request({
-    url: "/api/viewConInfoFlow/get",
-    method: "post",
-    data
-  });
-}
 
 
 /**
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 4addd18..b96b87b 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,8 +1,10 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noredirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+        <span v-if="item.redirect === 'noredirect' || index == levelList.length - 1" class="no-redirect">{{
+          item.meta.title
+        }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -37,7 +39,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/data_statistics', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: '/', meta: { title: '首页' } }].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
@@ -73,6 +75,7 @@ export default {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
+
   .no-redirect {
     color: #97a8be;
     cursor: text;
diff --git a/src/views/devices/details.vue b/src/views/devices/details.vue
index 478a4bb..8a58cc4 100644
--- a/src/views/devices/details.vue
+++ b/src/views/devices/details.vue
@@ -49,6 +49,7 @@
                     <el-radio label="1">部分分类</el-radio>
                     <!-- <el-radio label="2">部分商品</el-radio> -->
                 </el-radio-group>
+                <div style="color: rgb(255, 77, 79);margin-left: 80px;">仅打印制作单[厨房]</div>
                 <div v-if="forms.classifyPrint == 1" style="margin-left:70px">
                     <!-- <el-tree :data="partList" show-checkbox node-key="id" ref="tree" :default-checked-keys="this.forms.categoryIds"
                         :props="{ children: 'childrenList', label: 'name' }">
@@ -115,9 +116,15 @@ export default {
         return {
             forms: {
                 sort: "0",
-                status: "0",
-                connectionType: "network", printType: [],
-                selectcheckbox: []
+                status: 1,
+                connectionType: "network",
+                selectcheckbox: [],
+
+                receiptSize: '58mm',
+                classifyPrint: '0',
+                printQty: 'm1^1',
+                printType: ["refund", 'handover', 'queue'],
+                printMethod: "all",
             },
             partList: []
         }
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index 4785e04..fc04b53 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -91,7 +91,7 @@
               <div class="line_item">
                 <div class="line_item_top">
                   <div>销售金额（元）</div>
-                  <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div>
+                  <!-- <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
                   <div class="gropress l"
@@ -112,7 +112,7 @@
               <div class="line_item">
                 <div class="line_item_top">
                   <div>充值金额（元）</div>
-                  <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div>
+                  <!-- <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
                   <div class="gropress l"
@@ -1118,7 +1118,6 @@ export default {
             width: 200px;
             color: #333;
             display: flex;
-            justify-content: space-between;
 
             &:not(:first-child) {
               margin-top: 20px;
@@ -1251,6 +1250,7 @@ export default {
           display: flex;
           align-items: center;
           color: #333;
+          font-size: 14px;
 
           .icon {
             font-size: 12px;
diff --git a/src/views/invoicing/components/addConsTakin.vue b/src/views/invoicing/components/addConsTakin.vue
index 84ca1ca..c848d00 100644
--- a/src/views/invoicing/components/addConsTakin.vue
+++ b/src/views/invoicing/components/addConsTakin.vue
@@ -133,10 +133,13 @@ export default {
                         this.form.lpNum = this.profitNumber
                         this.form.balance = this.form.stockNumber
                         this.loading = true
+                        this.form.conInfoId = this.form.id
+                        delete this.form['id'];
+                        console.log(this.form)
                         let res = await tbConCheck(this.form)
                         console.log(this.form);
                         this.$emit('success', res)
-                        // this.dialogVisible = false
+                        this.dialogVisible = false
                         this.loading = false
                         this.$notify({
                             title: '注意',
@@ -153,7 +156,7 @@ export default {
         },
         async show(obj) {
             let res = await hasPermission('允许耗材盘点');
-            if ( !res) { return; }
+            if (!res) { return; }
             this.form.remark = ''
             this.form.stocktakinNum = 0
             this.form.lpNum = 0
@@ -162,11 +165,10 @@ export default {
             this.form = Object.assign(this.form, obj)
             this.dialogVisible = true
             this.form.conInfoId = obj.consId
-            this.form.stockNumber = obj.balance * 1
+            this.form.stockNumber = obj.stockNumber
+            this.form.balance = obj.stockNumber
             this.form.price == null ? 0 : this.form.price
-
-            this.searhForm.skuId = obj.productId
-            this.searhForm.productId = obj.consId
+            this.searhForm.productId = obj.id
             this.getTableData()
         },
         // 分页大小改变
@@ -184,6 +186,7 @@ export default {
             try {
                 this.tableData.loading = true
                 const res = await tbConCheckGet({
+                    
                     page: this.tableData.page,
                     size: this.tableData.size,
                     conInfoId: this.searhForm.productId,
diff --git a/src/views/invoicing/components/cons_record_detail.vue b/src/views/invoicing/components/cons_record_detail.vue
index bb39f7c..7441104 100644
--- a/src/views/invoicing/components/cons_record_detail.vue
+++ b/src/views/invoicing/components/cons_record_detail.vue
@@ -76,7 +76,7 @@
 </template>
   
   <script>
-import { gettbConsInfoFlow } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 import orderDetail from "@/views/order_manage/components/orderDetail";
 export default {
     components:{
@@ -144,7 +144,7 @@ export default {
     async getTableData() {
       try {
         this.clickseetableData.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: this.clickseetableData.page,
           size: this.clickseetableData.size,
            ...this.query,
diff --git a/src/views/invoicing/consumable/cons_record copy.vue b/src/views/invoicing/consumable/cons_record copy.vue
index d603bc1..54ba8af 100644
--- a/src/views/invoicing/consumable/cons_record copy.vue	
+++ b/src/views/invoicing/consumable/cons_record copy.vue	
@@ -96,7 +96,7 @@
 </template>
 
 <script>
-import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 export default {
   data() {
     return {
@@ -139,7 +139,7 @@ export default {
     async getGroupConInfoFlow(row) {
       try {
         row.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: row.page,
           size: row.size,
           consId: row.consId,
@@ -157,7 +157,7 @@ export default {
             total: res.totalElements,
           });
         }
-        // const res = await gettbConsInfoFlow({
+        // const res = await gettbConsInfo({
         //   page: this.clickseetableData.page,
         //   size: this.clickseetableData.size,
         //   consId: "",
@@ -213,7 +213,7 @@ export default {
           conName: this.query.conName,
           shopId: localStorage.getItem("shopId"),
         });
-        // const res = await gettbConsInfoFlow({
+        // const res = await gettbConsInfo({
         //   page: this.clickseetableData.page,
         //   size: this.clickseetableData.size,
         //   consId: "",
diff --git a/src/views/invoicing/consumable/cons_record.vue b/src/views/invoicing/consumable/cons_record.vue
index d8d586c..1d6af6c 100644
--- a/src/views/invoicing/consumable/cons_record.vue
+++ b/src/views/invoicing/consumable/cons_record.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 import consRecordDetail from "../components/cons_record_detail";
 
 export default {
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 58b6124..7d35b21 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -38,7 +38,6 @@
           <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
           <el-button @click="routerGo('operation_in')">入库</el-button>
           <el-button @click="routerGo('operation_out')">出库</el-button>
-          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
           <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
           <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
           <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
@@ -264,8 +263,8 @@
                   <i class="el-icon-caret-bottom el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.productId"
-                    :command="item.productId">
+                  <el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.id"
+                    :command="item.id">
                     {{ item.name }}
                   </el-dropdown-item>
                 </el-dropdown-menu>
@@ -581,7 +580,6 @@ import {
   gettbConsType,
   gettbConsInfo,
   posttbConsInfo,
-  gettbConsInfoFlow,
   posttbConsInfostockIn,
   postapitbConsInfo,
   tbConsInfoFlowcount,
@@ -820,7 +818,7 @@ export default {
     // 状态切换
     async showChange(e, row) {
       await postapitbConsInfo([{
-        id: row.consId,
+        id: row.id,
         "isCheck": row.isCheck,
         shopId: localStorage.getItem('shopId')
       }])
@@ -845,7 +843,7 @@ export default {
         this.ruleForm[key] = row[key];
       }
       console.log(row, '调试1')
-      this.ruleForm.id = row.consId;
+      this.ruleForm.id = row.id;
       this.dialogshow = true;
     },
     // 重置查询
@@ -1146,7 +1144,7 @@ export default {
     async getConsRecord() {
       try {
         this.clickseetableData.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: this.clickseetableData.page,
           size: this.clickseetableData.size,
           // consId: this.consRecordItem.consId,
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 7062de5..612add2 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -382,15 +382,15 @@ export default {
         },
         // 切换入库内容
         tabChange(value, type) {
-        console.log(value,type)
+            console.log(value, type)
             this.shopTypesActive = type == 'in' ? 0 : 1
             this.inTabValue = value
             this.resetHandle()
             this.$refs.shopList.reset()//清除选项
             this.$refs.ConsumableList.reset()//清除选项
         },
-          // 切换类型
-          changeTypeEnum(index) {
+        // 切换类型
+        changeTypeEnum(index) {
             this.inTabs.forEach((i) => {
                 if (i.value == this.inTabValue) {
                     this.queryForm.type = i.type
@@ -487,9 +487,14 @@ export default {
                                 break;
                         }
                         this.queryFormLoading = false
-                        this.showResult = true
-                        this.$refs.shopList.reset()//清除选项
-                        this.$refs.ConsumableList.reset()//清除选项
+                        this.$message({
+                            message: '入库提交成功',
+                            type: 'success'
+                        })
+                        this.resetHandle()//初始化
+                        // this.showResult = true
+                        // this.$refs.shopList.reset()//清除选项
+                        // this.$refs.ConsumableList.reset()//清除选项
                     } catch (error) {
                         console.log(error)
                         this.queryFormLoading = false
@@ -522,7 +527,7 @@ export default {
             this.$refs.queryForm.resetFields()
             this.$refs.queryForm.resetFields()
         },
-      
+
         // 获取供应商列表
         async tbShopPurveyorGet() {
             try {
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index f10c465..6bdcf59 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -450,9 +450,14 @@ export default {
                                 break;
                         }
                         this.queryFormLoading = false
-                        this.showResult = true
-                        this.$refs.shopList.clearSelection()//清除选项
-                        this.$refs.ConsumableList.clearSelection()//清除选项
+                        this.$message({
+                            message: '出库提交成功',
+                            type: 'success'
+                        })
+                        this.resetHandle()//初始化
+                        // this.showResult = true
+                        // this.$refs.shopList.clearSelection()//清除选项
+                        // this.$refs.ConsumableList.clearSelection()//清除选项
                     } catch (error) {
                         console.log(error)
                         this.queryFormLoading = false
diff --git a/src/views/lineUp/index.vue b/src/views/lineUp/index.vue
index 6cf8e82..65a2c5e 100644
--- a/src/views/lineUp/index.vue
+++ b/src/views/lineUp/index.vue
@@ -56,7 +56,8 @@
                 <div v-if="profilepicturedata.state == 1" style="color: #52C41A;font-size: 16px;margin-top: 17px;">
                     已发送至用户<i class="el-icon-circle-check" style="color: #52C41A;"></i>
                 </div>
-                <div v-else style="color:#FF4D4F;font-size: 16px;margin-top: 17px;">用户未订阅消息 <i style="color: #FF4D4F;" class="el-icon-circle-close"></i></div>
+                <div v-else style="color:#FF4D4F;font-size: 16px;margin-top: 17px;">用户未订阅消息 <i style="color: #FF4D4F;"
+                        class="el-icon-circle-close"></i></div>
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button style="width: 176px;
@@ -77,7 +78,8 @@ border: 1px solid rgba(255,255,255,0.28);" @click="dialogConfirm(3)">过号</el-
         <el-dialog title="取号" :visible.sync="dialogVisibles" width="30%">
             <div>
                 <div style="color: #000;">选择桌型</div>
-                <ul class="lineUpBoxUl" style="margin-top: 10px;">
+                <ul class="lineUpBoxUl" :class="[tableData.records.length > 2 ? 'dfs' : 'dfas']"
+                    style="margin-top: 10px;">
                     <li v-for="item in tableData.records" :key="item.id" @click="selectTabletype = item"
                         :class="[[selectTabletype.id == item.id ? 'active' : '']]">
                         <div>{{ item.name }}</div>
@@ -341,7 +343,6 @@ li {
 
 .lineUpBoxList {
     width: 507px;
-    // flex: 0 0 50%;
     height: 148px;
     background: #FFFFFF;
     border-radius: 6px 6px 6px 6px;
@@ -376,7 +377,6 @@ li {
 
         >button:first-child {
             background: #FFFFFF;
-
             font-family: Source Han Sans CN, Source Han Sans CN;
             font-weight: 400;
             font-size: 14px;
@@ -388,6 +388,16 @@ li {
 
 }
 
+.dfs {
+    justify-content: space-between;
+}
+
+.dfas {
+    >li {
+        margin-right: 52px;
+    }
+}
+
 .lineUpBoxUl {
     display: flex;
     align-items: center;
@@ -399,7 +409,6 @@ li {
         width: 112px;
         height: 55px;
         text-align: center;
-        margin-right: 52px;
         position: relative;
 
         >div {
diff --git a/src/views/lineUp/record.vue b/src/views/lineUp/record.vue
index 7a2a556..2c246bf 100644
--- a/src/views/lineUp/record.vue
+++ b/src/views/lineUp/record.vue
@@ -15,7 +15,8 @@
                 <el-table-column label="手机号" prop="phone"> </el-table-column>
                 <el-table-column label="状态">
                     <template v-slot="scope">
-                        <span>{{ scope.row.state | stateFilter }}</span>
+                        <span style="font-weight: 400;font-size: 14px;"
+                            :style="{ color: scope.row.state == 2 ? '#3F9EFF' : '' }">{{ scope.row.state | stateFilter }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="时间" prop="callTime"> </el-table-column>
@@ -104,7 +105,7 @@ export default {
 
     &:hover {
         cursor: grab;
-    } 
+    }
 }
 
 .shop_info {