From 8d0ee0a2c32c7a99afc01b0a0c795d708a9b7955 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 21 九月 2023 09:46:39 +0800
Subject: [PATCH] 概述和产品相关接口联调待完善
---
src/views/overview/AddOverviewDialog.vue | 370 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 292 insertions(+), 78 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7a35712..1f8f11f 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -8,7 +8,7 @@
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "閲囪喘鍏ュ簱" }}</span>
+ <span>{{ editCommonConfig.title + addName }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -39,12 +39,32 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鎺ユ敹" prop="client_name">
+ <el-form-item prop="companyName">
+ <span slot="label">{{ workType === 1 ? "瀹㈡埛" : workType === 2 ? "閫佽揣鍦板潃" : "鑱旂郴浜�" }}</span>
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.company"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <el-option
+ v-for="item in companyOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name }"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item v-if="workType === 3" label="鑱旂郴浜�" prop="contacterName">
+ <el-select
+ v-model="editConfig.infomation.contacterName"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
:disabled="!showFooter"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
@@ -53,52 +73,71 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹夋帓鐨勬棩鏈�" prop="refundDate">
+ <el-form-item v-if="workType === 2" 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="operationDate">
<el-date-picker
- v-model="editConfig.infomation.refundDate"
+ v-model="editConfig.infomation.operationDate"
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width: 63%"
+ style="width: 90%"
:disabled="!showFooter"
>
</el-date-picker>
</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: 63%"
- :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 label="鍏ュ簱绫诲瀷">
+ <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
</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: 63%"
+ style="width: 90%"
:disabled="!showFooter"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐩殑浣嶇疆" prop="client_name">
+ <el-form-item v-if="workType !== 1" label="婧愪綅缃�" prop="fromLocationId">
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.fromLocationId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ 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 fromLocationOptions" :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 v-if="workType !== 2" label="浠撳簱浣嶇疆" prop="toLocationId">
+ <el-select
+ v-model="editConfig.infomation.toLocationId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -107,27 +146,44 @@
</div>
<div class="bottom">
<el-tabs v-model="activeName" type="card">
+ <!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="鎿嶄綔" name="first"> </el-tab-pane>
<el-tab-pane label="鍏朵粬淇℃伅" name="second">
- <el-col :span="12">
- <el-form-item label="璐熻矗浜�" prop="client_name">
- <el-select
- v-model="editConfig.infomation.memberId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- :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>
+ <div class="purchase-view">
+ <div class="left">
+ <div class="second-label">鍏朵粬淇℃伅</div>
+ <el-form-item v-if="workType !== 1" 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-form-item label="璐熻矗浜�" prop="contacterName">
+ <el-select
+ v-model="editConfig.infomation.contacterName"
+ 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>
+ </div>
+ <div class="right"></div>
+ </div>
</el-tab-pane>
<el-tab-pane label="澶囨敞" name="third">
- <el-form-item label="澶囨敞" prop="desc">
+ <el-form-item label="澶囨敞" prop="comment">
<el-input
- v-model.trim="editConfig.infomation.desc"
+ v-model.trim="editConfig.infomation.comment"
size="mini"
type="textarea"
style="width: 85%"
@@ -137,17 +193,18 @@
</el-form-item>
</el-tab-pane>
</el-tabs>
+ <!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
<CommonFormTableView
:product-table-list="productTableList"
:detail-enter="!showFooter"
@inputContent="inputContent"
- @addProductClick="addProductClick"
+ @addProductClick="addProductClick('鎿嶄綔')"
>
<template v-if="showFooter" slot="tableButton">
<el-table-column label="鎿嶄綔" width="60" fixed="right" align="center">
<template slot-scope="scope">
- <div @click="handleDelClick(scope)">
+ <div @click="handleDelClick(scope, '鎿嶄綔')">
<i class="el-icon-delete"></i>
</div>
</template>
@@ -155,6 +212,25 @@
</template>
</CommonFormTableView>
</div>
+ <!-- 璇︽儏 -->
+ <!-- <div v-if="activeName === 'detail'">
+ <CommonFormTableView
+ :product-table-list="detailTableList"
+ :detail-enter="!showFooter"
+ @inputContent="inputDetail"
+ @addProductClick="addProductClick('璇︽儏')"
+ >
+ <template v-if="showFooter" slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="60" fixed="right" align="center">
+ <template slot-scope="scope">
+ <div @click="handleDelClick(scope, '璇︽儏')">
+ <i class="el-icon-delete"></i>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ </CommonFormTableView>
+ </div> -->
</div>
</div>
</el-form>
@@ -170,6 +246,8 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+// import { addOperation } from "@/api/overview/overview"
+import { getCompanyList } from "@/api/common/other"
export default {
name: "AddOverviewDialog",
props: {
@@ -182,6 +260,14 @@
infomation: {}
}
}
+ },
+ workType: {
+ type: Number,
+ default: 1
+ },
+ addName: {
+ type: String,
+ default: "璋冩嫧"
}
},
components: { CommonFormTableView },
@@ -197,8 +283,10 @@
memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }]
},
+ companyOptions: [], // 鍏徃
memberOptions: [],
- paymentTypeListOptions: [],
+ fromLocationOptions: [], // 婧愪綅缃�
+ toLocationOptions: [], // 浠撳簱浣嶇疆
list: [
{ label: "鑽夌", status: "todo" },
{ label: "姝ｅ湪绛夊緟", status: "todo" },
@@ -209,18 +297,39 @@
activeName: "first",
productTableList: {},
tableData: [{ name: "ssss" }],
+ productId: 0,
isNoProduct: false, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
- currentState: "todo" // 褰撳墠鐘舵��
+ currentState: "todo", // 褰撳墠鐘舵��
+ detailTableList: {},
+ detailTableData: [{ name: "ssss" }],
+ detailId: 0,
+ isNoDetail: false, // 娣诲姞璇︽儏鏄庣粏琛屾椂鏄惁鏈�夋嫨
+ tableColumn: [],
+ receiptType: this.addName, // 鍏ュ簱绫诲瀷
+ companyObj: {},
+ contacterObj: {}
}
},
created() {
this.setTableForm()
this.setBottonView()
+ this.setDetailTableForm()
+ this.activeName = this.workType === 1 ? "first" : "detail"
+ this.getCompanyList()
},
methods: {
+ // 鑾峰彇鍏徃鍒楄〃
+ async getCompanyList() {
+ await getCompanyList().then((res) => {
+ console.log(res)
+ if (res.data.code === 200) {
+ this.companyOptions = res.data.data
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
@@ -265,23 +374,53 @@
this.setTableForm()
},
// 淇濆瓨
- saveClick() {},
+ saveClick() {
+ this.saveParams()
+ },
+ saveParams() {
+ let data = this.editConfig.infomation
+ console.log(this.companyObj)
+ let params = {
+ companyID: data.company.value || 0,
+ companyName: data.company.label || "",
+ contacterID: 0,
+ contacterName: "string",
+ details: [
+ {
+ finishQuantity: 0,
+ productId: 0,
+ productName: "string",
+ quantity: 0
+ }
+ ],
+ fromLocationId: data.fromLocationId || 0,
+ id: 0,
+ number: "",
+ operationDate: data.operationDate || "",
+ operationTypeId: data.operationTypeId,
+ sourceNumber: data.sourceNumber || "",
+ status: 3,
+ toLocationId: data.toLocationId || 0
+ }
+ return params
+ },
// 鍒犻櫎
delClick() {},
+ // 鎿嶄綔鍒楄〃
setTableForm() {
this.productTableList = {
tableData: this.tableData,
tableColumn: [
{ label: "浜у搧", prop: "name", productName: true, isRequird: true },
- { label: "璇存槑", prop: "number", input: true },
- { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true },
- { label: "鎴鏃ユ湡", prop: "price", date: true },
+ // { label: "璇存槑", prop: "number", input: true },
+ // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true },
+ // { label: "鎴鏃ユ湡", prop: "price", date: true },
{ label: "瀹屾垚", prop: "total", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "total", select: true }
]
}
},
- // 浜у搧鍒楄〃杈撳叆
+ // 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
this.productId = row.productId
this.tableData.map((item) => {
@@ -290,35 +429,99 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- console.log(this.tableData)
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
- this.isNoProduct = true
- break
- } else {
- this.isNoProduct = false
+ // 鏂板
+ addProductClick(value) {
+ if (value === "鎿嶄綔") {
+ console.log(this.tableData)
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
+ }
+ if (!this.isNoProduct) {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
+ }
+ } else {
+ console.log(this.detailTableData)
+ for (let i = 0; i < this.detailTableData.length; i++) {
+ if (this.detailTableData[i].name.length === 0) {
+ this.isNoDetail = true
+ break
+ } else {
+ this.isNoDetail = false
+ }
+ }
+ if (!this.isNoDetail) {
+ this.detailId++
+ this.detailTableData.push({
+ detailId: this.detailId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
}
}
- if (!this.isNoProduct) {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
+ },
+ // 鍒犻櫎
+ handleDelClick(scope, value) {
+ console.log(scope)
+ if (value === "鎿嶄綔") {
+ this.tableData.splice(scope.$index, 1)
+ } else {
+ this.detailTableData.splice(scope.$index, 1)
}
},
- // 浜у搧鍒犻櫎
- handleDelClick(scope) {
- console.log(scope)
- this.tableData.splice(scope.$index, 1)
+ // 璇︽儏鍒楄〃
+ setDetailTableForm() {
+ this.setTableColumn()
+ this.detailTableList = {
+ tableData: this.detailTableData,
+ tableColumn: this.tableColumn
+ }
+ },
+ setTableColumn() {
+ if (this.workType === "鍐呴儴璋冩嫧") {
+ this.tableColumn = [
+ { label: "浜у搧", prop: "name", productName: true, isRequird: true },
+ { label: "浠�", prop: "number", select: true },
+ { label: "鑷�", prop: "amount", select: true },
+ { label: "瀹屾垚", prop: "total", inputFloat: true },
+ { label: "璁￠噺鍗曚綅", prop: "total", select: true }
+ ]
+ } else {
+ this.tableColumn = [
+ { label: "浜у搧", prop: "name", productName: true, isRequird: true },
+ { label: "浠�", prop: "number", select: true },
+ { label: "瀹屾垚", prop: "total", inputFloat: true },
+ { label: "璁￠噺鍗曚綅", prop: "total", select: true }
+ ]
+ }
+ },
+ // 璇︽儏杈撳叆
+ inputDetail(val, prop, row) {
+ this.detailId = row.detailId
+ this.detailTableData.map((item) => {
+ if (item.detailId === row.detailId) {
+ item[prop] = val
+ }
+ })
}
}
}
@@ -353,9 +556,20 @@
.basic-info-view {
margin-top: 20px;
}
- // .bottom {
- // margin-left: 20px;
- // }
+}
+.purchase-view {
+ display: flex;
+ .left {
+ width: 50%;
+ }
+ .right {
+ width: 50%;
+ }
+}
+.second-label {
+ margin-left: 20px;
+ border-bottom: 1px solid #d9d9d9;
+ margin-bottom: 10px;
}
::v-deep {
.el-dialog__headerbtn {
--
Gitblit v1.8.0