GaoYuPeng 3 年 前
コミット
08715d7ba9

+ 7 - 5
.eslintrc.js

@@ -171,10 +171,11 @@ module.exports = {
171 171
     }],
172 172
     'no-unreachable': 2,
173 173
     'no-unsafe-finally': 2,
174
-    'no-unused-vars': [2, {
175
-      'vars': 'all',
176
-      'args': 'none'
177
-    }],
174
+    // 'no-unused-vars': [2, {
175
+    //   'vars': 'all',
176
+    //   'args': 'none'
177
+    // }],
178
+    'no-unused-vars': 'off',
178 179
     'no-useless-call': 2,
179 180
     'no-useless-computed-key': 2,
180 181
     'no-useless-constructor': 2,
@@ -222,6 +223,7 @@ module.exports = {
222 223
     'object-curly-spacing': [2, 'always', {
223 224
       objectsInObjects: false
224 225
     }],
225
-    'array-bracket-spacing': [2, 'never']
226
+    'array-bracket-spacing': [2, 'never'],
227
+    'no-unused-vars': 'off'
226 228
   }
227 229
 }

+ 3 - 0
src/assets/style/public.scss

@@ -41,4 +41,7 @@ $prefix: d2;
41 41
   border-radius: 4px;
42 42
   font-size: 14px;
43 43
   position: relative;
44
+}
45
+.el-table {
46
+  color: #fff;
44 47
 }

+ 68 - 8
src/views/demo/warehouseShow/warehouseInfo/index.vue

@@ -110,14 +110,74 @@ export default {
110 110
       //表格字段
111 111
       cfInfoList: [
112 112
         {
113
-          branchOffice: "",
114
-          directLibrary: "",
115
-          subTreasury: "",
116
-          cfName: "",
117
-          keeper: "",
118
-          lxfs: "",
119
-          lastScan: "",
120
-          cfState: "",
113
+          branchOffice: "中储粮河南分公司",
114
+          directLibrary: "商丘直属库",
115
+          subTreasury: "宁陵粮油储备公司",
116
+          cfName: "1号仓",
117
+          keeper: "白端静",
118
+          lxfs: "13531314569",
119
+          lastScan: "2019-08-21 16:11:59",
120
+          cfState: "出库",
121
+        },
122
+        {
123
+          branchOffice: "中储粮河南分公司",
124
+          directLibrary: "商丘直属库",
125
+          subTreasury: "宁陵粮油储备公司",
126
+          cfName: "2号仓",
127
+          keeper: "申琪华",
128
+          lxfs: "13531314569",
129
+          lastScan: "2019-08-21 16:11:59",
130
+          cfState: "入库",
131
+        },
132
+        {
133
+          branchOffice: "中储粮河南分公司",
134
+          directLibrary: "商丘直属库",
135
+          subTreasury: "宁陵粮油储备公司",
136
+          cfName: "3号仓",
137
+          keeper: "文粟米",
138
+          lxfs: "13531314569",
139
+          lastScan: "2019-08-21 16:11:59",
140
+          cfState: "库存",
141
+        },
142
+        {
143
+          branchOffice: "中储粮河南分公司",
144
+          directLibrary: "商丘直属库",
145
+          subTreasury: "宁陵粮油储备公司",
146
+          cfName: "1号仓",
147
+          keeper: "贡子丹",
148
+          lxfs: "13531314569",
149
+          lastScan: "2019-08-21 16:11:59",
150
+          cfState: "入库",
151
+        },
152
+        {
153
+          branchOffice: "中储粮河南分公司",
154
+          directLibrary: "商丘直属库",
155
+          subTreasury: "宁陵粮油储备公司",
156
+          cfName: "2号仓",
157
+          keeper: "何依丝",
158
+          lxfs: "13531314569",
159
+          lastScan: "2019-08-21 16:11:59",
160
+          cfState: "入库",
161
+        },
162
+        {
163
+          branchOffice: "中储粮河南分公司",
164
+          directLibrary: "商丘直属库",
165
+          subTreasury: "宁陵粮油储备公司",
166
+          cfName: "3号仓",
167
+          keeper: "杜山灵",
168
+          lxfs: "13531314569",
169
+          lastScan: "2019-08-21 16:11:59",
170
+          cfState: "入库",
171
+        },
172
+        {
173
+          branchOffice: "中储粮河南分公司",
174
+          directLibrary: "商丘直属库",
175
+          subTreasury: "宁陵粮油储备公司",
176
+          cfName: "1号仓",
177
+          keeper: "邓楠楠",
178
+          lxfs: "13531314569",
179
+          lastScan: "2019-08-21 16:11:59",
180
+          cfState: "出库",
121 181
         },
122 182
       ],
123 183
       // 日期插件

+ 4 - 0
src/views/demo/warehouseShow/warehouseInfo/warehouseInfo-check.vue

@@ -255,6 +255,7 @@ export default {
255 255
   }
256 256
 }
257 257
 .main {
258
+  color: #fff;
258 259
   .head,
259 260
   .bottomHead {
260 261
     height: 25px;
@@ -271,6 +272,9 @@ export default {
271 272
   }
272 273
   .middle {
273 274
     margin: 20px 0 20px 20px;
275
+    .el-radio {
276
+      color: none;
277
+    }
274 278
   }
275 279
   .bottom {
276 280
     display: flex;