From 52bb988de16298ca1c7364e5fb6b0faa47d0c088 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:42 +0800
Subject: [PATCH] feat: 销售机会/报价单销售总单/销售子单 去除批量删除添加单独删除;表单宽度/label宽度调整
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 235 ++++++++++++++++++++++++----------------------------------
1 files changed, 99 insertions(+), 136 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index bbd4601..10f5a17 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="100px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -38,8 +38,12 @@
<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
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -65,8 +69,15 @@
<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
+ v-if="
+ editConfig.infomation.master_order_number &&
+ editConfig.infomation.master_order_number.length > 0
+ "
+ class="common-select-btn"
+ @click="clearupClient('master')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -77,7 +88,7 @@
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -126,70 +137,14 @@
</div>
<div class="product-view">
<CommonFormTableView
+ :show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
/>
- </div>
- <!-- 鍚堣 -->
- <div class="basic-info-view">
- <el-row>
- <el-col :span="7" :offset="17">
- <el-form-item prop="discount">
- <template slot="label">
- <span>鏁村崟鎶樻墸</span>
- <el-select
- v-model="discount"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 104px; margin-left: 3px"
- disabled
- >
- <el-option
- v-for="item in discountOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </template>
- <el-input v-model="editConfig.infomation.discount" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="7" :offset="17">
- <el-form-item prop="discount">
- <template slot="label">
- <span>璋冩暣</span>
- <el-select
- v-model="adjust"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 74px; margin-left: 3px"
- disabled
- >
- <el-option
- v-for="item in adjustOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </template>
- <el-input v-model="editConfig.infomation.discount" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="7" :offset="17">
- <el-form-item label="鍚堣" prop="total">
- <el-button type="text" v-model="editConfig.infomation.total" style="color: #555; font-size: 13px">{{
- editConfig.infomation.total ? editConfig.infomation.total : "0.00"
- }}</el-button>
- </el-form-item>
- </el-col>
- </el-row>
</div>
</div>
</el-form>
@@ -245,7 +200,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -266,9 +221,9 @@
productTableList: {},
showSummary: {
show: true,
- total: false,
- sumProp: ["other1", "other7"],
- mergeNumber: 7
+ total: true,
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -319,26 +274,38 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- 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.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ 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.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
- getUpdateSubOrder(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
+ 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.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ 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")
@@ -369,11 +336,6 @@
} 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)
},
@@ -430,86 +392,84 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
} else {
this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
}
this.productTableList = {
tableData: this.tableData,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "Number" },
- { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "Unit", input: true },
- { label: "浠风◣鍚堣", prop: "total", input: true },
- { label: "鎻忚堪", prop: "other8" }
+ { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- console.log("aaaaaaaa")
- console.log(val, prop)
- this.productId = row.id
+ this.productId = row.productId
this.tableData.map((item) => {
- if (item.id === row.id) {
+ if (item.productId === row.productId) {
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: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
})
+ this.showSummary.show = true
},
// 浜у搧娓呯┖
emptyProductClick() {
this.productId = 1
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
this.productTableList.tableData = this.tableData
},
// 浜у搧閲嶇畻
- recalculateProductClick() {}
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ }
}
}
</script>
@@ -538,6 +498,9 @@
font-size: 18px;
cursor: pointer;
}
+ .el-autocomplete{
+ flex: 1;
+ }
}
}
.address-view {
--
Gitblit v1.8.0