合并

app/Exports/RejectedExport.php

@@ -71,7 +71,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
         $fieldNames=['日期','审核号','客户名称','订单号','姓名',
             '手机','原单单号','退回单号','退回公司','到付费用',
             '是否入库','商品条码','商品名称',];
-        if($id_owner==66){
+        if($id_owner==94){
             $fieldNames=array_merge($fieldNames,['寄件方省','重量',]);
         }
         $fieldNames=array_merge($fieldNames,['数量','是否正品',
@@ -87,7 +87,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
             $bill['logistic_number_return'],$bill['logistic_name'],
             $bill['fee_collected'],$bill['is_loaded_str'],
             $item['barcode_goods'],$item['name_goods'],];
-        if($id_owner==66){
+        if($id_owner==94){
             $fieldValues=array_merge($fieldValues,[$bill['common_01'],$bill['common_02']]);
         }
         $fieldValues=array_merge($fieldValues,[$item['amount'],$item['quality_label'],

public/js/app.js

@@ -61974,8 +61974,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Demo\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");
 
 
 /***/ }),

resources/views/inventory/statement/allInventory.blade.php

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

resources/views/inventory/statement/changeInventory.blade.php

@@ -71,8 +71,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         $.cookie('xxx', 2223);
         new Vue({

resources/views/inventory/stockInventory/mission.blade.php

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

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

@@ -172,8 +172,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/wave/search.blade.php

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/laborReport/index.blade.php

@@ -231,8 +231,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -459,9 +459,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200813.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -634,7 +634,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200804.js
+                    //excelExport 定义在 js/queryForm/export200813.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

resources/views/rejected/create.blade.php

@@ -179,7 +179,7 @@
                                     </div>
                                 </td>
                             </tr>
-                            <tr v-if="billInputting.id_owner==='66'">
+                            <tr v-if="billInputting.id_owner==='94'">
                                 <td>
                                     <div class="form-group mb-0">
                                         <label for="common_01" class="col-form-label text-right">寄件方省</label>

resources/views/rejected/edit.blade.php

@@ -184,7 +184,7 @@
                                 </td>
                             </tr>
 
-                                <tr v-if="billInputting.id_owner==='66'">
+                                <tr v-if="billInputting.id_owner==='94'">
                                     <td>
                                         <div class="form-group mb-0">
                                             <label for="common_01" class="col-form-label text-right">寄件方省</label>
@@ -791,7 +791,8 @@
                     this.shiftToCreate();
                 },
                 changeBill:function () {
-                    location.href='{{url('rejected')}}';
+                    history.back();
+                    {{--location.href='{{url('rejected')}}';--}}
                 },
                 getItemsUnderBill:function (billId,func) {
                     let _this=this;

resources/views/rejected/search/analyze.blade.php

@@ -67,7 +67,7 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200804.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200813.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({

resources/views/rejected/search/general.blade.php

@@ -208,8 +208,8 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -265,6 +265,7 @@
             methods:{
                 edit(id){
                     window.location.href=editUrl+id+"/edit";
+                    // window.open(editUrl+id+"/edit",'_blank') ;
                 },
                 destroy:function(rejectedBill){
                     if(!confirm('确定要删除退货信息“' + rejectedBill.owner.name+':'+rejectedBill.logistic_number_return+ '”吗？')){return;}

resources/views/waybill/index.blade.php

@@ -385,8 +385,8 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

resources/views/weight/package/index.blade.php

@@ -77,8 +77,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

webpack.mix.js

@@ -19,7 +19,7 @@ mix.copy('resources/images','public/images');
 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/queryForm200806.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200804.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200813.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200813.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813.js');