From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/quotation/AddQuotationDialog.vue | 373 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 283 insertions(+), 90 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 17e48af..3909be1 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -10,10 +10,11 @@
>
<el-form
ref="form"
+ v-if="refreshFlag"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="110px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -24,6 +25,29 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item label="鎶ヤ环缂栧彿" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
+ />
+ <span v-else-if="method == 0" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎶ヤ环鍚嶇О" prop="quotationName">
+ <div class="custom-name">
+ <el-input v-model="editConfig.infomation.quotationName"></el-input>
+ </div>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
<el-autocomplete
@@ -39,17 +63,21 @@
<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>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎶ヤ环缂栧彿" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
- </el-form-item>
- </el-col>
+ </el-col> -->
+ <!-- <el-col :span="12">-->
+ <!-- <el-form-item label="鎶ヤ环缂栧彿" prop="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
<el-col :span="12">
<el-form-item label="鎶ヤ环鍗曠姸鎬�" prop="quotation_status_id">
<div class="common-select">
@@ -68,7 +96,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -78,12 +106,13 @@
v-model="editConfig.infomation.validity_date"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
+ style="width: 100%"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="contact_id">
<div class="custom-name">
<el-autocomplete
@@ -99,19 +128,23 @@
<div class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contact')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contact')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="member_id">
<el-select
v-model="editConfig.infomation.member_id"
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>
@@ -119,11 +152,28 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="sale_chance_id">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.sale_chance_id"></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.sale_chance_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'chance')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('chance', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('chance')">
+ <i class="el-icon-circle-plus-outline"></i>
+ </div>
+ <div
+ v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
+ </div>
</div>
</el-form-item>
</el-col>
@@ -172,19 +222,27 @@
</el-row>
</div> -->
<!-- 浜у搧绠＄悊 -->
- <!-- <div class="basic-info-title" style="display: flex">
+ <div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
<el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</div>
<div class="product-view">
- <CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
- </div> -->
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
+ </div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
<div class="basic-info-view">
@@ -243,18 +301,27 @@
:edit-common-config="editSelectContactConfig"
@selClient="selClient"
/>
+ <!-- 閫夋嫨閿�鍞満浼� -->
+ <SelectChanceDialog
+ v-if="editSelectChanceConfig.editVisible"
+ :edit-common-config="editSelectChanceConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
<script>
-// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddQuotation, getUpdateQuotation } from "@/api/sales/quotation"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
+import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "QuotationDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -267,7 +334,7 @@
}
}
},
- components: { SelectClientDialog, SelectContactDialog },
+ components: { SelectClientDialog, SelectContactDialog, SelectChanceDialog, CommonFormTableView },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -277,28 +344,33 @@
},
contactNamelist() {
return this.$store.state.getClientName.contactNamelist
+ },
+ saleChancelist() {
+ return this.$store.state.getClientName.saleChancelist
}
},
data() {
return {
- dialogWidth: "80%",
+ refreshFlag: true,
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- client_id: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
memberOptions: [],
- quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
- currencyOptions: [], // 甯佺
+ quotationStatusOptions: [], // 鎶ヤ环鍗曠姸鎬�
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -310,66 +382,100 @@
title: "",
infomation: {}
},
+ editSelectChanceConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
clientId: this.editCommonConfig.infomation.client_id,
- contactId: this.editCommonConfig.infomation.contact_id
+ contactId: this.editCommonConfig.infomation.contact_id,
+ saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
+ tableData: [],
+ productId: 1,
+ isNoProduct: true,
+ objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" }
}
},
created() {
this.$store.dispatch("geClient")
this.$store.dispatch("geContact")
+ this.$store.dispatch("geChance")
this.setTableForm()
this.getCommonData()
+ this.formInfo()
+ },
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
+ }
+ this.getRCodeStandardList()
+ },
getCommonData() {
getAllData()
.then((res) => {
this.memberOptions = res.data.member
this.quotationStatusOptions = res.data.quotationStatus
+ this.dataProcess()
})
.catch((err) => {
console.log(err)
})
},
+ dataProcess() {
+ this.saleChancelist.map((item) => {
+ if (this.saleChanceId === item.id) {
+ this.editConfig.infomation.sale_chance_name = item.name
+ }
+ })
+ },
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
- console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddQuotation(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)
- })
+ 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 {
- getUpdateQuotation(params)
- .then((res) => {
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddQuotation(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
+ this.$message.success("娣诲姞鎴愬姛")
this.$parent.getData()
}
})
- .catch((err) => {
- console.log(err)
+ } else {
+ getUpdateQuotation(params).then((res) => {
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
})
+ }
}
} else {
console.log("error submit")
@@ -377,19 +483,32 @@
}
})
},
+ /**
+ * 寮哄埗鍒锋柊form缁勪欢
+ * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
+ */
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
+ })
+ },
saveParams() {
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- client_id: parseInt(this.clientId) || 0,
+ quotationName: data.quotationName || "",
conditions: data.conditions || "",
- contact_id: parseInt(this.contactId) || 0,
file: data.file || "",
member_id: data.member_id || 0,
number: data.number || "",
quotation_status_id: data.quotation_status_id || 0,
- sale_chance_id: data.sale_chance_id || 0,
- validity_date: data.validity_date || ""
+ sale_chance_id: this.saleChanceId || 0,
+ validity_date: data.validity_date || "",
+ products: this.tableData,
+ codeStandID: data.ID,
+ codeRule: this.codeRule,
+ client_id: this.clientId || 0
}
return params
},
@@ -403,6 +522,8 @@
restaurants = this.clientList
} else if (value === "contact") {
restaurants = this.contactNamelist
+ } else if (value === "chance") {
+ restaurants = this.saleChancelist
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
cb(results)
@@ -416,6 +537,8 @@
console.log(value)
if (value === "client") {
this.clientId = item.id
+ } else if (value === "chance") {
+ this.saleChanceId = item.id
} else {
this.contactId = item.id
}
@@ -425,6 +548,8 @@
this.editSelectClientConfig.editVisible = true
} else if (value === "contact") {
this.editSelectContactConfig.editVisible = true
+ } else if (value === "chance") {
+ this.editSelectChanceConfig.editVisible = true
}
},
selClient(row, value) {
@@ -432,55 +557,118 @@
if (value === "contact") {
this.editConfig.infomation.contact_name = row.name
this.contactId = row.id
+ } else if (value === "chance") {
+ this.editConfig.infomation.sale_chance_name = row.name
+ this.saleChanceId = row.id
} else {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
}
+ this.refresh()
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
this.editConfig.infomation.client_name = ""
this.clientId = 0
+ } else if (value === "chance") {
+ this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId = 0
} else {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
}
+ this.refresh()
},
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
- ],
- tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" }
]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ }
+ this.productTableList = {
+ tableData: this.tableData,
+ tableColumn: [
+ { 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) {
+ this.productId = row.productId
+ this.tableData.map((item) => {
+ if (item.productId === row.productId) {
+ item[prop] = val
+ }
+ })
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
+ this.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ },
+ // 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
+ checkChance(rule, value, callback) {
+ if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
}
}
}
@@ -508,7 +696,7 @@
.common-select {
display: flex;
.common-select-sel {
- width: 270px;
+ flex: 1;
}
.common-select-btn {
margin-left: 5px;
@@ -516,6 +704,11 @@
cursor: pointer;
}
}
+ .custom-name {
+ .el-autocomplete {
+ flex: 1;
+ }
+ }
}
.annex-view {
display: flex;
--
Gitblit v1.8.0