|
@@ -195,7 +195,8 @@
|
|
|
@keyup.native="
|
|
@keyup.native="
|
|
|
moveFocus($event, $index, 'batchNo', '产品', row)
|
|
moveFocus($event, $index, 'batchNo', '产品', row)
|
|
|
"
|
|
"
|
|
|
- v-model.number="row.batchNo"
|
|
|
|
|
|
|
+ type="number"
|
|
|
|
|
+ v-model="row.batchNo"
|
|
|
>
|
|
>
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -2320,6 +2321,12 @@
|
|
|
// obj.isSkip = 1;
|
|
// obj.isSkip = 1;
|
|
|
this.saveLoading = true;
|
|
this.saveLoading = true;
|
|
|
console.log(obj, 'objobjobjobjobjobj');
|
|
console.log(obj, 'objobjobjobjobjobj');
|
|
|
|
|
+ // if(){}
|
|
|
|
|
+ if (!(await this.isVerifyRepeatIsStock())) {
|
|
|
|
|
+ this.saveLoading = false;
|
|
|
|
|
+
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
let api = obj.id ? storageApi.update : storageApi.storage;
|
|
let api = obj.id ? storageApi.update : storageApi.storage;
|
|
|
api(obj)
|
|
api(obj)
|
|
|
.then(async (res) => {
|
|
.then(async (res) => {
|
|
@@ -2359,6 +2366,35 @@
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
+ async isVerifyRepeatIsStock() {
|
|
|
|
|
+ const isVerifyData = await storageApi.isVerifyRepeatIsStock({
|
|
|
|
|
+ categoryCodes: this.productList.map((item) => item.categoryCode),
|
|
|
|
|
+ batchNos: this.productList.map((item) => item.batchNo)
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
|
|
+ if (isVerifyData?.length) {
|
|
|
|
|
+ this.$confirm(
|
|
|
|
|
+ `当前批次:${isVerifyData[0].batchNo},物品${isVerifyData
|
|
|
|
|
+ .map((item) => item.categoryName)
|
|
|
|
|
+ .join(',')}已有入库记录,是否继续入库!`,
|
|
|
|
|
+ {
|
|
|
|
|
+ confirmButtonText: '是',
|
|
|
|
|
+ cancelButtonText: '否'
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
|
|
+ .then(() => {
|
|
|
|
|
+ resolve(true);
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(() => {
|
|
|
|
|
+ resolve(false);
|
|
|
|
|
+ });
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resolve(true);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
pickingHandleScroll() {
|
|
pickingHandleScroll() {
|
|
|
// console.log('---------pickingHandleScroll------------');
|
|
// console.log('---------pickingHandleScroll------------');
|
|
|
// console.log(this.packingList);
|
|
// console.log(this.packingList);
|
|
@@ -2867,7 +2903,6 @@
|
|
|
},
|
|
},
|
|
|
//产品保存操作
|
|
//产品保存操作
|
|
|
async listSave(row, index) {
|
|
async listSave(row, index) {
|
|
|
- console.log('row22222222', row);
|
|
|
|
|
return new Promise(async (resolve, reject) => {
|
|
return new Promise(async (resolve, reject) => {
|
|
|
try {
|
|
try {
|
|
|
await this.validateFormIndividually(index);
|
|
await this.validateFormIndividually(index);
|