From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/overview/AddOverviewDialog.vue | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index b984d55..8b6c479 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -108,8 +108,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏ュ簱绫诲瀷">
- <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
+ <el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
+ <el-select
+ v-if="showOperationType"
+ v-model="editConfig.infomation.operationTypeId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ <el-input v-else v-model="receiptType" disabled style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -260,7 +271,14 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
-import { getLocationList, addOperation, updateOperation, updateStatus, deleteOperation } from "@/api/overview/overview"
+import {
+ getLocationList,
+ addOperation,
+ updateOperation,
+ updateStatus,
+ deleteOperation,
+ getOperationType
+} from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
name: "AddOverviewDialog",
@@ -283,6 +301,10 @@
addName: {
type: String,
default: "璋冩嫧"
+ },
+ showOperationType: {
+ type: Boolean,
+ default: false
}
},
components: { CommonFormTableView },
@@ -295,7 +317,8 @@
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }]
+ fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
+ operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
},
companyOptions: [], // 鍏徃
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
@@ -324,7 +347,8 @@
receiptType: "", // 鍏ュ簱绫诲瀷
companyObj: {},
contacterObj: {},
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
+ operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃
}
},
created() {
@@ -334,6 +358,9 @@
this.getCompanyList()
this.getLocationList()
this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
+ if (this.showOperationType) {
+ this.getOperationType()
+ }
},
methods: {
// 鑾峰彇鍏徃鍒楄〃
@@ -358,6 +385,25 @@
}
})
},
+ // 鑾峰彇浠撳簱绫诲瀷
+ async getOperationType() {
+ await getOperationType({
+ keyword: "",
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ console.log(res.data.data)
+ if (res.data.code === 200) {
+ const list = res.data.data.map((item) => {
+ return {
+ name: item.name,
+ id: item.id
+ }
+ })
+ this.operationTypeOptions = list || []
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
@@ -365,7 +411,7 @@
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === 4) {
+ } else if (this.editConfig.infomation.status === 4||this.editConfig.infomation.status === "瀹屾垚") {
this.showButton = true
this.showEdit = false
this.isDelClick = true
@@ -377,6 +423,7 @@
this.showFooter = false
this.isValidateClick = false
} else {
+ // 灏辩华---
this.showButton = true
this.showEdit = true
this.showFooter = false
@@ -386,7 +433,8 @@
this.list[0].status = "active"
} else {
this.list.map((item) => {
- if (item.value === this.editConfig.infomation.status) {
+ console.log(item,this.editConfig.infomation.status,"鎵撳嵃淇℃伅")
+ if (item.value === this.editConfig.infomation.status||item.label===this.editConfig.infomation.status) {
item.status = "active"
} else {
item.status = "todo"
@@ -462,9 +510,9 @@
details: this.tableData,
fromLocationId: data.fromLocationId || 0,
id: data.id,
- number: "",
+ number: data.number || "",
operationDate: data.operationDate || "",
- operationTypeId: this.editConfig.operationTypeId,
+ operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
@@ -485,7 +533,19 @@
},
// 鎿嶄綔鍒楄〃
setTableForm() {
- this.tableData = this.editConfig.title !== "鏂板缓" ? this.editConfig.infomation.details : []
+ if (this.editConfig.title !== "鏂板缓") {
+ const list = this.editConfig.infomation.details.map((item) => {
+ return {
+ ...item,
+ productName: item.product.name,
+ unit: item.product.unit
+ }
+ })
+ this.tableData = list
+ } else {
+ this.tableData = []
+ }
+ // this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
this.productTableList = {
tableData: this.tableData,
tableColumn: [
--
Gitblit v1.8.0