Merge branch 'wrok_order_element_js_css'

# Conflicts:
#	resources/views/order/workOrder/index.blade.php

resources/views/order/workOrder/index.blade.php

@@ -1,8 +1,7 @@
 @extends("layouts.app")
 @section('title','处理工单')
 @section('head')
-    <link href="{{ mix('css/element-ui.css') }}" rel="stylesheet">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link href="{{ asset('css/element-ui.css') }}" rel="stylesheet">
 @endsection
 
 @section("content")
@@ -429,7 +428,7 @@
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/element-ui.js') }}"></script>
-    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <script type="text/javascript" src="{{asset('js/element/index.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
 
     <style>

resources/views/store/receivingTasks/create.blade.php

@@ -2,7 +2,7 @@
 @section('title')开单入库-创建@endsection
 @section('head')
     <link href="{{ mix('css/element-ui.css') }}" rel="stylesheet">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="{{ mix('css/element/index.css') }}">
 @endsection
 
 @section('content')
@@ -385,7 +385,7 @@
 
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{ mix('js/element-ui.js') }}"></script>
-    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <script type="text/javascript" src="{{mix('js/element/index.js') }}"></script>
     <script type="text/javascript" src="{{mix('js/lodop/LodopFuncs.js')}}"></script>
 
     <script src='http://localhost:18000/CLodopfuncs.js?name=CLODOPA'></script>

resources/views/store/receivingTasks/index.blade.php

@@ -1,8 +1,7 @@
 @extends('layouts.app')
 @section('title')开单入库-查询@endsection
 @section('head')
-    <link href="{{ mix('css/element-ui.css') }}" rel="stylesheet">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="{{ asset('css/element/index.css') }}">
 @endsection
 
 
@@ -55,7 +54,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
     <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
-    <script type="text/javascript" src="{{mix('js/element-ui.js') }}"></script>
+    <script type="text/javascript" src="{{asset('js/element-ui.js') }}"></script>
     <script type="text/javascript" src="{{mix('js/lodop/LodopFuncs.js')}}"></script>
 
     <script type="text/javascript" src='http://localhost:18000/CLodopfuncs.js?name=CLODOPA'></script>

webpack.mix.js

@@ -56,4 +56,8 @@ mix.copy('resources/js/login/swiper-bundle.min.js','public/js/login/swiper-bundl
 mix.copy('resources/sass/reset.css','public/css/reset.css');
 mix.copy('resources/sass/swiper-bundle.min.css','public/css/swiper-bundle.min.css');
 
+// element table 渲染
+mix.copy('resources/js/element/index.js','public/js/element/index.js')
+mix.copy('resources/sass/element/index.css','public/css/element/index.css');
+
 mix.version();