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 | 230 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 179 insertions(+), 51 deletions(-)
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 4ed9700..b877a3e 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -29,47 +29,52 @@
label-position="right"
label-width="120px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
<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">
+ <SimpleSearchInput
+ :echoValue="editConfig.infomation.productName"
+ :echoName="editConfig.infomation.productName"
+ checkedNum="1"
+ :clearable="true"
+ @select-user="selProductChange"
+ :disabled="!showFooter"
+ style="width: 90%"
+ >
+ </SimpleSearchInput>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <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-select
- v-model="editConfig.infomation.memberId"
- 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>
- </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"
@@ -77,26 +82,27 @@
style="width: 90%"
: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"
@@ -108,15 +114,19 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <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')">淇濆瓨</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 SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
export default {
name: "AddScrapDialog",
props: {
@@ -131,52 +141,93 @@
}
}
},
- components: {},
+ components: { SimpleSearchInput },
computed: {},
data() {
return {
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, 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" }]
},
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 === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || 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.showEdit = true
+ this.showButton = true
+ this.showEdit = false
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 +245,81 @@
this.showFooter = true
},
// 淇濆瓨
- saveClick() {}
+ 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
+ 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.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
+ if (res.code === 200) {
+ 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>
@@ -221,13 +346,13 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
- .basic-info-view {
- margin-top: 20px;
- }
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
.purchase-view {
display: flex;
@@ -262,5 +387,8 @@
line-height: 30px;
font-size: 13px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
</style>
--
Gitblit v1.8.0