From 95ff77e1e2994fe1088c69b326bdd7023c8563dc Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 17 四月 2024 14:32:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/views/operate/inventoryAdjustment/index.vue | 10 ++++++----
src/views/productManage/product/AddProductDialog.vue | 9 +++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 3fbf293..90897a0 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -209,7 +209,8 @@
// 鏄惁閫夋嫨浜у搧
isSel() {
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].productName?.length === 0) {
+ // this.tableData[i].productName?.length === 0||!this.tableData[i].productId
+ if (!this.tableData[i].productId||!this.tableData[i].isEdit) {
this.isNoProduct = false
break
} else {
@@ -281,8 +282,9 @@
this.locationId = row.locationId
this.rowIndex = rowIndex
this.isSel()
- if (!this.isNoProduct && this.currentRowId === 0) {
- this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
+ //!this.isNoProduct && this.currentRowId == 0
+ if (!this.isNoProduct) {
+ this.$message.error("璇峰畬鎴愬綋鍓嶄繚瀛樻垨鍙栨秷淇濆瓨锛�")
} else {
this.currentRowId = row.id
this.addTitle = "淇濆瓨"
@@ -326,7 +328,7 @@
productId:this.productId
}).then((res)=>{
if(res&&res.code===200){
- this.tableData[0].amount=res.data.amount||0
+ this.tableData[0].amount=res.data?res.data.amount:0
}
})
}
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 008a35b..fd0e079 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -148,8 +148,9 @@
placeholder="鍗曚綅"
filterable
@change="Gtechange"
- style="width: calc(85% - 110px)"
+ style="width: calc(85% - 0px)"
>
+ <!-- style="width: calc(85% - 110px)" -->
<el-option
v-for="ele in unitList"
:key="ele.id"
@@ -162,14 +163,14 @@
style="font-size: 20px; color: gray"
@click="handleUnitShow"
></i>
- <el-checkbox
+ <!-- <el-checkbox
class="margin_left_10px"
:disabled="editConfig.infomation.unit&&showFooter?false:true"
v-model="editConfig.infomation.moreUnit"
@change="moreUnitChange"
></el-checkbox
- >
- <span class="margin_left_10px cursor_pointer" @click="handleUnitMore">鍚敤澶氬崟浣�</span>
+ > -->
+ <!-- <span class="margin_left_10px cursor_pointer" @click="handleUnitMore">鍚敤澶氬崟浣�</span> -->
</el-form-item>
<el-form-item label="浜у搧鏍囩" prop="productTagName">
--
Gitblit v1.8.0