From 1249ca8ff44f8de7992fdb5866eae19613d606c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 19:37:49 +0800
Subject: [PATCH] 详情页联调
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 372 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 263 insertions(+), 109 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 2dd9a08..462727f 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -5,6 +5,8 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ append-to-body
+ custom-class="iframe-dialog"
>
<el-form
ref="form"
@@ -21,11 +23,24 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.clientId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'client')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('client', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('client')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient('client')">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -35,11 +50,24 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞�诲崟" prop="masterOrderId">
+ <el-form-item label="閿�鍞�诲崟" prop="master_order_number">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.masterOrderId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ v-model="editConfig.infomation.master_order_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'master')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('master', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('master')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div class="common-select-btn" @click="clearupClient('master')">
+ <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -59,7 +87,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info-title">闄勪欢淇℃伅</div>
+ <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -84,7 +112,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
@@ -103,7 +131,11 @@
</div>
</div>
<div class="product-view">
- <CommonFormTableView :product-table-list="productTableList" />
+ <CommonFormTableView
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ />
</div>
<!-- 鍚堣 -->
<div class="basic-info-view">
@@ -169,6 +201,18 @@
<el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
+ <!-- 閫夋嫨瀹㈡埛 -->
+ <SelectClientDialog
+ v-if="editSelectClientConfig.editVisible"
+ :edit-common-config="editSelectClientConfig"
+ @selClient="selClient"
+ />
+ <!-- 閫夋嫨閿�鍞�诲崟 -->
+ <SelectCommonDialog
+ v-if="editSelectMasterConfig.editVisible"
+ :edit-common-config="editSelectMasterConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -177,9 +221,12 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+
export default {
name: "SubOrderDialog",
- components: { CommonFormTableView },
+ components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
props: {
editCommonConfig: {
type: Object,
@@ -192,7 +239,14 @@
}
}
},
- computed: {},
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ },
+ masterOrderList() {
+ return this.$store.state.getClientName.masterOrderList
+ }
+ },
data() {
return {
dialogWidth: "80%",
@@ -219,10 +273,27 @@
total: false,
sumProp: ["other1", "other7"],
mergeNumber: 7
- }
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelectMasterConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ clientId: this.editCommonConfig.infomation.client_id,
+ masterId: this.editCommonConfig.infomation.masterOrderId,
+ tableData: [],
+ productId: 1,
+ addProductArr: []
}
},
created() {
+ this.$store.dispatch("geClient")
+ this.$store.dispatch("geMaster")
this.setTableForm()
this.getCommonData()
},
@@ -233,11 +304,19 @@
console.log(res)
if (res.code === 200) {
this.memberOptions = res.data.member
+ this.dataProcess()
}
})
.catch((err) => {
console.log(err)
})
+ },
+ dataProcess() {
+ this.masterOrderList.map((item) => {
+ if (this.masterId === item.id) {
+ this.editConfig.infomation.master_order_number = item.number
+ }
+ })
},
// 淇濆瓨
saveClick(formName) {
@@ -247,37 +326,23 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddSubOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddSubOrder(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- getUpdateSubOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateSubOrder(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -289,58 +354,144 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- clientId: parseInt(data.client_id) || 0,
- masterOrderId: parseInt(data.masterOrderId) || 0,
+ clientId: this.clientId || 0,
+ masterOrderId: this.masterId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- product: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ product: this.tableData
}
return params
},
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ } else if (value === "master") {
+ restaurants = this.masterOrderList
+ }
+ // else if (value === "chance") {
+ // restaurants = this.saleChancelist
+ // } else {
+ // restaurants = this.saleLeadlist
+ // }
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString, value) {
+ return (state) => {
+ console.log(state)
+ if (value === "client") {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else if (value === "master") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ }
+ },
+ handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ } else if (value === "master") {
+ this.masterId = item.id
+ }
+ },
+ selClientClick(value) {
+ if (value == "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value == "master") {
+ this.editSelectMasterConfig.title = "閿�鍞�诲崟"
+ this.editSelectMasterConfig.editVisible = true
+ this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList]
+ }
+ },
+ selClient(row, value) {
+ console.log(row)
+ if (value == "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.editConfig.infomation.client_id = row.id
+ this.clientId = row.id
+ } else if (value == "master") {
+ this.editConfig.infomation.master_order_number = row.number
+ this.masterId = row.id
+ }
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient(value) {
+ if (value == "client") {
+ this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.client_id = 0
+ this.clientId = 0
+ } else if (value == "master") {
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
+ }
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓") {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "",
- other6: "3.00",
- other7: "2.00"
+ id: 1,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
}
- ],
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ }
+ this.productTableList = {
+ tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "璁￠噺鍗曚綅", prop: "other2" },
- { label: "瑙勬牸缂栧彿", prop: "other3" },
- { label: "婧愬崟绫诲瀷", prop: "other4" },
- { label: "鍚堝悓淇℃伅", prop: "other5" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other6", input: true },
- { label: "浠风◣鍚堣", prop: "other7", input: true },
+ { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "Number" },
+ { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "Unit", input: true },
+ { label: "浠风◣鍚堣", prop: "other3", input: true },
{ label: "鎻忚堪", prop: "other8" }
]
}
+ },
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ console.log("aaaaaaaa")
+ console.log(val, prop)
+ this.productId = row.id
+ this.tableData.map((item) => {
+ if (item.id === row.id) {
+ item[prop] = val
+ }
+ })
+ console.log(this.tableData)
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ id: this.productId,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
+ })
}
}
}
@@ -348,44 +499,47 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-quotation {
- .basic-info {
- .basic-info-title {
- background-color: #f4f8fe;
- padding-left: 10px;
- font-size: 15px;
- font-weight: bold;
- color: #666;
- height: 42px;
- line-height: 42px;
- }
- .basic-info-view {
- margin-top: 10px;
- padding-right: 40px;
- .custom-name {
+::v-deep {
+ .iframe-dialog .el-dialog__body {
+ .basic-info {
+ .basic-info-title {
+ background-color: #f4f8fe;
+ padding-left: 10px;
+ font-size: 15px;
+ font-weight: bold;
+ color: #666;
+ height: 42px;
+ line-height: 42px;
+ }
+ .basic-info-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ .custom-name {
+ display: flex;
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 18px;
+ cursor: pointer;
+ }
+ }
+ }
+ .address-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ }
+ .annex-view {
display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
}
- .annex-view {
- display: flex;
- color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
- }
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
}
}
</style>
--
Gitblit v1.8.0