二次加工管理-增加入库单过滤

resources/views/process/create.blade.php

@@ -54,7 +54,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -131,7 +131,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -306,7 +306,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount,is_full){
+                confirmStore(wms_code,commodity_id,amount,bill_type,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -334,7 +334,7 @@
                         if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
 
-                    if (!is_full && sign){
+                    if (bill_type==='入库单' && !is_full && sign){
                         _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
                         processContentTemp['is_full']=true;
                         _this.processContents.unshift(processContentTemp);

resources/views/process/edit.blade.php

@@ -58,7 +58,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -135,7 +135,7 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
@@ -302,7 +302,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount,is_full){
+                confirmStore(wms_code,commodity_id,amount,bill_type,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -325,8 +325,7 @@
                         }
                         if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
-
-                    if (!is_full && sign){
+                    if (bill_type==='入库单' && !is_full && sign){
                         _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
                         processContentTemp['is_full']=true;
                         _this.processContents.unshift(processContentTemp);