feat: 盘点补丁
							parent
							
								
									b06cf0b9de
								
							
						
					
					
						commit
						bb2a51bcd3
					
				| @ -1,97 +0,0 @@ | ||||
| Subject: [PATCH] fix: 开启和修复整单盘点功能 | ||||
| fix: 开启和修复整单盘点功能 | ||||
| ---
 | ||||
| Index: src/views/inventory/count/InvCountOrderModify.vue
 | ||||
| IDEA additional info: | ||||
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | ||||
| <+>UTF-8 | ||||
| ===================================================================
 | ||||
| diff --git a/src/views/inventory/count/InvCountOrderModify.vue b/src/views/inventory/count/InvCountOrderModify.vue
 | ||||
| --- a/src/views/inventory/count/InvCountOrderModify.vue	(revision 6877dcc229f0592427c367ec58272414a20aabcd)
 | ||||
| +++ b/src/views/inventory/count/InvCountOrderModify.vue	(revision e80a4233bb02b3bc8c6f5c807fde3f709a1b2da9)
 | ||||
| @@ -130,7 +130,7 @@
 | ||||
|              v-if="countType != 2" | ||||
|              type="primary" | ||||
|              size="mini" | ||||
| -
 | ||||
| +            :disabled="startCountVisible"
 | ||||
|              @click.native="startCount(1)" | ||||
|            >录入产品 | ||||
|            </el-button> | ||||
| @@ -431,6 +431,7 @@
 | ||||
|        selectedIndex: null, | ||||
|        isCodeAlive: true, | ||||
|        saveLoading: false, | ||||
| +      startCountVisible: false,
 | ||||
|        submitLoading: false, | ||||
|      } | ||||
|    }, | ||||
| @@ -711,6 +712,7 @@
 | ||||
|        }); | ||||
|      }, | ||||
|      startCount(val) { | ||||
| +
 | ||||
|        // this.countProductList = []; | ||||
|        if (this.countType === 0 && val === 1) { | ||||
|          if (isBlank(this.formData.invStorageCode)) { | ||||
| @@ -724,9 +726,22 @@
 | ||||
|          }; | ||||
|          getCountInvProductProduct(params).then((res) => { | ||||
|            if (res.data.total !== 0) { | ||||
| +            this.startCountVisible = true
 | ||||
|              let invProductList = res.data.list; | ||||
|              for (let product of invProductList) { | ||||
| -              this.countProductList.push(product);
 | ||||
| +              let product2 = {
 | ||||
| +                orderIdFk: this.formData.orderId,
 | ||||
| +                productId: product.relIdFk,
 | ||||
| +                nameCode: product.nameCode,
 | ||||
| +                batchNo: product.batchNo,
 | ||||
| +                produceDate: product.productionDate,
 | ||||
| +                expireDate: product.expireDate,
 | ||||
| +                invCode: this.formData.invStorageCode,
 | ||||
| +                invSpaceCode: this.formData.invSpaceCode,
 | ||||
| +                invNum: product.reCount,
 | ||||
| +                supId: product.supId
 | ||||
| +              }
 | ||||
| +              this.countProductList.push(product2);
 | ||||
|              } | ||||
|              this.saveOrder(1); | ||||
|            } | ||||
| @@ -808,6 +823,11 @@
 | ||||
|      this.getInvList(); | ||||
|   | ||||
|      if (!isBlank(this.countOrder.orderId)) { | ||||
| +      if (!isBlank(this.countOrder.countType)) {
 | ||||
| +        if (this.countOrder.countType == 0){
 | ||||
| +          this.startCountVisible = true
 | ||||
| +        }
 | ||||
| +      }
 | ||||
|        //拉取单据详情信息 | ||||
|        this.formData = this.countOrder; | ||||
|        let params = {orderIdFk: this.countOrder.orderId}; | ||||
| @@ -818,6 +838,7 @@
 | ||||
|          } | ||||
|        }) | ||||
|      } | ||||
| +
 | ||||
|    }, | ||||
|  }; | ||||
|   | ||||
| Index: src/views/inventory/count/InvCountOrderNew.vue
 | ||||
| IDEA additional info: | ||||
| Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | ||||
| <+>UTF-8 | ||||
| ===================================================================
 | ||||
| diff --git a/src/views/inventory/count/InvCountOrderNew.vue b/src/views/inventory/count/InvCountOrderNew.vue
 | ||||
| --- a/src/views/inventory/count/InvCountOrderNew.vue	(revision 6877dcc229f0592427c367ec58272414a20aabcd)
 | ||||
| +++ b/src/views/inventory/count/InvCountOrderNew.vue	(revision 6f8f84e06ee12b612725edd3e6b231e8116dd306)
 | ||||
| @@ -128,7 +128,7 @@
 | ||||
|            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> | ||||
|            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> | ||||
|            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> | ||||
| -          <!-- <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(0)">新增整库盘点</el-button> -->
 | ||||
| +           <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(0)">新增整库盘点</el-button>
 | ||||
|            <!-- <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(1)">新增货位盘点</el-button> --> | ||||
|            <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(2)">新增部分盘点</el-button> | ||||
|          </el-button-group> | ||||
					Loading…
					
					
				
		Reference in New Issue