From 7979474ca5570945126d7f087fa4363272d964b4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 28 二月 2024 14:34:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 722 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 615 insertions(+), 107 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 5ab433f..53e1390 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="30%"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -24,9 +24,40 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number">
+ <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"
+ :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="client_name">
<div class="custom-name">
<el-autocomplete
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -35,25 +66,45 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div 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 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 &&
+ !isNameChanceEdit &&
+ !isView
+ "
+ 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 :span="12">
- <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
+ <el-form-item
+ label="閿�鍞満浼�"
+ prop="sale_chance_name"
+ :rules="[
+ {
+ required: autoCodeHeadersObj.Ywjh == 'yes' ? true : false,
+ message: '璇烽�夋嫨閿�鍞満浼�',
+ trigger: 'change'
+ }
+ ]"
+ >
<div class="custom-name">
<el-autocomplete
+ style="width: 100%"
v-model="editConfig.infomation.sale_chance_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -62,29 +113,113 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
+ :disabled="isNameChanceEdit || isView"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('chance')">
+ <!-- &&editConfig.infomation.client_name -->
+ <div
+ v-if="!isNameChanceEdit && !isView"
+ class="common-select-btn"
+ @click="selClientClick('chance')"
+ >
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('chance')">
- <i class="el-icon-edit-outline"></i>
+ <div
+ v-if="
+ editConfig.infomation.sale_chance_name &&
+ editConfig.infomation.sale_chance_name.length > 0 &&
+ !isNameChanceEdit &&
+ !isView
+ "
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
- <el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
- <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
- <el-option
- v-for="item in selSourceOrderOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <el-form-item label="閿�鍞瓙鍗�" prop="subbill_name">
+ <div class="custom-name">
+ <el-autocomplete
+ style="width: 100%"
+ v-model="editConfig.infomation.subbill_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'subbill')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('subbill', $event)"
+ :disabled="isNameChanceEdit"
+ ></el-autocomplete>
+ <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('subbill')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div
+ v-if="
+ editConfig.infomation.subbill_name &&
+ editConfig.infomation.subbill_name.length > 0 &&
+ !isNameChanceEdit
+ "
+ class="common-select-btn"
+ @click="clearupClient('subbill')"
>
- </el-option>
- </el-select>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
</el-form-item>
</el-col> -->
+ <el-col :span="12">
+ <el-form-item
+ label="閿�鍞姤浠峰崟"
+ prop="quotation_number"
+ :rules="[
+ {
+ required: autoCodeHeadersObj.Bjd == 'yes' ? true : false,
+ message: '璇烽�夋嫨閿�鍞姤浠峰崟',
+ trigger: 'change'
+ }
+ ]"
+ >
+ <!-- isAddQuatation || -->
+ <div class="custom-name">
+ <el-autocomplete
+ v-model="editConfig.infomation.quotation_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'quotation')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('quotation', $event)"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨閿�鍞姤浠峰崟"
+ :disabled=" isView"
+ ></el-autocomplete>
+ <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
+ <div
+ v-if=" !isView"
+ class="common-select-btn"
+ @click="selClientClick('quotation')"
+ >
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <!-- !isAddQuatation && -->
+ <div
+ v-if="
+ editConfig.infomation.quotation_number &&
+ editConfig.infomation.quotation_number.length > 0 &&
+ !isView
+ "
+ class="common-select-btn"
+ @click="clearupClient('quotation')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="绛剧害鏃ユ湡" prop="signTime">
<el-date-picker
@@ -92,6 +227,9 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ :disabled="isView"
+ :picker-options="pickerOptionsBefore"
>
</el-date-picker>
</el-form-item>
@@ -102,7 +240,8 @@
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
+ :disabled="isView"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -116,33 +255,46 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ :disabled="isView"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
- <el-form-item label="寰俊璁㈠崟鐘舵��" prop="wechatOrderStatus">
- <div class="common-select">
- <el-select
- v-model="editConfig.infomation.wechatOrderStatus"
- placeholder="璇烽�夋嫨"
- class="common-select-sel"
- size="mini"
- >
- <el-option
- v-for="item in wechatOrderStatusOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- <div class="common-select-btn">
- <i class="el-icon-setting"></i>
- </div>
- </div>
+ <el-col :span="12">
+ <el-form-item label="浜や粯绫诲瀷" prop="deliverType">
+ <el-select
+ v-model="editConfig.infomation.deliverType"
+ 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>
+ </el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select
+ v-model="editConfig.infomation.projectId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="isView"
+ >
+ <el-option
+ v-for="item in projectList"
+ :key="item.projectId"
+ :label="item.projectName"
+ :value="item.projectId"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
<!-- 鏀惰揣淇℃伅 -->
@@ -151,33 +303,35 @@
<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-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏀惰揣鍦板潃" prop="address">
- <el-input
- type="textarea"
- :autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.address"
- ></el-input>
+ <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="鏀惰揣鍦板潃" prop="address">
+ <el-input
+ style="width: 100%"
+ 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> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -187,6 +341,7 @@
:precision="2"
:controls="false"
style="width: 100%; margin-right: 5px"
+ :disabled="isView"
></el-input-number>
</el-form-item>
</el-col>
@@ -197,11 +352,13 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="鏉℃涓庢潯浠�" prop="conditions">
+ <el-form-item label="鏉℃涓庢潯浠�" prop="conditions" label-width="15%">
<el-input
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 4 }"
v-model="editConfig.infomation.conditions"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -212,11 +369,12 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞" prop="remark">
+ <el-form-item label="澶囨敞" prop="remark" label-width="15%">
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.remark"
+ :disabled="isView"
></el-input>
</el-form-item>
</el-col>
@@ -252,24 +410,43 @@
<!-- 浜у搧绠＄悊 -->
<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-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>
- </div>
+ </div> -->
</div>
<div class="product-view">
+ <!-- :detail-enter="true" -->
<CommonFormTableView
+ ref="commonFormTableView"
+ :detail-enter="isView ? true : false"
+ :selectBox="false"
+ :addTypeIdMultiple="true"
:show-summary="showSummary"
+ pageName="quotation"
+ :isOperate="
+ (autoCodeHeadersObj.Bjd == 'yes' && editConfig.infomation.quotation_number) ||
+ autoCodeHeadersObj.Bjd != 'yes'
+ ? true
+ : false
+ "
+ :quotationNumber="autoCodeHeadersObj.Bjd == 'yes' ? editConfig.infomation.quotation_number : ''"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
@clearupProduct="clearupProduct"
- />
+ ></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -335,6 +512,14 @@
:edit-common-config="editSelectChanceConfig"
@selClient="selClient"
/>
+ <!-- 閿�鍞瓙鍗� -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</el-dialog>
</div>
</template>
@@ -342,11 +527,21 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
+import { getAddSalesDetails, getUpdateSalesDetails, getProjectList } from "@/api/sales/salesDetails"
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 "@/components/makepager/mixin/codeMixin"
+import { getSaleChanceList } from "@/api/sales/salesOpportunity"
+import { getSubOrderList } from "@/api/sales/subOrder"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+import { getDataByType } from "@/api/data"
+import { mapActions } from "vuex"
+import { getQuotationList } from "@/api/sales/quotation"
+
export default {
name: "AddSalesDetailsDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -359,24 +554,31 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan, SelectCommonDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- },
- saleChancelist() {
- return this.$store.state.getClientName.saleChancelist
}
+ // saleChancelist() {
+ // return this.$store.state.getClientName.saleChancelist
+ // },
+ // subOrderList() {
+ // return this.$store.state.getClientName.subOrderList
+ // }
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
- number: [{ required: true, message: "璇疯緭鍏ヨ鍗曠紪鍙�", trigger: "blur" }],
+ // subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
+ // sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
+ // quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }],
+ deliveryDate: [{ required: true, message: "璇烽�夋嫨浜や粯鏃ユ湡", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -389,7 +591,7 @@
show: true,
total: true,
sumProp: ["Amount", "total"],
- mergeNumber: 2
+ mergeNumber: 7
},
editSelectClientConfig: {
editVisible: false,
@@ -399,26 +601,110 @@
editSelectChanceConfig: {
editVisible: false,
title: "",
+ infomation: {},
+ search_map: {}
+ },
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "",
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
+ subbillId: this.editCommonConfig.infomation.subbillId,
productId: 1,
- isNoProduct: true
+ isNoProduct: true,
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ amountTotal: 0,
+ isNameChanceEdit: false,
+ isAddQuatation: true,
+ // 浜や粯绫诲瀷
+ deliveryTypeList: getDataByType("deliveryType"),
+ projectList: [],
+ quotationList: [],
+ quotationId: this.editCommonConfig.infomation.quotationId,
+ tableData: [],
+ isView: this.editCommonConfig.title === "鏌ョ湅",
+ thatMember: {},
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ },
+ pickerOptionsBefore: {
+ disabledDate(time) {
+ return time.getTime() > Date.now()
+ }
+ }
}
},
created() {
+ if (this.editConfig.title !== "鏂板缓") {
+ this.productTableList.tableData=[
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ cost: "",
+ profit: "",
+ margin: "",
+ total: 0,
+ unit: ""
+ }
+ ]
+ this.isAddQuatation = false
+ }
this.$store.dispatch("geClient")
- this.$store.dispatch("geChance")
this.setTableForm()
this.getCommonData()
+ this.formInfo()
+ this.getUseSystemSet({ modeType: "xsmx" })
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
+ this.getProjectList()
},
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ }
+ },
+ // beforeUpdate() {
+ // this.$refs.commonFormTableView.toggleSelection(this.tableData)
+ // },
methods: {
+ ...mapActions(["getChanceFilter", "getSubunitFliter"]),
+ formInfo() {
+ this.objCode.type = "閿�鍞槑缁嗙紪鐮�"
+ 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.dataProcess()
+ 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, "memberId", item.id)
+ }
+ })
+ }
+ // this.dataProcess()
})
.catch((err) => {
console.log(err)
@@ -435,7 +721,6 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].name.length === 0) {
this.isNoProduct = true
@@ -445,17 +730,31 @@
}
}
if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ this.$message.error("璇烽�夋嫨浜у搧")
} else {
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].cost) {
+ let reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+ 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 === "鏂板缓") {
getAddSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
+ this.tableData.map((item) => {
+ this.amountTotal += parseFloat(item.total)
+ })
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
}
})
} else {
@@ -494,7 +793,11 @@
wechatOrderStatus: data.wechatOrderStatus || 0,
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
- logisticNumber: data.logisticNumber || ""
+ logisticNumber: data.logisticNumber || "",
+ quotationId: this.quotationId,
+ deliverType: data.deliverType || 0,
+ status: 1,
+ projectId: data.projectId || ""
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -513,54 +816,204 @@
handleClose() {
this.editConfig.visible = false
},
+ // 鑾峰彇鎶ヤ环鍗�
+ getQuotation(id, value) {
+ getQuotationList({
+ page: 0,
+ pageSize: 0,
+ search_map: {
+ sale_chance_id: id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ console.log(res)
+ this.quotationList = res.data.list
+ this.count=res.data.count;
+ if (value === "鍏ㄩ儴浜у搧") {
+ // this.quotationList.map((item) => {
+ // if (item.id === this.editConfig.infomation.quotationId) {
+ // this.tableData.map((item, index) => {
+ // item.productId = index + 1
+ // this.tableData.forEach((key) => {
+ // if (item.number === key.number) {
+ // item.amount = key.amount
+ // item.id = key.id
+ // }
+ // })
+ // })
+ // }
+ // })
+ }
+ }
+ })
+ },
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
var restaurants = []
if (value === "client") {
restaurants = this.clientList
+ console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ if(this.editConfig.infomation.client_name){
+ restaurants = this.saleChancelist
+ }
+ } else if (value === "subbill") {
+ restaurants = this.subOrderList
+ } else if (value === "quotation") {
+ if(this.editConfig.infomation.sale_chance_name){
+ restaurants = this.quotationList
+ }
}
- var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
- createStateFilter(queryString) {
+ createStateFilter(queryString, value) {
return (state) => {
- return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ if (value === "subbill" || value === "quotation") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
}
+ },
+ // 閿�鍞満浼氬垪琛�
+ async getSaleChanceList(item) {
+ await getSaleChanceList({
+ page: 1,
+ pageSize: 15,
+ search_map: {
+ client_id: item.id
+ }
+ }).then((res) => {
+ console.log(res)
+ this.saleChancelist = res.data.list
+ })
+ },
+ // 閿�鍞瓙鍗曞垪琛�
+ async getSubOrderList(item) {
+ await getSubOrderList({
+ page: 1,
+ pageSize: 15,
+ search_map: {
+ client_id: item.id
+ }
+ }).then((res) => {
+ this.subOrderList = res.data.list
+ })
},
handleSelectClient(value, item) {
if (value === "client") {
+ this.thatMember = item.member
+ this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
+ this.editConfig.infomation.client_name = item.name
+ this.getSaleChanceList(item)
+ this.getSubOrderList(item)
} else if (value === "chance") {
this.saleChanceId = item.id
+ this.editConfig.infomation.sale_chance_name = item.name
+ this.isAddQuatation = false
+ this.getQuotation(item.id)
+ } else if (value === "subbill") {
+ console.log("涓嬫媺妗嗙偣鍑�", item)
+ this.subbillId = item.id
+ this.editConfig.infomation.subbill_name = item.number
+ } else if (value === "quotation") {
+ // this.productTableList.tableData = item.products
+ // this.tableData = item.products
+ this.editConfig.infomation.quotation_number = item.number
+ this.quotationId = item.id
}
},
selClientClick(value) {
if (value === "client") {
this.editSelectClientConfig.editVisible = true
} else if (value === "chance") {
+ if(this.clientId){
+ this.editSelectChanceConfig.clientId = this.clientId
+ }
this.editSelectChanceConfig.editVisible = true
+ } else if (value === "subbill") {
+ this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
+ this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.clientId = this.clientId
+ } else if (value === "quotation") {
+ this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ if(this.saleChanceId&&this.clientId){
+ this.editSelCommonConfig.clientId = this.clientId
+ // 姝ｅ悜閫夋嫨瀹㈡埛 閿�鍞満浼� 鎶ヤ环鍗�
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count=this.count
+ this.editSelCommonConfig.tableInfomation = [...this.quotationList]
+ }else{
+ // 鍙嶅悜閫夋嫨
+ this.editSelCommonConfig.isRequest = true;
+ }
+ this.editSelCommonConfig.editVisible = true
}
},
selClient(row, value) {
if (value === "client") {
+ this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId=''
+ this.editConfig.infomation.subbill_name = ""
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
+ this.getSaleChanceList(row)
+ this.getSubOrderList(row)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
this.saleChanceId = row.id
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
+ this.isAddQuatation = false
+ this.getQuotation(row.id)
+ } else if (value === "subbill") {
+ this.editConfig.infomation.subbill_name = row.number
+ this.subbillId = row.id
+ } else if (value === "quotation") {
+ this.productTableList.tableData = row.products
+ // this.tableData = row.products
+ this.editConfig.infomation.quotation_number = row.number
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = row.sale_chance.name
+ this.saleChanceId = row.sale_chance.id
+ this.quotationId = row.id
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
+ 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
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
+ this.isAddQuatation = true
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
+ } 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() {},
@@ -577,7 +1030,11 @@
name: "",
number: "",
price: 0,
- total: 0
+ cost: "",
+ profit: "",
+ margin: "",
+ total: 0,
+ unit: ""
}
]
} else {
@@ -585,16 +1042,28 @@
this.tableData.map((item, index) => {
item.productId = index + 1
})
+ this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
+ }
+ // let productData = this.quotationList.products
+ let isBjdRequird = false
+ if (this.autoCodeHeadersObj.Bjd == "yes") {
+ isBjdRequird = true
}
this.productTableList = {
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: "specs" },
+ { label: "鍨嬪彿", prop: "type" },
{ label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: !isBjdRequird, isRequird: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost", input: !isBjdRequird },
+ { 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 }
+ { label: "浠风◣鍚堣", prop: "total" }
]
}
},
@@ -609,17 +1078,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
},
// 浜у搧娓呯┖
@@ -634,16 +1118,35 @@
name: "",
number: "",
price: 0,
- total: 0
+ cost: "",
+ profit: "",
+ margin: "",
+ total: 0,
+ unit: ""
}
]
this.productTableList.tableData = this.tableData
},
- // 浜у搧閲嶇畻
- recalculateProductClick() {},
clearupProduct(data) {
this.tableData = data
this.productTableList.tableData = this.tableData
+ },
+ // 鑾峰彇椤圭洰鍒楄〃
+ async getProjectList() {
+ await getProjectList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ this.projectList = res.data
+ })
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
@@ -653,6 +1156,11 @@
<style lang="scss" scoped>
::v-deep {
.iframe-dialog .el-dialog__body {
+ .el-form {
+ .el-form-item {
+ width: 100%;
+ }
+ }
.basic-info {
.basic-info-title {
background-color: #f4f8fe;
--
Gitblit v1.8.0