sunhao 5 years ago
parent
commit
fac271fa7b

+ 8 - 0
app/Http/Controllers/Admin/StatisticsController.php

@@ -2100,6 +2100,7 @@ class StatisticsController extends Controller
2100 2100
             1 => 'A仓',
2101 2101
             2 => 'B仓',
2102 2102
             3 => 'C仓',
2103
+            4 => 'D仓',
2103 2104
         );
2104 2105
         foreach($result as $k=>&$v){
2105 2106
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
@@ -2174,6 +2175,7 @@ class StatisticsController extends Controller
2174 2175
             1 => 'A仓',
2175 2176
             2 => 'B仓',
2176 2177
             3 => 'C仓',
2178
+            4 => 'D仓',
2177 2179
         );
2178 2180
         foreach($result as $k=>&$v){
2179 2181
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
@@ -2257,6 +2259,7 @@ class StatisticsController extends Controller
2257 2259
             1 => 'A仓',
2258 2260
             2 => 'B仓',
2259 2261
             3 => 'C仓',
2262
+            4 => 'D仓',
2260 2263
         );
2261 2264
         foreach($result as $k=>&$v){
2262 2265
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
@@ -2307,6 +2310,7 @@ class StatisticsController extends Controller
2307 2310
             1 => 'A仓',
2308 2311
             2 => 'B仓',
2309 2312
             3 => 'C仓',
2313
+            4 => 'D仓',
2310 2314
         );
2311 2315
         foreach($result as $k=>&$v){
2312 2316
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
@@ -2348,6 +2352,7 @@ class StatisticsController extends Controller
2348 2352
             1 => 'A仓',
2349 2353
             2 => 'B仓',
2350 2354
             3 => 'C仓',
2355
+            4 => 'D仓',
2351 2356
         );
2352 2357
         foreach($result as $k=>&$v){
2353 2358
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
@@ -2398,6 +2403,7 @@ class StatisticsController extends Controller
2398 2403
             1 => 'A仓',
2399 2404
             2 => 'B仓',
2400 2405
             3 => 'C仓',
2406
+            4 => 'D仓',
2401 2407
         );
2402 2408
         foreach($result as $k=>&$v){
2403 2409
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
@@ -4038,6 +4044,7 @@ class StatisticsController extends Controller
4038 4044
             1 => 'A仓',
4039 4045
             2 => 'B仓',
4040 4046
             3 => 'C仓',
4047
+            4 => 'D仓',
4041 4048
         );
4042 4049
         foreach($result as $k=>&$item){
4043 4050
             $item->warehouse = $wareArr[$item->warehouse];
@@ -4081,6 +4088,7 @@ class StatisticsController extends Controller
4081 4088
             1 => 'A仓',
4082 4089
             2 => 'B仓',
4083 4090
             3 => 'C仓',
4091
+            4 => 'D仓',
4084 4092
         );
4085 4093
         foreach($result as $k=>&$item){
4086 4094
             $item->warehouse = $wareArr[$item->warehouse];

+ 1 - 0
resources/views/order/ordercreate.blade.php

@@ -143,6 +143,7 @@
143 143
                             <option value="1" @if(old('warehouse')=='1') selected @endif>A仓库</option>                            
144 144
                             <option value="2" @if(old('warehouse')=='2') selected @endif>B仓库</option>  
145 145
                             <option value="3" @if(old('warehouse')=='3') selected @endif>C仓库</option>
146
+                            <option value="4" @if(old('warehouse')=='4') selected @endif>D仓库</option>
146 147
                             @else
147 148
                             <option value="3"  selected >C仓库</option>
148 149
                             @endif                            

+ 2 - 0
resources/views/order/orderedit.blade.php

@@ -149,6 +149,7 @@
149 149
                             <option value="1" @if($order['warehouse']=='1') selected @endif>A仓库</option>                            
150 150
                             <option value="2" @if($order['warehouse']=='2') selected @endif>B仓库</option>                            
151 151
                             <option value="3" @if($order['warehouse']=='3') selected @endif>C仓库</option>                            
152
+                            <option value="4" @if($order['warehouse']=='4') selected @endif>D仓库</option>                            
152 153
                         </select>
153 154
                     </span>
154 155
                 </div>
@@ -161,6 +162,7 @@
161 162
                     @if($order['warehouse']=='1') A仓库  @endif                          
162 163
                     @if($order['warehouse']=='2') B仓库 @endif                          
163 164
                     @if($order['warehouse']=='3') C仓库 @endif 
165
+                    @if($order['warehouse']=='4') D仓库 @endif 
164 166
                     <input type="hidden" name="warehouse" id='warehouse' value="{{$order['warehouse']}}"/>                         
165 167
 
166 168
                 </div>

+ 2 - 1
resources/views/order/orderlist.blade.php

@@ -43,6 +43,7 @@
43 43
                     <option value="2" @if($warehouse==2) selected @endif>B仓</option>
44 44
                     @endif
45 45
                     <option value="3" @if($warehouse==3) selected @endif>C仓</option>
46
+                    <option value="4" @if($warehouse==4) selected @endif>D仓</option>
46 47
 
47 48
                 </select> 
48 49
                 <div style="float:right">
@@ -158,7 +159,7 @@
158 159
                             </td>
159 160
                             @endif
160 161
                             @endif                          
161
-                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @else @endif</td>                            
162
+                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @elseif($a['warehouse']==4) D仓库 @else @endif</td>                            
162 163
                             <td>{{$a['receivedAmount']}}</td>                            
163 164
                             <td>{{$a['payment_type']}}</td>                            
164 165
                             <td>{{$a['createTime']}}</td> 

+ 1 - 1
resources/views/order/predictorderlist.blade.php

@@ -140,7 +140,7 @@
140 140
                             </td>
141 141
                             @endif
142 142
                             @endif                          
143
-                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @else @endif</td>                            
143
+                            <td>@if($a['warehouse']==1) A仓库 @elseif($a['warehouse']==2) B仓库 @elseif($a['warehouse']==3) C仓库 @elseif($a['warehouse']==4) D仓库 @else @endif</td>                            
144 144
                             <td>{{$a['receivedAmount']}}</td>                            
145 145
                             <td>{{$a['payment_type']}}</td>                            
146 146
                             <td>{{$a['createTime']}}</td> 

+ 1 - 0
resources/views/statistics/aftersaleFinanceList.blade.php

@@ -21,6 +21,7 @@
21 21
                     <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
22 22
                     <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
23 23
                     <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
24
+                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
24 25
                     
25 26
                 </select> 
26 27
                               

+ 1 - 0
resources/views/statistics/refundFinanceList.blade.php

@@ -21,6 +21,7 @@
21 21
                     <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
22 22
                     <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
23 23
                     <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
24
+                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
24 25
                     
25 26
                 </select> 
26 27
                               

+ 1 - 0
resources/views/statistics/sendFinanceList.blade.php

@@ -21,6 +21,7 @@
21 21
                     <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
22 22
                     <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
23 23
                     <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
24
+                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
24 25
                     
25 26
                 </select> 
26 27
                               

+ 1 - 0
resources/views/statistics/warehouseFinanceList.blade.php

@@ -10,6 +10,7 @@
10 10
                     <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
11 11
                     <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
12 12
                     <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
13
+                    <option value="4" @if($warehouse==4) selected @endif>D仓库</option>
13 14
                     
14 15
                 </select>                          
15 16
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>