Merge branch 'zzd'

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -393,8 +393,15 @@ class StoreCheckingReceiveController extends Controller
         $item = app('storeCheckingReceiveItemService')->find($id);
         if (!$item)return ['success'=>false, 'data'=>'被盘项不存在'];
         $params = ["counted_amount"=>$counted_amount];
-        if ($item->imported_amount)$params["imported_diff_amount"] = (int)$counted_amount - (int)$item->imported_amount;
-        if ($item->asn_amount)$params["asn_diff_amount"] = (int)$counted_amount - (int)$item->asn_diff_amount;
+        $data = [];
+        if ($item->imported_amount){
+            $params["imported_diff_amount"] = (int)$counted_amount - (int)$item->imported_amount;
+            $data["imported_diff_amount"] = $params["imported_diff_amount"];
+        }
+        if ($item->asn_amount){
+            $params["asn_diff_amount"] = (int)$counted_amount - (int)$item->asn_diff_amount;
+            $data["asn_diff_amount"] = $params["asn_diff_amount"];
+        }
         //修改差异状态
         if ($item->imported_amount || $item->asn_amount){
             $withs = ['storeCheckingReceiveItems'];
@@ -403,7 +410,7 @@ class StoreCheckingReceiveController extends Controller
         }
         app('storeCheckingReceiveItemService')->updateFind($item,$params);
         LogService::log(__METHOD__,"盘点修改实盘数",'item：'.json_encode($item)."update：",$counted_amount);
-        return ['success'=>true];
+        return ['success'=>true,"data"=>$data];
     }
 
     //修改差异状态

app/Http/Middleware/DecodingRequest.php

@@ -18,7 +18,7 @@ class DecodingRequest
     {
         if ($request->method() == "GET"){
             foreach ($request->input() as $key => $value){
-                if ($value != null)$request->offsetSet($key, str_replace("%20"," ",$value));
+                if ($value != null)$request->offsetSet($key, urldecode($value));
             }
         }
         return $next($request);

resources/js/queryForm/queryForm.js

@@ -45,12 +45,12 @@ const query = function getQueryForm(data) {
                     //     }
                     // }
                     // console.log(map.value);
-                    form.append("<input name='" + key + "' value='" + map.value.replace(" ","%20") + "'>");
-                    // form.append("<input name='" + key + "' value='" + encodeURIComponent(map.value) + "'>")
+                    //form.append("<input name='" + key + "' value='" + map.value.replace(" ","%20") + "'>");
+                      form.append("<input name='" + key + "' value='" + encodeURIComponent(map.value) + "'>")
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
-                    form.append("<input  name='" + key + "' value='" + string.replace(" ","%20") + "'>");
-                    // form.append("<input  name='" + key + "' value='" + encodeURIComponent(string) + "'>")
+                    //form.append("<input  name='" + key + "' value='" + string.replace(" ","%20") + "'>");
+                    form.append("<input  name='" + key + "' value='" + encodeURIComponent(string) + "'>")
                 }
             }
             for (let key in this.param){
@@ -1225,7 +1225,8 @@ const query = function getQueryForm(data) {
     // url path on search form option  renderer
     function searchOptionToUrlsearch() {
         let data = (window.location.search);
-        data = decodeURIComponent(data).replace('%20'," ");
+        data = decodeURIComponent(decodeURIComponent(data));
+        //data = decodeURIComponent(data).replace('%20'," ");
         if (!!data) {
             data = (data.substr(1)).split('&');
             data = convertArrayToObj(data);

resources/views/customer/finance/menu.blade.php

@@ -0,0 +1,18 @@
+<div id="nav2">
+    @component('customer.menu')
+    @endcomponent
+    <div class="container-fluid nav3">
+        <div class="card menu-third" >
+            <ul class="nav nav-pills">
+                @can('客户管理-项目-报表')
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('customer/project/report')}}" :class="{active:isActive('report',3)}">即时账单</a>
+                </li> @endcan
+                @can('客户管理-项目-报表')
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('customer/project/report')}}" :class="{active:isActive('report',3)}">账单确认</a>
+                </li> @endcan
+            </ul>
+        </div>
+    </div>
+</div>

resources/views/store/checkingReceive/show.blade.php

@@ -310,6 +310,8 @@
                     .then((res)=>{
                         if (res.data.success){
                             item.counted_amount = counted_amount;
+                            item.imported_diff_amount = res.data.data.imported_diff_amount;
+                            item.asn_diff_amount = res.data.data.asn_diff_amount;
                             this.disabledItemId = "";
                             tempTip.setDuration(2000);
                             tempTip.showSuccess("实盘数量成功修改为“"+counted_amount+"”");