From bd1002aee62e2fe65beb920b55d54e1143eb9ab3 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 20 十月 2023 12:13:03 +0800
Subject: [PATCH] "库存调整修改参数，bug修改"
---
src/views/operate/scrap/AddScrapDialog.vue | 229 ++++++++++++++++++++++++++++++---------------
src/views/reportForm/inventoryReport/index.vue | 4
src/views/reportForm/locationReport/index.vue | 6
src/api/operate/scrap.js | 17 +-
src/views/operate/inventoryAdjustment/index.vue | 20 +++-
5 files changed, 181 insertions(+), 95 deletions(-)
diff --git a/src/api/operate/scrap.js b/src/api/operate/scrap.js
index c7a6d34..e0cac8a 100644
--- a/src/api/operate/scrap.js
+++ b/src/api/operate/scrap.js
@@ -25,14 +25,15 @@
// id
// })
// }
-// // 淇敼鎶ュ簾
-// export function updateProduct(data) {
-// return request({
-// url: "/api-wms/v1/product/updateProduct",
-// method: "post",
-// data
-// })
-// }
+
+// 淇敼鎶ュ簾
+export function updateScrap(data) {
+ return request({
+ url: "/api-wms/v1/product/updateDisuse",
+ method: "post",
+ data
+ })
+}
// 楠岃瘉鎶ュ簾
export function finishDisuse(id) {
return request({
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index a4b1734..525b7d3 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -102,7 +102,7 @@
selectBox: false,
selectIndex: true,
tableColumn: [
- { label: "浣嶇疆", prop: "locationName", location: true },
+ { label: "浣嶇疆", prop: "locationName", location: false },
{ label: "浜у搧", prop: "productName", product: true },
{ label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
@@ -144,6 +144,7 @@
this.adjustAmount = val - row.amount
this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
// this.differenceAmount = val
+ this.differenceAmount=val
},
// 鏂板
addProductClick() {
@@ -178,10 +179,11 @@
this.addTitle = "鏂板缓"
this.showDiscard = false
let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
+
requestUrl({
- // amount: this.amount,
- adjustAmount: this.adjustAmount,
- // differenceAmount: this.differenceAmount,
+ amount: this.amount,
+ // adjustAmount: this.adjustAmount,
+ differenceAmount: this.differenceAmount,
locationId: this.locationId,
operationId: this.operationId,
productId: this.productId
@@ -214,6 +216,12 @@
},
// 鍙栨秷
discardBtnClick() {
+ console.log(this.tableList.tableData,"鐪嬬湅")
+ this.tableList.tableData.forEach((item)=>{
+ item.differenceAmount=0;
+ item.adjustAmount=0
+ })
+ this.tableList
if (this.isRowClick) {
this.tableData.map((item) => {
item.isEdit = true
@@ -251,7 +259,7 @@
handleUseClick(row) {
// scope.row.isSet = !scope.row.isSet
finishInventoryAdjustment({
- locationProductAmountId: row.locationProductAmount,
+ locationProductAmountId: row.locationProductAmountId,
operationId: row.operationId,
productId: row.productId
}).then((res) => {
@@ -268,6 +276,8 @@
},
// 琛岀偣鍑�
tableRowClick(row, rowIndex) {
+ console.log(row,"kankna")
+ this.locationId=row.locationId
this.rowIndex = rowIndex
this.isSel()
if (!this.isNoProduct && this.currentRowId === 0) {
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 3dc7f47..8e2b8c3 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -18,7 +18,14 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button
+ v-if="showEdit"
+ plain
+ size="mini"
+ style="margin-left: 15px"
+ @click="editClick"
+ >缂栬緫</el-button
+ >
</div>
</div>
<!-- 鍐呭 -->
@@ -57,7 +64,11 @@
v-for="item in productOptions"
:key="item.id"
:label="item.name"
- :value="{ value: item.id, label: item.name, unit: item.unit }"
+ :value="{
+ value: item.id,
+ label: item.name,
+ unit: item.unit,
+ }"
>
</el-option>
</el-select>
@@ -72,7 +83,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -100,7 +116,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -121,17 +142,25 @@
</el-form>
<!-- 灏� -->
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
- <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ @click="saveClick('form')"
+ :disabled="!showFooter"
+ >淇濆瓨</el-button
+ >
+ <el-button size="small" @click="editConfig.visible = false"
+ >鍙栨秷</el-button
+ >
</div>
</el-dialog>
</div>
</template>
<script>
-import { getProductList } from "@/api/product/product"
-import { getLocationList } from "@/api/overview/overview"
-import { addDisuse, finishDisuse } from "@/api/operate/scrap"
+import { getProductList } from "@/api/product/product";
+import { getLocationList } from "@/api/overview/overview";
+import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap";
export default {
name: "AddScrapDialog",
props: {
@@ -141,10 +170,10 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
- }
- }
- }
+ infomation: {},
+ };
+ },
+ },
},
components: {},
computed: {},
@@ -154,11 +183,19 @@
editConfig: this.editCommonConfig,
rules: {
// 浜у搧锛屾暟閲忓繀濉�
- productName: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
+ productName: [
+ { required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
+ ],
amount: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
- toLocationId: [{ required: true, message: "璇烽�夋嫨鎶ュ簾浣嶇疆", trigger: "change" }],
- sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }]
+ fromLocationId: [
+ { required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" },
+ ],
+ toLocationId: [
+ { required: true, message: "璇烽�夋嫨鎶ュ簾浣嶇疆", trigger: "change" },
+ ],
+ sourceNumber: [
+ { required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" },
+ ],
},
memberOptions: [],
productOptions: [],
@@ -166,128 +203,162 @@
list: [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "灏辩华", status: "todo", value: 3 },
- { label: "瀹屾垚", status: "todo", value: 4 }
+ { label: "瀹屾垚", status: "todo", value: 4 },
],
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
unit: "",
showButton: true,
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
- }
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
+ };
},
created() {
- this.setBottonView()
- this.getProductList()
- this.getLocationList()
- this.unit = this.editConfig.infomation.unit || ""
+ this.setBottonView();
+ this.getProductList();
+ this.getLocationList();
+ this.unit = this.editConfig.infomation.unit || "";
},
methods: {
// 浜у搧
async getProductList() {
await getProductList({
page: 1,
- pageSize: 100
+ pageSize: 100,
}).then((res) => {
// console.log(res.data)
if (res.code === 200) {
if (res.data && res.data.length > 0) {
- this.productOptions = res.data
+ this.productOptions = res.data;
}
}
- })
+ });
},
// 鑾峰彇浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
await getLocationList({
keyWord: "",
page: 0,
- pageSize: 0
+ pageSize: 0,
}).then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.toLocationOptions = res.data
+ this.toLocationOptions = res.data;
}
- })
+ });
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
- if (this.editConfig.title === "鏂板缓"||this.editConfig.title==="缂栬緫") {
- this.showButton = false
- this.showEdit = false
- this.showFooter = true
- this.isValidateClick = false
+ if (
+ this.editConfig.title === "鏂板缓" ||
+ this.editConfig.title === "缂栬緫"
+ ) {
+ this.showButton = false;
+ this.showEdit = false;
+ this.showFooter = true;
+ this.isValidateClick = false;
} else if (this.editConfig.infomation.status === 4) {
- this.showButton = false
- this.showEdit = false
- this.showFooter = false
- this.isValidateClick = false
+ this.showButton = false;
+ this.showEdit = false;
+ this.showFooter = false;
+ this.isValidateClick = false;
} else {
- this.showButton = true
- this.showEdit = false
- this.showFooter = false
- this.isValidateClick = true
+ this.showButton = true;
+ this.showEdit = false;
+ this.showFooter = false;
+ this.isValidateClick = true;
}
if (this.editConfig.title === "鏂板缓") {
- this.list[0].status = "active"
+ this.list[0].status = "active";
} else {
this.list.map((item) => {
if (item.value === this.editConfig.infomation.status) {
- item.status = "active"
+ item.status = "active";
} else {
- item.status = "todo"
+ item.status = "todo";
}
- })
+ });
}
},
// 鍏抽棴
handleClose() {
- this.editConfig.visible = false
+ this.editConfig.visible = false;
},
// 缂栬緫
editClick() {
- this.showEdit = false
- this.showFooter = true
+ this.showEdit = false;
+ this.showFooter = true;
},
// 淇濆瓨
saveClick(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- this.editConfig.infomation.productId = this.productId
- this.editConfig.infomation.productName = this.productName
- this.editConfig.infomation.unit = this.unit
- addDisuse({
- ...this.editConfig.infomation
- }).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- }
- })
+ if (this.editCommonConfig.title === "鏂板缓") {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ this.editConfig.infomation.productId = this.productId;
+ this.editConfig.infomation.productName = this.productName;
+ this.editConfig.infomation.unit = this.unit;
+ addDisuse({
+ ...this.editConfig.infomation,
+ }).then((res) => {
+ console.log(res);
+ this.editConfig.visible = false;
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛");
+ this.$parent.getData();
+ }
+ });
+ }
+ });
+ } else if (this.editCommonConfig.title === "缂栬緫") {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ this.editConfig.infomation.productId = this.productId;
+ this.editConfig.infomation.productName = this.productName;
+ this.editConfig.infomation.unit = this.unit;
+ updateScrap({
+ amount:this.editConfig.infomation.amount, //鏁伴噺
+ baseOperationType: 1,
+ fromLocationId: this.editConfig.infomation.fromLocationId,
+ id: this.editConfig.infomation.id,
+ number: this.editConfig.infomation.number,
+ operationDate:this.editConfig.infomation.operationDate,
+ productId: this.editConfig.infomation.productId,
+ sourceNumber: this.editConfig.infomation.sourceNumber,
+ status: this.editConfig.infomation.status,
+ toLocationId: this.editConfig.infomation.toLocationId,
+ }).then((res) => {
+ console.log(res);
+ this.editConfig.visible = false;
+ if (res.code === 200) {
+ this.$message.success("淇敼鎴愬姛");
+ this.$parent.getData();
+ }
+ });
+ }
+ console.log(this.editConfig.infomation, "鐪嬬湅鏄暐");
+ });
+ }
},
// 閫夋嫨浜у搧
selProductChange(val) {
- this.unit = val.unit
- this.productName = val.label
- this.productId = val.value
+ this.unit = val.unit;
+ this.productName = val.label;
+ this.productId = val.value;
},
// 楠岃瘉
async validateClick() {
+ console.log(this.editConfig.infomation.id, "xxx");
await finishDisuse(this.editConfig.infomation.id).then((res) => {
- console.log(res)
- this.editConfig.visible = false
+ console.log(res);
+ this.editConfig.visible = false;
if (res.code === 200) {
- this.$message.success("楠岃瘉鎴愬姛")
- this.$parent.getData()
+ this.$message.success("楠岃瘉鎴愬姛");
+ this.$parent.getData();
}
- })
- }
- }
-}
+ });
+ },
+ },
+};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8446864..d3b066d 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -331,7 +331,9 @@
this.$router.push({
name:"locationReport",
params:{
- keyWord:row.row.productName,
+ // keyWord:row.row.productName,
+ wareHouseCode:this.warehouseListName,
+ productId:row.row.produceId,
name:"搴撳瓨鎶ヨ〃"
}
})
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 62adb10..6efd9ed 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -212,7 +212,8 @@
getData() {
if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){
this.getLocationData({
- keyWord:this.$route.params.keyWord,
+ wareHouseCode:this.$route.params.wareHouseCode,
+ productId:this.$route.params.productId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -251,11 +252,12 @@
},
// 鍘嗗彶
handleHistoryClick(row) {
+ console.log(row)
this.$router.push({
name: "inboundOutboundDetail",
params: {
keyWord:row.productTypeName,
- produceId:row.id,
+ produceId:row.produceId,
productName:row.productName,
unit:row.unit,
name: "鎶ヨ〃"
--
Gitblit v1.8.0