5 years ago · cab970fe51
--- a/public/js/app.js
+++ b/public/js/app.js
--- a/resources/views/layouts/app.blade.php
+++ b/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/app200629b.css') }}" rel="stylesheet">
			
 
				+    <link href="{{ asset('css/app200630.css') }}" rel="stylesheet">
			
 
				 </head>
			
 
				 <body>
			
 
				 <div id="app">
			
--- a/resources/views/process/index.blade.php
+++ b/resources/views/process/index.blade.php
@@ -303,7 +303,7 @@
 
				                     <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.status }}</td>
			
 
				                     <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.remark }}</td>
			
 
				                     <td colspan="5">
			
 
				-                        <table class="table table-sm table-striped" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 || ((processOne.processesContents.length)-(processFullSum[processOne.code])==1 &&  processFullSum[processOne.code]==1)">
			
 
				+                        <table class="table table-sm table-striped p-0 m-0" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 || ((processOne.processesContents.length)-(processFullSum[processOne.code])==1 &&  processFullSum[processOne.code]==1)">
			
 
				                             <tr v-for="processesContent in processOne.processesContents"
			
 
				                                 v-if="processOne.is_multi_row || !processOne.id ? !processOne.id  ? processesContent.type=='成品单' :processesContent.type=='原料单' : true">
			
 
				                                 <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.bill_type }}</td>
			
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -12,7 +12,7 @@ const mix = require('laravel-mix');
 
				  */
			
 
				 
			
 
				 mix.js('resources/js/app.js', 'public/js')
			
 
				-    .sass('resources/sass/app.scss', 'public/css/app200629b.css');
			
 
				+    .sass('resources/sass/app.scss', 'public/css/app200630.css');
			
 
				 mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200513.js');
			
 
				 mix.js('resources/js/singles/searchAnalyze.js', 'public/js/singles/searchAnalyze200513.js');