Parcourir la source

Merge branch 'feature/merge1129' of Epans/modernDairy into master

duanxiaoduan il y a 1 an
Parent
commit
b904c79105

+ 11 - 0
src/api/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Home</title>
+</head>
+<body>
+    <h1>Spring Security SSO</h1>
+    <a href="securedPage">Login</a>
+</body>
+</html>

+ 11 - 0
src/api/securedPage.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Secured Page</title>
+</head>
+<body>
+    <h1>Secured Page</h1>
+    <span th:text="${name}"></span>
+</body>
+</html>

+ 1 - 1
src/views/cost/diesel/index.vue

@@ -1118,7 +1118,7 @@ export default {
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
-              message: '删除成功',
+              message: response.message,
               type: 'success',
               duration: 2000
             })

+ 2 - 2
src/views/custom/outStock/index.vue

@@ -1086,7 +1086,7 @@ export default {
       // isStorageExport: [],
       // isStorageSee: [],
       tableKey: 0,
-      useTypes: [{ id: '0', name: '领用出库' }, { id: '1', name: '手动出库' }, { id: '4', name: '调拨出库' }, { id: '5', name: '报废出库' }],
+      useTypes: [{ id: '0', name: '领用出库' }, { id: '1', name: '手动出库' }, { id: '4', name: '调拨出库' }, { id: '5', name: '报废出库' }, { id: '6', name: '青贮出库' }],
       // list2: [
       //   {
       //     orderNumber: '04.04.17.01.000069', stockName: '水箱', specifications: 'YC4E140-31', brand: '福田', supplier: '西安开泰门业有限', deviceName: '华农转盘机', equipmentNumber: '8.hnzpj004', unit: '个', storehouse: 'B-01-01', amount: '4', receivedQuantity: '3', currentStockQuantity: '1', price: '200', totalPrice: '600'
@@ -3329,4 +3329,4 @@ export default {
   .el-notification__content {
       white-space: pre-line !important;
     }
-</style>
+</style>