From 9c14867ccb5214f635afbecd7fb2b0837e8c16e2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期六, 23 九月 2023 16:16:12 +0800
Subject: [PATCH] 报废列表、新建、验证接口联调及公共组件优化
---
src/views/operate/allot/index.vue | 2
src/views/operate/scrap/AddScrapDialog.vue | 151 ++++++++++++++++++++++++-----
src/views/productManage/product/index.vue | 2
src/views/operate/scrap/index.vue | 51 ++++++----
src/api/operate/scrap.js | 43 ++++++++
src/components/makepager/StatusCommonView.vue | 8 +
6 files changed, 205 insertions(+), 52 deletions(-)
diff --git a/src/api/operate/scrap.js b/src/api/operate/scrap.js
new file mode 100644
index 0000000..c7a6d34
--- /dev/null
+++ b/src/api/operate/scrap.js
@@ -0,0 +1,43 @@
+import request from "@/common/untils/request.js"
+// import axios from "axios"
+
+// 鎶ュ簾鍒楄〃
+export function getDisuseList(data) {
+ return request({
+ url: "/api-wms/v1/product/listDisuse",
+ method: "post",
+ data
+ })
+}
+// 娣诲姞鎶ュ簾
+export function addDisuse(data) {
+ return request({
+ url: "/api-wms/v1/product/addDisuse",
+ method: "post",
+ data
+ })
+}
+// // 鍒犻櫎鎶ュ簾
+// export function deleteProduct(id) {
+// return request({
+// url: `/api-wms/v1/product/deleteProduct/${id}`,
+// method: "delete",
+// id
+// })
+// }
+// // 淇敼鎶ュ簾
+// export function updateProduct(data) {
+// return request({
+// url: "/api-wms/v1/product/updateProduct",
+// method: "post",
+// data
+// })
+// }
+// 楠岃瘉鎶ュ簾
+export function finishDisuse(id) {
+ return request({
+ url: `/api-wms/v1/product/finishDisuse/${id}`,
+ method: "put",
+ id
+ })
+}
diff --git a/src/components/makepager/StatusCommonView.vue b/src/components/makepager/StatusCommonView.vue
index 51012b8..f4889cb 100644
--- a/src/components/makepager/StatusCommonView.vue
+++ b/src/components/makepager/StatusCommonView.vue
@@ -2,8 +2,8 @@
<div class="common-status">
<div v-if="showButton" style="margin-left: 30px">
<el-button v-if="isValidateClick" plain size="mini" @click="validateClick">楠岃瘉</el-button>
- <el-button plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
- <el-button plain size="mini" disabled>鎵撳嵃</el-button>
+ <el-button v-if="showOther" plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
+ <el-button v-if="showOther" plain size="mini" disabled>鎵撳嵃</el-button>
</div>
<div class="arrowsBox">
<div
@@ -62,6 +62,10 @@
isValidateClick: {
type: Boolean,
default: false
+ },
+ showOther: {
+ type: Boolean,
+ default: true
}
},
data() {
diff --git a/src/views/operate/allot/index.vue b/src/views/operate/allot/index.vue
index 53dc714..7a27ded 100644
--- a/src/views/operate/allot/index.vue
+++ b/src/views/operate/allot/index.vue
@@ -23,7 +23,7 @@
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddOverviewDialog v-if="editConfig.visible" :work-type="'鍐呴儴璋冩嫧'" :edit-common-config="editConfig" />
+ <AddOverviewDialog v-if="editConfig.visible" :work-type="3" :edit-common-config="editConfig" />
</div>
</template>
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 4ed9700..c3c675e 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -33,70 +33,83 @@
>
<div>
<!-- <div>aaa</div> -->
- <StatusCommonView :list="list" />
+ <StatusCommonView
+ :list="list"
+ :showButton="showButton"
+ :showOther="false"
+ :isValidateClick="isValidateClick"
+ @validateClick="validateClick"
+ />
</div>
<div class="basic-info">
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="浜у搧" prop="client_name">
+ <el-form-item label="浜у搧" prop="productName">
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.productName"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 90%"
:disabled="!showFooter"
+ @change="selProductChange"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ <el-option
+ v-for="item in productOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name, unit: item.unit }"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="婧愪綅缃�" prop="client_name">
+ <el-form-item label="婧愪綅缃�" prop="fromLocationId">
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.fromLocationId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :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>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁伴噺" prop="client_name">
+ <el-form-item label="鏁伴噺" prop="amount">
<el-input-number
- v-model="editConfig.infomation.number"
+ v-model="editConfig.infomation.amount"
placeholder=""
:min="0"
:precision="2"
:controls="false"
- style="width: 90%"
+ style="width: 85%"
:disabled="!showFooter"
></el-input-number>
+ <span>{{ " " + unit }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎶ュ簾浣嶇疆" prop="client_name">
+ <el-form-item label="鎶ュ簾浣嶇疆" prop="toLocationId">
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.toLocationId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :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>
</el-col>
<el-col :span="12">
- <el-form-item label="鏉ユ簮鍗曟嵁" prop="memberId">
+ <el-form-item label="鏉ユ簮鍗曟嵁" prop="sourceNumber">
<el-input
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.sourceNumber"
placeholder="渚嬪:PO0032"
style="width: 90%"
:disabled="!showFooter"
@@ -117,6 +130,9 @@
</template>
<script>
+import { getProductList } from "@/api/product/product"
+import { getLocationList } from "@/api/overview/overview"
+import { addDisuse, finishDisuse } from "@/api/operate/scrap"
export default {
name: "AddScrapDialog",
props: {
@@ -138,45 +154,86 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- // 浜у搧锛屾暟閲忓繀濉�
- client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
- number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }],
- refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
- sale_return_nunber: [{ 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" }]
},
memberOptions: [],
- paymentTypeListOptions: [],
+ productOptions: [],
+ toLocationOptions: [],
list: [
- { label: "鑽夌", status: "todo" },
- { label: "瀹屾垚", status: "todo" }
+ { label: "鑽夌", status: "todo", value: 1 },
+ { label: "灏辩华", status: "todo", value: 3 },
+ { label: "瀹屾垚", status: "todo", value: 4 }
],
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
- currentState: "todo" // 褰撳墠鐘舵��
+ currentState: "todo", // 褰撳墠鐘舵��
+ unit: "",
+ showButton: true,
+ isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
}
},
created() {
this.setBottonView()
+ this.getProductList()
+ this.getLocationList()
+ this.unit = this.editConfig.infomation.unit || ""
},
methods: {
+ // 浜у搧
+ async getProductList() {
+ await getProductList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ // console.log(res.data)
+ if (res.code === 200) {
+ if (res.data && res.data.length > 0) {
+ this.productOptions = res.data
+ }
+ }
+ })
+ },
+ // 鑾峰彇浠撳簱浣嶇疆鍒楄〃
+ async getLocationList() {
+ await getLocationList({
+ keyWord: "",
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ this.toLocationOptions = res.data
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
+ this.showButton = false
this.showEdit = false
this.showFooter = true
- } else if (this.editConfig.infomation.status === "瀹屾垚") {
+ this.isValidateClick = false
+ } else if (this.editConfig.infomation.status === 4) {
+ this.showButton = false
this.showEdit = false
this.showFooter = false
+ this.isValidateClick = false
} else {
+ this.showButton = true
this.showEdit = true
this.showFooter = false
+ this.isValidateClick = true
}
if (this.editConfig.title === "鏂板缓") {
this.list[0].status = "active"
} else {
this.list.map((item) => {
- if (item.label === this.editConfig.infomation.status) {
+ if (item.value === this.editConfig.infomation.status) {
item.status = "active"
} else {
item.status = "todo"
@@ -194,7 +251,42 @@
this.showFooter = true
},
// 淇濆瓨
- saveClick() {}
+ 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()
+ }
+ })
+ }
+ })
+ },
+ // 閫夋嫨浜у搧
+ selProductChange(val) {
+ this.unit = val.unit
+ this.productName = val.label
+ this.productId = val.value
+ },
+ // 楠岃瘉
+ async validateClick() {
+ await finishDisuse(this.editConfig.infomation.id).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("楠岃瘉鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
}
}
</script>
@@ -262,5 +354,8 @@
line-height: 30px;
font-size: 13px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
</style>
diff --git a/src/views/operate/scrap/index.vue b/src/views/operate/scrap/index.vue
index 87c6af0..dbdeef6 100644
--- a/src/views/operate/scrap/index.vue
+++ b/src/views/operate/scrap/index.vue
@@ -29,7 +29,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
+import { getDisuseList } from "@/api/operate/scrap"
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
@@ -47,7 +47,8 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ keyword: ""
}
},
created() {
@@ -77,43 +78,43 @@
let tableColumn = [
{
label: "鍗曞彿",
- prop: "id",
+ prop: "number",
isShowColumn: true,
default: true
},
{
label: "鏃ユ湡",
- prop: "deviceName",
+ prop: "operationDate",
isShowColumn: true,
default: true
},
{
label: "浜у搧",
- prop: "id",
+ prop: "productName",
isShowColumn: true,
default: true
},
{
label: "鏁伴噺",
- prop: "deviceId",
+ prop: "amount",
isShowColumn: true,
default: false
},
{
label: "璁￠噺鍗曚綅",
- prop: "shopName",
+ prop: "unit",
isShowColumn: true,
default: false
},
{
label: "婧愪綅缃�",
- prop: "preTime",
+ prop: "from",
isShowColumn: true,
default: false
},
{
label: "鎶ュ簾浣嶇疆",
- prop: "status",
+ prop: "to",
isShowColumn: true,
default: false
},
@@ -122,8 +123,10 @@
prop: "status",
width: 120,
isShowColumn: true,
- default: true,
- status: true
+ default: false,
+ status: true,
+ isCallMethod: true,
+ getCallMethod: this.getStatus
}
]
return tableColumn
@@ -133,29 +136,32 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getDisuseList({
+ number: this.keyword,
+ sourceNumber: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
...item,
- supplierNumber: item.supplier.number,
- status: "鑽夌",
- preTime: "2023-09-04 11:20:00"
+ from: item.fromLocation.name,
+ to: item.toLocation.name
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ this.pagerOptions.totalCount = res.total
}
})
},
// 鎼滅储
getList(val) {
+ this.keyword = val
console.log(val)
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -168,6 +174,11 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation = {}
+ },
+ // 鐘舵��
+ getStatus(val) {
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
}
}
}
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 92938f3..57820ce 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -187,7 +187,7 @@
},
{
label: "浜у搧绫诲瀷",
- prop: "productType",
+ prop: "model",
isShowColumn: showcol.includes("浜у搧绫诲瀷"),
default: false
},
--
Gitblit v1.8.0