|  | @@ -1671,6 +1671,7 @@
 | 
											
												
													
														|  |                         remote
 |  |                         remote
 | 
											
												
													
														|  |                         @change="changeGoods"
 |  |                         @change="changeGoods"
 | 
											
												
													
														|  |                         placeholder="请选择状态"
 |  |                         placeholder="请选择状态"
 | 
											
												
													
														|  | 
 |  | +                       disabled
 | 
											
												
													
														|  |                       >
 |  |                       >
 | 
											
												
													
														|  |                        <el-option
 |  |                        <el-option
 | 
											
												
													
														|  |                          label="已装箱"
 |  |                          label="已装箱"
 | 
											
										
											
												
													
														|  | @@ -1701,6 +1702,7 @@
 | 
											
												
													
														|  |                        remote
 |  |                        remote
 | 
											
												
													
														|  |                        @change="changeGoods"
 |  |                        @change="changeGoods"
 | 
											
												
													
														|  |                        placeholder="请选择状态"
 |  |                        placeholder="请选择状态"
 | 
											
												
													
														|  | 
 |  | +                      disabled
 | 
											
												
													
														|  |                      >
 |  |                      >
 | 
											
												
													
														|  |                        <el-option
 |  |                        <el-option
 | 
											
												
													
														|  |                          label="已出库"
 |  |                          label="已出库"
 | 
											
										
											
												
													
														|  | @@ -5505,7 +5507,11 @@ export default {
 | 
											
												
													
														|  |      judgmentWarehouse() {
 |  |      judgmentWarehouse() {
 | 
											
												
													
														|  |        if (this.form.fMblno && this.form.fCorpid) {
 |  |        if (this.form.fMblno && this.form.fCorpid) {
 | 
											
												
													
														|  |          matchWarehouse({fMblno: this.form.fMblno, fCorpid: this.form.fCorpid}).then(res => {
 |  |          matchWarehouse({fMblno: this.form.fMblno, fCorpid: this.form.fCorpid}).then(res => {
 | 
											
												
													
														|  | -          this.warehouseSwitching = res.data
 |  | 
 | 
											
												
													
														|  | 
 |  | +          if (res.data.length > 0) {
 | 
											
												
													
														|  | 
 |  | +            this.warehouseSwitching = res.data
 | 
											
												
													
														|  | 
 |  | +          } else {
 | 
											
												
													
														|  | 
 |  | +            this.warehouseSwitching = this.warehouseOptions
 | 
											
												
													
														|  | 
 |  | +          }
 | 
											
												
													
														|  |          })
 |  |          })
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
										
											
												
													
														|  | @@ -6510,7 +6516,7 @@ export default {
 | 
											
												
													
														|  |                      this.form.fStltypeid = (this.form.fStltypeid).toString()
 |  |                      this.form.fStltypeid = (this.form.fStltypeid).toString()
 | 
											
												
													
														|  |                      // this.detailList = response.data.warehousebillsitems;
 |  |                      // this.detailList = response.data.warehousebillsitems;
 | 
											
												
													
														|  |                      this.msgSuccess("保存成功");
 |  |                      this.msgSuccess("保存成功");
 | 
											
												
													
														|  | -                    getWarehousebills(this.chiId).then((response) => {
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    getWarehousebills(this.form.fId).then((response) => {
 | 
											
												
													
														|  |                        this.form = response.data.warehousebills;
 |  |                        this.form = response.data.warehousebills;
 | 
											
												
													
														|  |                        if (this.form.fBillstatus > 3) {
 |  |                        if (this.form.fBillstatus > 3) {
 | 
											
												
													
														|  |                          this.approvalStatus = false;
 |  |                          this.approvalStatus = false;
 | 
											
										
											
												
													
														|  | @@ -7281,7 +7287,7 @@ export default {
 | 
											
												
													
														|  |          fNetweight: null,
 |  |          fNetweight: null,
 | 
											
												
													
														|  |          fQty: null,
 |  |          fQty: null,
 | 
											
												
													
														|  |          fCntqty: 1,
 |  |          fCntqty: 1,
 | 
											
												
													
														|  | -        fBillstatus: 10,
 |  | 
 | 
											
												
													
														|  | 
 |  | +        fBillstatus: 40,
 | 
											
												
													
														|  |          fWarehouselocid: null,
 |  |          fWarehouselocid: null,
 | 
											
												
													
														|  |          fWarehouselocids: null,
 |  |          fWarehouselocids: null,
 | 
											
												
													
														|  |          fCntrno: null,
 |  |          fCntrno: null,
 |