Почетна Преглед Помоћ
Пријавите се
zhouzhendong
/
baoshi-was
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Merge branch 'master' into zengjun

# Conflicts:
#	public/js/app.js
#	resources/views/order/issue/index.blade.php
ajun пре 5 година
родитељ
e51a08b8ea 0c14f9500b
комит
e18e1d9051
16 измењених фајлова са 39 додато и 36 уклоњено
Подељен поглед Покажи статистику Diff
  1. 4 4
      public/js/app.js
  2. 5 2
      resources/sass/layout.scss
  3. 1 1
      resources/views/inventory/statement/allInventory.blade.php
  4. 2 2
      resources/views/inventory/statement/changeInventory.blade.php
  5. 1 1
      resources/views/inventory/stockInventory/mission.blade.php
  6. 1 1
      resources/views/layouts/app.blade.php
  7. 2 2
      resources/views/order/index/delivering.blade.php
  8. 2 2
      resources/views/order/issue/edit.blade.php
  9. 6 6
      resources/views/order/issue/index.blade.php
  10. 2 2
      resources/views/personnel/laborReport/index.blade.php
  11. 3 3
      resources/views/process/index.blade.php
  12. 2 2
      resources/views/rejected/search/analyze.blade.php
  13. 2 2
      resources/views/rejected/search/general.blade.php
  14. 2 2
      resources/views/waybill/index.blade.php
  15. 2 2
      resources/views/weight/package/index.blade.php
  16. 2 2
      webpack.mix.js

+ 4 - 4
public/js/app.js
Прегледај датотеку 

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
 
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
 
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
 
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
 
   false;
 
 
 /**
 
@@ -61974,8 +61974,8 @@ module.exports = tempTip;
 
 /*! no static exports found */
 
 /***/ (function(module, exports, __webpack_require__) {
 
 
-__webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\js\app.js */"./resources/js/app.js");
 
-module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
+__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
 
+module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 
 /***/ }),
 
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sas
 
 
 /***/ })
 
 
-/******/ });
 
+/******/ });

+ 5 - 2
resources/sass/layout.scss
Прегледај датотеку 

