fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/controller/CashRegisterGoodsController.java

@@ -1,52 +0,0 @@
-package com.fuint.business.cashierGoods.controller;
-
-
-import com.fuint.business.cashierGoods.entity.MtGoods;
-import com.fuint.business.cashierGoods.service.CashRegisterGoodsService;
-import com.fuint.common.service.GoodsService;
-import com.fuint.common.util.TokenUtil;
-import com.fuint.framework.exception.BusinessCheckException;
-import com.fuint.framework.web.BaseController;
-import com.fuint.framework.web.ResponseObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 收银端 商品相关业务接口
- */
-@RestController
-@RequestMapping(value = "/cashRegisterGoods")
-public class CashRegisterGoodsController extends BaseController {
-
-    /**
-     * 商品服务接口
-     */
-    @Autowired
-    private CashRegisterGoodsService cashRegisterGoodsService;
-
-
-    /**
-     * 获取店铺相关商品列表
-     */
-    @ApiOperation(value = "获取商品列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
-
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("store_id", TokenUtil.getNowAccountInfo().getStoreId());
-        List<MtGoods> mtGoods = cashRegisterGoodsService.selectListByMap(map);
-
-        return getSuccessResult(mtGoods);
-    }
-
-
-}

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -326,7 +326,7 @@
               @fatherPendingOrdersName="fatherPendingOrdersName"
       ></pickUp>
       <span slot="footer" class="dialog-footer">
-         <el-button @click="pickUpTheOrder = false">取消</el-button>
+         <el-button type="primary" @click="pickUpTheOrder = false">取消</el-button>
         <!--        pendingOrdersList pickUpTheOrder = false pickUpTheOrder = false -->
          <el-button type="primary" @click="deletePendingOrdersList">作废</el-button>
         <el-button type="primary" @click="getPendingOrdersList">取单</el-button>
@@ -637,11 +637,6 @@ export default {
               name: ''
             }
             this.hangingAnOrder = false
-
-            this.$message({
-              message: '挂单成功',
-              type: 'success'
-            });
           }
 
         } else {
@@ -789,16 +784,8 @@ export default {
           return true // 保留不匹配的项
         })
         window.sessionStorage.setItem('pendingOrders', JSON.stringify(this.pendingOrdersList))
-
-        this.pickUpTheOrder = false
-
-        this.$message({
-          message: '取单成功',
-          type: 'success'
-        });
-
       } else {
-        this.$message.error('当前无存单  请存单后再取单')
+        this.$message.error('当前无存单  请存单后再作废')
       }
     },
     //作废 下拉框是子组件  子组件通过数据监听 将数据发送给父组件
@@ -812,10 +799,7 @@ export default {
         })
 
         window.sessionStorage.setItem('pendingOrders', JSON.stringify(this.pendingOrdersList))
-        this.$message({
+
-          message: '作废成功',
-          type: 'success'
-        });
       } else {
         this.$message.error('当前无存单  请存单后再作废')
       }

fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue

@@ -270,10 +270,10 @@
                            @click="getOrdersInfo(scope.row.id)"
                            type="text" plain round>详情
                 </el-button>
-<!--                <el-button style="color: #fe8c4a" size="mini"-->
+                <el-button style="color: #fe8c4a" size="mini"
-<!--                           @click="getOrdersInfo2(scope.row.id)"-->
+                           @click="getOrdersInfo2(scope.row.id)"
-<!--                           type="text" plain round>详情2-->
+                           type="text" plain round>详情2
-<!--                </el-button>-->
+                </el-button>
                 <el-button style="color: #fe8c4a" size="mini"
                            @click="patchwork(scope.row)"
                            type="text" plain round>补打小票