From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/operate/scrap/AddScrapDialog.vue | 110 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 38 deletions(-)
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 3dc7f47..b877a3e 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -45,22 +45,16 @@
<el-row>
<el-col :span="12">
<el-form-item label="浜у搧" prop="productName">
- <el-select
- v-model="editConfig.infomation.productName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
+ <SimpleSearchInput
+ :echoValue="editConfig.infomation.productName"
+ :echoName="editConfig.infomation.productName"
+ checkedNum="1"
+ :clearable="true"
+ @select-user="selProductChange"
:disabled="!showFooter"
- @change="selProductChange"
+ style="width: 90%"
>
- <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>
+ </SimpleSearchInput>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -85,7 +79,7 @@
:min="0"
:precision="2"
:controls="false"
- style="width: 85%"
+ style="width: 90%"
:disabled="!showFooter"
></el-input-number>
<span>{{ " " + unit }}</span>
@@ -131,7 +125,8 @@
<script>
import { getProductList } from "@/api/product/product"
import { getLocationList } from "@/api/overview/overview"
-import { addDisuse, finishDisuse } from "@/api/operate/scrap"
+import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap"
+import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
export default {
name: "AddScrapDialog",
props: {
@@ -146,7 +141,7 @@
}
}
},
- components: {},
+ components: { SimpleSearchInput },
computed: {},
data() {
return {
@@ -154,7 +149,7 @@
editConfig: this.editCommonConfig,
rules: {
// 浜у搧锛屾暟閲忓繀濉�
- productName: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
+ productName: [{ required: true, validator: this.validatorProduct, trigger: "change" }],
amount: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }],
fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨鎶ュ簾浣嶇疆", trigger: "change" }],
@@ -173,7 +168,7 @@
currentState: "todo", // 褰撳墠鐘舵��
unit: "",
showButton: true,
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
}
},
created() {
@@ -212,7 +207,7 @@
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
- if (this.editConfig.title === "鏂板缓"||this.editConfig.title==="缂栬緫") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.title === "缂栬緫") {
this.showButton = false
this.showEdit = false
this.showFooter = true
@@ -251,32 +246,63 @@
},
// 淇濆瓨
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) {
+ let params={
+ amount: this.editConfig.infomation.amount,
+ baseOperationType: this.editConfig.infomation.baseOperationType,
+ 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
}
- })
- }
- })
+ updateScrap(
+ params
+ ).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
+ this.productName = val.name
+ this.productId = val.id
+ this.editConfig.infomation.productName = val.name
},
// 楠岃瘉
async validateClick() {
+ console.log(this.editConfig.infomation.id, "xxx")
await finishDisuse(this.editConfig.infomation.id).then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -285,6 +311,14 @@
this.$parent.getData()
}
})
+ },
+ // 浜у搧鍗曠嫭鏍￠獙
+ validatorProduct(rule, value, callback) {
+ if (this.editConfig.infomation.productName && this.editConfig.infomation.productName.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨浜у搧"))
+ }
}
}
}
--
Gitblit v1.8.0