From c054059c05608b1c7235e18b3da0dfa095ebfe4d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 九月 2023 10:45:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/overview/AddOverviewDialog.vue | 21 +++++++++++----------
src/views/overview/OverviewListView.vue | 2 +-
src/views/productManage/product/index.vue | 1 +
src/common/config/index.js | 1 -
src/components/makepager/FormBtnsView.vue | 4 ++--
src/api/overview/overview.js | 4 ++--
src/views/productManage/product/AddProductDialog.vue | 17 +++++++++++++++--
7 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/api/overview/overview.js b/src/api/overview/overview.js
index e46a1ad..5809158 100644
--- a/src/api/overview/overview.js
+++ b/src/api/overview/overview.js
@@ -57,8 +57,8 @@
// 缂栬緫鍏ュ簱/鍑哄簱
export function updateOperation(data) {
return request({
- url: `/api-wms/v1/operation/operation/${data.id}`,
- method: "put",
+ url: `/api-wms/v1/operation/update`,
+ method: "post",
data
})
}
diff --git a/src/common/config/index.js b/src/common/config/index.js
index 935a8f0..478e57a 100644
--- a/src/common/config/index.js
+++ b/src/common/config/index.js
@@ -57,6 +57,5 @@
result = "鍒氬垰"
}
}
- console.log(result)
return result
}
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index a1c98fd..f975c37 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -60,7 +60,7 @@
<div class="right-label">浜у搧</div>
</div>
</div>
- <div v-if="!showWarehouse" class="sub-number">
+ <div v-if="!showWarehouse" class="sub-number left_border">
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
<div class="right-one">涓婃灦瑙勫垯</div>
@@ -93,7 +93,7 @@
<div class="right-one">褰撳墠搴撳瓨</div>
</div>
</div>
- <div v-if="showWarehouse" class="sub-number">
+ <div v-if="showWarehouse" class="sub-number left_border">
<div class="left"><i class="el-icon-refresh"></i></div>
<div class="right">
<div class="right-one">璺嚎</div>
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index a2df069..94908bd 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -364,13 +364,13 @@
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === "瀹屾垚") {
+ } else if (this.editConfig.infomation.status === 4) {
this.showButton = true
this.showEdit = false
this.isDelClick = true
this.showFooter = false
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === "宸插彇娑�") {
+ } else if (this.editConfig.infomation.status === 5) {
this.showButton = true
this.showEdit = false
this.showFooter = false
@@ -442,15 +442,15 @@
let contacterID = 0
let contacterName = ""
if (this.editConfig.title === "鏂板缓") {
- companyID = this.companyObj.length === 0 ? 0 : this.companyObj.value
- companyName = this.companyObj.length === 0 ? 0 : this.companyObj.label
- contacterID = this.contacterObj.length === 0 ? 0 : this.contacterObj.value
- contacterName = this.contacterObj.length === 0 ? 0 : this.contacterObj.label
+ companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
+ companyName = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.label
+ contacterID = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.value
+ contacterName = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.label
} else {
- companyID = this.companyObj.length === 0 ? data.companyID : this.companyObj.value
- companyName = this.companyObj.length === 0 ? data.companyName : this.companyObj.label
- contacterID = this.contacterObj.length === 0 ? data.contacterID : this.contacterObj.value
- contacterName = this.contacterObj.length === 0 ? data.contacterName : this.contacterObj.label
+ companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
+ companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
+ contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value
+ contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
}
let params = {
comment: data.comment || "",
@@ -464,6 +464,7 @@
number: "",
operationDate: data.operationDate || "",
operationTypeId: this.editConfig.operationTypeId,
+ operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
toLocationId: data.toLocationId || 0
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 51a2432..b5a8f1e 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -156,7 +156,7 @@
// },
{
label: "鍏ュ簱绫诲瀷",
- prop: "faultTime",
+ prop: "operationTypeName",
isShowColumn: showcol.includes("鍏ュ簱绫诲瀷"),
default: false
},
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index b8542b9..3900892 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -116,13 +116,19 @@
clearable
style="width: 85%"
:popper-append-to-body="false"
+ :disabled="!showFooter"
>
<el-option v-for="item in materialTypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit" style="margin-left: 20px">
- <el-input v-model="editConfig.infomation.unit" placeholder="璇疯緭鍏�" style="width: 85%"></el-input>
+ <el-input
+ v-model="editConfig.infomation.unit"
+ placeholder="璇疯緭鍏�"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input>
</el-form-item>
<el-form-item label="浜у搧鏍囩" prop="productTagName" style="margin-left: 20px">
@@ -130,6 +136,7 @@
v-model="editConfig.infomation.productTagName"
placeholder="璇疯緭鍏�"
style="width: 85%"
+ :disabled="!showFooter"
></el-input>
</el-form-item>
</div>
@@ -153,6 +160,7 @@
:min="0"
:controls="false"
style="width: 85%; margin-right: 5px"
+ :disabled="!showFooter"
></el-input-number>
</el-form-item>
<el-form-item label="鎴愭湰" prop="cost" style="margin-left: 20px">
@@ -294,7 +302,12 @@
></el-input-number>
<span> 澶╂暟</span>
</el-form-item>
- <el-form-item label="鐢熶骇璁㈠崟鍑嗗澶╂暟" prop="name" style="margin-left: 20px" label-width="130px">
+ <el-form-item
+ label="鐢熶骇璁㈠崟鍑嗗澶╂暟"
+ prop="customerTaxes"
+ style="margin-left: 20px"
+ label-width="130px"
+ >
<el-input-number
v-model="editConfig.infomation.customerTaxes"
placeholder="璇疯緭鍏�"
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index e456017..7120876 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -314,6 +314,7 @@
padding: 8px;
display: flex;
align-items: center;
+ cursor: pointer;
.left {
width: 60px;
text-align: center;
--
Gitblit v1.8.0