From eed27d3000e127c433fd45609d0d5e5d06b7868c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 26 十二月 2023 11:14:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/quotation/AddQuotationDialog.vue | 225 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 153 insertions(+), 72 deletions(-)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 386c0bb..cf978a6 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -26,26 +26,41 @@
<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.infomation.id || isIdDisabled"
- :inputValue="inputValue"
- @codeList="codeList"
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ 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"
+ :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
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>鑷姩鐢熸垚</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
@@ -70,12 +85,12 @@
</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">
@@ -110,7 +125,7 @@
</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
@@ -135,7 +150,7 @@
</div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="member_id">
<el-select
@@ -150,7 +165,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
+ :rules="[{ required: autoCodeHeadersObj.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.sale_chance_name"
@@ -222,20 +238,23 @@
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
- <div style="margin-left: 400px">
+ <!-- <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.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- </div>
+ </div> -->
</div>
<div class="product-view">
<CommonFormTableView
:show-summary="showSummary"
+ pageName="quotation"
+ :addTypeIdMultiple="true"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
@clearupProduct="clearupProduct"
@@ -316,10 +335,10 @@
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";
+import codeMixin from "@/components/makepager/mixin/codeMixin"
export default {
name: "QuotationDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -353,14 +372,14 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- client_id: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
+ quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "blur" }],
- member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ // sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
+ member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
},
memberOptions: [],
- quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
+ quotationStatusOptions: [], // 鎶ヤ环鍗曠姸鎬�
currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
@@ -368,7 +387,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -391,7 +410,7 @@
tableData: [],
productId: 1,
isNoProduct: true,
- objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" }
}
},
created() {
@@ -401,30 +420,38 @@
this.setTableForm()
this.getCommonData()
this.formInfo()
+ this.getUseSystemSet({modeType:'bjd'})
},
- watch:{
- 'editConfig.visible'(val){
- if(val){
+ 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;
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
getAllData()
.then((res) => {
this.memberOptions = res.data.member
- this.quotationStatusOptions = res.data.quotationStatus
+ this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "member_id", item.id)
+ }
+ })
+ this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
+ }
+
this.dataProcess()
})
.catch((err) => {
@@ -453,8 +480,16 @@
if (this.isNoProduct) {
this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].cost||Number(this.tableData[i].cost)==0) {
+ let reg = /^\+?[1-9]\d*$/;
+ if(!reg.test(this.tableData[i].cost)){
+ this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+ return true;
+ }
+ }
+ }
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddQuotation(params).then((res) => {
console.log(res)
@@ -484,19 +519,18 @@
* 寮哄埗鍒锋柊form缁勪欢
* 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
*/
- refresh(){
- this.refreshFlag=false
- requestAnimationFrame(()=>{
- this.refreshFlag=true
+ 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: this.clientId || 0,
+ quotationName: data.quotationName || "",
conditions: data.conditions || "",
- contact_id: this.contactId || 0,
file: data.file || "",
member_id: data.member_id || 0,
number: data.number || "",
@@ -504,8 +538,8 @@
sale_chance_id: this.saleChanceId || 0,
validity_date: data.validity_date || "",
products: this.tableData,
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ client_id: this.clientId || 0
}
return params
},
@@ -592,7 +626,11 @@
name: "",
number: "",
price: 0,
- total: 0
+ cost:'',
+ profit:'',
+ margin:'',
+ total: 0,
+ unit: ""
}
]
} else {
@@ -605,10 +643,14 @@
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true,min:110, },
{ label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true, isRequird: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost",input: true },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin",min:90},
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
@@ -624,17 +666,32 @@
},
// 浜у搧鏂板
addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
+ // this.productId++
+ // this.tableData.push({
+ // productId: this.productId,
+ // id: 0,
+ // amount: 0,
+ // desc: "",
+ // name: "",
+ // number: "",
+ // price: 0,
+ // cost:'',
+ // profit:'',
+ // margin:'',
+ // total: 0,
+ // unit: ""
+ // })
+ // this.showSummary.show = true
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val){
+ if(val.length>0){
+ val.map((item, index) => {
+ item.productId = this.tableData.length + index+1
+ })
+ }
+ this.tableData=this.tableData.concat(val);
+ this.productTableList.tableData=this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
@@ -649,7 +706,11 @@
name: "",
number: "",
price: 0,
- total: 0
+ cost:'',
+ profit:'',
+ margin:'',
+ total: 0,
+ unit: ""
}
]
this.productTableList.tableData = this.tableData
@@ -659,6 +720,26 @@
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 {
+ if(this.autoCodeHeadersObj.Xsjh=='yes'){
+ callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+ }else{
+ callback()
+ }
+ }
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.member_id > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
@@ -693,8 +774,8 @@
cursor: pointer;
}
}
- .custom-name{
- .el-autocomplete{
+ .custom-name {
+ .el-autocomplete {
flex: 1;
}
}
--
Gitblit v1.8.0