From 508f805bae4f74c9432d82c045d895a62ea1f099 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期六, 21 十月 2023 13:32:49 +0800
Subject: [PATCH] Merge branch 'zwf/style' into dev
---
src/views/operate/scrap/AddScrapDialog.vue | 243 ++++++++++++++++++++----------------------------
1 files changed, 103 insertions(+), 140 deletions(-)
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 8e2b8c3..73911a4 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -18,14 +18,7 @@
<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>
<!-- 鍐呭 -->
@@ -52,26 +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">
@@ -83,12 +66,7 @@
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>
@@ -101,7 +79,7 @@
:min="0"
:precision="2"
:controls="false"
- style="width: 85%"
+ style="width: 90%"
:disabled="!showFooter"
></el-input-number>
<span>{{ " " + unit }}</span>
@@ -116,12 +94,7 @@
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>
@@ -142,25 +115,18 @@
</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, updateScrap } from "@/api/operate/scrap";
+import { getProductList } from "@/api/product/product"
+import { getLocationList } from "@/api/overview/overview"
+import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap"
+import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
export default {
name: "AddScrapDialog",
props: {
@@ -170,12 +136,12 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {},
- };
- },
- },
+ infomation: {}
+ }
+ }
+ }
},
- components: {},
+ components: { SimpleSearchInput },
computed: {},
data() {
return {
@@ -183,19 +149,11 @@
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" },
- ],
- 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: [],
@@ -203,162 +161,167 @@
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) {
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;
+ this.editConfig.infomation.productId = this.productId
+ this.editConfig.infomation.productName = this.productName
+ this.editConfig.infomation.unit = this.unit
addDisuse({
- ...this.editConfig.infomation,
+ ...this.editConfig.infomation
}).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()
}
- });
+ })
}
- });
+ })
} 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;
+ this.editConfig.infomation.productId = this.productId
+ this.editConfig.infomation.productName = this.productName
+ this.editConfig.infomation.unit = this.unit
updateScrap({
- amount:this.editConfig.infomation.amount, //鏁伴噺
+ 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,
+ 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,
+ toLocationId: this.editConfig.infomation.toLocationId
}).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()
}
- });
+ })
}
- 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.name
+ this.productId = val.id
+ this.editConfig.infomation.productName = val.name
},
// 楠岃瘉
async validateClick() {
- console.log(this.editConfig.infomation.id, "xxx");
+ 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()
}
- });
+ })
},
- },
-};
+ // 浜у搧鍗曠嫭鏍￠獙
+ validatorProduct(rule, value, callback) {
+ if (this.editConfig.infomation.productName && this.editConfig.infomation.productName.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨浜у搧"))
+ }
+ }
+ }
+}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
--
Gitblit v1.8.0