From 2fb4239e828bcfa9711ce4cecc4b942767621d62 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:20:20 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 114 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 7d932ac..2bd7459 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -25,7 +25,21 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number">
- <WordInput
+ <el-input
+ v-if="
+ isView ||
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫' || isView"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
@@ -36,7 +50,7 @@
<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>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -52,16 +66,21 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
- :disabled="isNameChanceEdit"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
+ <div
+ v-if="!isNameChanceEdit && !isView"
+ class="common-select-btn"
+ @click="selClientClick('client')"
+ >
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
v-if="
editConfig.infomation.client_name &&
editConfig.infomation.client_name.length > 0 &&
- !isNameChanceEdit
+ !isNameChanceEdit &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('client')"
@@ -85,16 +104,21 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
- :disabled="isNameChanceEdit"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
+ <div
+ v-if="!isNameChanceEdit && !isView"
+ 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 &&
- !isNameChanceEdit
+ !isNameChanceEdit &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('chance')"
@@ -104,7 +128,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閿�鍞瓙鍗�" prop="subbill_name">
<div class="custom-name">
<el-autocomplete
@@ -135,7 +159,7 @@
</div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number">
<div class="custom-name">
@@ -150,16 +174,21 @@
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation"
+ :disabled="isAddQuatation || isView"
></el-autocomplete>
- <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
+ <div
+ v-if="!isAddQuatation && !isView"
+ class="common-select-btn"
+ @click="selClientClick('quotation')"
+ >
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
v-if="
editConfig.infomation.quotation_number &&
editConfig.infomation.quotation_number.length > 0 &&
- !isAddQuatation
+ !isAddQuatation &&
+ !isView
"
class="common-select-btn"
@click="clearupClient('quotation')"
@@ -177,6 +206,7 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
>
</el-date-picker>
</el-form-item>
@@ -188,6 +218,7 @@
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
+ :disabled="isView"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -202,6 +233,7 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="width: 100%"
+ :disabled="isView"
>
</el-date-picker>
</el-form-item>
@@ -213,6 +245,7 @@
placeholder="璇烽�夋嫨"
size="mini"
style="width: 100%"
+ :disabled="isView"
>
<el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -227,12 +260,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏀惰揣浜�" prop="addressee">
- <el-input v-model="editConfig.infomation.addressee"></el-input>
+ <el-input v-model="editConfig.infomation.addressee" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="phone">
- <el-input v-model="editConfig.infomation.phone"></el-input>
+ <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -242,17 +275,18 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.address"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
- <el-input v-model="editConfig.infomation.logisticCompany"></el-input>
+ <el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
- <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
+ <el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -264,6 +298,7 @@
:precision="2"
:controls="false"
style="width: 100%; margin-right: 5px"
+ :disabled="isView"
></el-input-number>
</el-form-item>
</el-col>
@@ -280,6 +315,7 @@
type="textarea"
:autosize="{ minRows: 4 }"
v-model="editConfig.infomation.conditions"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -295,6 +331,7 @@
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.remark"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -332,7 +369,13 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <el-select
+ v-model="editConfig.infomation.currency"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 63%"
+ :disabled="isView"
+ >
<el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -342,7 +385,7 @@
<CommonFormTableView
ref="commonFormTableView"
:detail-enter="true"
- :select-box="true"
+ :select-box="selectBox"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
@@ -432,7 +475,7 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
@@ -474,7 +517,7 @@
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
// subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
- number: [{ required: true, message: "璇疯緭鍏ヨ鍗曠紪鍙�", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
@@ -527,7 +570,9 @@
quotationList: [],
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
- selProductData: []
+ selProductData: [],
+ isView: this.editCommonConfig.title === "鏌ョ湅",
+ selectBox: this.editCommonConfig.title !== "鏌ョ湅"
}
},
created() {
@@ -547,9 +592,6 @@
if (val) {
this.formInfo()
}
- },
- "editClientManageConfig.infomation.codeStandID"() {
- this.formInfo()
}
},
// beforeUpdate() {
@@ -585,11 +627,9 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
- console.log(this.editConfig.infomation)
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
+ for (let i = 0; i < this.selProductData.length; i++) {
+ if (this.selProductData[i].name.length === 0) {
this.isNoProduct = true
break
} else {
@@ -617,6 +657,7 @@
}
})
} else {
+ console.log(this.selProductData)
getUpdateSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -653,7 +694,6 @@
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || "",
- codeRule: this.codeRule,
quotationId: this.quotationId,
deliverType: data.deliverType || 0
}
@@ -692,8 +732,14 @@
this.tableData = item.products
this.tableData.map((item, index) => {
item.productId = index + 1
+ this.selProductData.forEach((key) => {
+ if (item.number === key.number) {
+ item.amount = key.amount
+ item.id = key.id
+ }
+ })
})
- this.productTableList.tableData = item.products
+ this.productTableList.tableData = this.tableData
this.selProductData.forEach((key) => {
this.tableData.forEach((row) => {
if (key.number === row.number) {
@@ -827,6 +873,8 @@
this.editConfig.infomation.sale_chance_name = ""
this.editConfig.infomation.client_name = ""
this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
this.clientId = 0
this.saleChanceId = 0
this.subbillId = 0
@@ -839,7 +887,11 @@
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = ""
this.subbillId = 0
+ } else if (value === "quotation") {
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
}
+ this.productTableList.tableData = []
},
// 娣诲姞闄勪欢
addAnnexClick() {},
--
Gitblit v1.8.0