@@ -55,6 +55,9 @@ table{
 
         &.td-helpful{
 
             background: #aaeace;
 
         }
 
+        &.td-yellow{
 
+            background: #f8eea0;
 
+        }
 
     }
 
     td{
 
         &.td-warm{
 
@@ -67,7 +70,7 @@ table{
 
             background: #e7f5ee;
 
         }
 
         &.td-yellow{
 
-            background: #fdf7e9;
 
+            background: #fcfaec;
 
         }
 
     }
 
 
@@ -82,7 +85,7 @@ table{
 
             background:  #ecf3ef;
 
         }
 
         &.td-yellow{
 
-            background: #fdefe4;
 
+            background: #f8f5e4;
 
         }
 
     }
 
     tr:hover{

+ 1 - 1
resources/views/inventory/statement/allInventory.blade.php
Прегледај датотеку 

@@ -65,7 +65,7 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
 
     <script>
 
         $.cookie('xxx', 2223);

+ 2 - 2
resources/views/inventory/statement/changeInventory.blade.php
Прегледај датотеку 

@@ -55,9 +55,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue=new Vue({
 
             el:"#list",

+ 1 - 1
resources/views/inventory/stockInventory/mission.blade.php
Прегледај датотеку 

@@ -73,7 +73,7 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
 
     <script>
 
         new Vue({

+ 1 - 1
resources/views/layouts/app.blade.php
Прегледај датотеку 

@@ -10,7 +10,7 @@
 
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
 
     @yield('head')
 
     <!-- Styles -->
 
-    <link href="{{ asset('css/app200721.css') }}" rel="stylesheet">
 
+    <link href="{{ asset('css/app200811.css') }}" rel="stylesheet">
 
 </head>
 
 <body>
 
 <div id="app">

+ 2 - 2
resources/views/order/index/delivering.blade.php
Прегледај датотеку 

@@ -139,9 +139,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue=new Vue({
 
             el:"#list",

+ 2 - 2
resources/views/order/issue/edit.blade.php
Прегледај датотеку 

@@ -118,7 +118,7 @@
 
                         </select>
 
                     </div>
 
                 </div>
 
-{{--宝石赔偿金额--}}
 
+{{--宝时赔偿金额--}}
 
                 <div class="form-group row">
 
                     <label class="col-2 col-form-label text-right">宝时赔偿金额</label>
 
                     <div class="col-8">
 
@@ -126,7 +126,7 @@
 
                                v-model="orderIssues.baoshi_indemnity_money">
 
                     </div>
 
                 </div>
 
-{{--宝石快递减免--}}
 
+{{--宝时快递减免--}}
 
                 <div class="form-group row">
 
                     <label class="col-2 col-form-label text-right">宝时快递减免</label>
 
                     <div class="col-8">

+ 6 - 6
resources/views/order/issue/index.blade.php
Прегледај датотеку 

@@ -77,13 +77,13 @@
 
                         <th class="bg-white text-center align-middle" rowspan="2">承运商赔偿金额</th>
 
                         @endcannot
 
                         <th class="bg-white text-center align-middle" rowspan="2">承运商快递减免</th>
 
-                        <th class="bg-white text-center align-middle" rowspan="2">宝石赔偿金额</th>
 
-                        <th class="bg-white text-center align-middle" rowspan="2">宝石快递减免</th>
 
+                        <th class="bg-white text-center align-middle" rowspan="2">宝时赔偿金额</th>
 
+                        <th class="bg-white text-center align-middle" rowspan="2">宝时快递减免</th>
 
                         <th class="bg-white text-center align-middle" rowspan="2">事故责任方</th>
 
                         <th class="text-center align-middle" rowspan="2">操作</th>
 
                     </tr>
 
                     <tr class="tr-yellow">
 
-                        <th>条码</th><th>商品名</th><th>数量</th>
 
+                        <th class="td-yellow">条码</th><th class="td-yellow">商品名</th><th class="td-yellow">数量</th>
 
                         <th class="">条码</th><th>商品名</th><th>数量</th><th>是否正品</th><th>备注</th>
 
                         <th>操作类型</th><th>说明</th><th>操作者</th>
 
                         <th>条码</th><th>商品名</th><th>数量</th>
 
@@ -408,7 +408,7 @@
 
 
     </style>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script>
 
         let listVue = new Vue({
 
             el: '#issue_div ',
 
@@ -442,12 +442,12 @@
 
                 let _this = this;
 
                 let final_status = [{name:'0',value:'已解决'},{name:'1',value:'待退回'},{name:'2',value:'退回中'}];
 
                 let data = [[
 
-                    {name: 'created_at_start', type: 'dataTime', tip: '订单开始日期'},
 
+                    {name: 'created_at_start', type: 'dateTime', tip: '订单开始日期'},
 
                     {name: 'owner_id',type: 'select_multiple_select',tip: ['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'], placeholder:['货主','定位或多选货主'],data: _this.owners},
 
                     {name: 'final_status', type: 'select', tip: '问题件的最终状态', placeholder: '最终状态', data: final_status},
 
                     {name: 'handle_status', type: 'checkbox', tip: '是否已完结', data: [{name: '2', value: '已完结'}]},
 
                 ], [
 
-                        {name: 'created_at_end', type: 'dataTime', tip: '订单结束日期'},
 
+                        {name: 'created_at_end', type: 'dateTime', tip: '订单结束日期'},
 
                         {name: 'logistic_indemnity_money', type: 'input', tip: '承运商赔偿金额', placeholder: '承运商赔偿金额'},
 
                         @can('客户不可见')
 
                         {name: 'baoshi_express_remission', type: 'input', tip: '宝时赔偿金额', placeholder: '宝时赔偿金额'},

+ 2 - 2
resources/views/personnel/laborReport/index.blade.php
Прегледај датотеку 

@@ -210,9 +210,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let today=(new Date());
 
         function isTomorrow(){

+ 3 - 3
resources/views/process/index.blade.php
Прегледај датотеку 

@@ -456,9 +456,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue = new Vue({
 
             el:"#process",
 
@@ -641,7 +641,7 @@
 
                 processExport(checkAllSign) {
 
                     let url = '{{url('process/export')}}';
 
                     let token='{{ csrf_token() }}';
 
-                    //excelExport 定义在 js/queryForm/export200813b.js
 
+                    //excelExport 定义在 js/queryForm/export200818.js
 
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
 
                 },
 
                 //获取登记工时

+ 2 - 2
resources/views/rejected/search/analyze.blade.php
Прегледај датотеку 

@@ -60,9 +60,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue = new Vue({
 
             el:"#list",

+ 2 - 2
resources/views/rejected/search/general.blade.php
Прегледај датотеку 

@@ -175,9 +175,9 @@
 
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
 
         let csrfInput='@csrf';
 
     </script>
 
-    <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue = new Vue({
 
             el:"#list",

+ 2 - 2
resources/views/waybill/index.blade.php
Прегледај датотеку 

@@ -333,9 +333,9 @@
 
             -webkit-animation-play-state: running;
 
         }
 
     </style>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
         let vue = new Vue({
 
             el:'#list',

+ 2 - 2
resources/views/weight/package/index.blade.php
Прегледај датотеку 

@@ -57,9 +57,9 @@
 
 @endsection
 
 
 @section('lastScript')
 
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
 
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
 
-    <script type="text/javascript" src="{{asset('js/queryForm/header200814.js')}}"></script>
 
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
 
     <script>
 
             @if(isset($request))
 
         let request={!! json_encode($request) !!};

+ 2 - 2
webpack.mix.js
Прегледај датотеку 

@@ -20,6 +20,6 @@ mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 
 mix.js('resources/js/trix.js','public/js/trix.js');
 
 mix.copy('resources/sass/trix.css','public/css/trix.css');
 
 mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200813b.js');
 
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200813b.js');
 
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200814.js');
 
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818.js');
 
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200818.js');