From 4a2ae34a3cf85f5e8b0409b858cfbb12ef8b5ee2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 02 八月 2023 11:18:51 +0800
Subject: [PATCH] 注掉暂不支持内容
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 472 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 344 insertions(+), 128 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index a79366c..d65d667 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -22,29 +22,55 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="customName">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.customName"></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.client_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'client')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('client', $event)"
+ ></el-autocomplete>
+ <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>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
- <el-input v-model="editConfig.infomation.orderNumber"></el-input>
+ <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="salesOpportunity">
+ <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.salesOpportunity"></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 class="common-select-btn" @click="clearupClient('chance')">
+ <i class="el-icon-edit-outline"></i>
+ </div>
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
<el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
<el-option
@@ -56,27 +82,22 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
- <el-form-item label="绛剧害鏃ユ湡" prop="signDate">
- <el-date-picker v-model="editConfig.infomation.signDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-form-item label="绛剧害鏃ユ湡" prop="signTime">
+ <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞礋璐ｄ汉" prop="salesHead">
+ <el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
- v-model="editConfig.infomation.salesHead"
+ v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 63%"
>
- <el-option
- v-for="item in salesHeadOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -87,14 +108,29 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="寰俊璁㈠崟鐘舵��" prop="wechatOrderStatus">
- <CommonSelectView
- :common-value="editConfig.infomation.wechatOrderStatus"
- :common-options="wechatOrderStatusOptions"
- />
+ <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-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</div>
<!-- 鏀惰揣淇℃伅 -->
@@ -102,29 +138,44 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鏀惰揣浜�" prop="consignee">
- <el-input v-model="editConfig.infomation.consignee"></el-input>
+ <el-form-item label="鏀惰揣浜�" prop="addressee">
+ <el-input v-model="editConfig.infomation.addressee"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="consigneeContactInfo">
- <el-input v-model="editConfig.infomation.consigneeContactInfo"></el-input>
+ <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="shippingAddress">
+ <el-form-item label="鏀惰揣鍦板潃" prop="address">
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.shippingAddress"
+ v-model="editConfig.infomation.address"
></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-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
+ <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
+ <el-input v-model="editConfig.infomation.logisticCost"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 鏉℃涓庢潯浠� -->
<div class="basic-info-title">鏉℃涓庢潯浠�</div>
- <div class="address-view">
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
<el-form-item label="鏉℃涓庢潯浠�" prop="termsTreaty">
@@ -139,7 +190,7 @@
</div>
<!-- 澶囨敞淇℃伅 -->
<div class="basic-info-title">澶囨敞淇℃伅</div>
- <div class="address-view">
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
<el-form-item label="澶囨敞" prop="notes">
@@ -154,8 +205,21 @@
<el-row>
<el-col :span="12">
<el-form-item label="闄勪欢" prop="">
+ <template slot="label">
+ <div style="display: flex; float: right">
+ <div style="font-size: 16px">
+ <i class="el-icon-warning-outline" title="鏈�澶氫笂浼�20涓檮浠讹紝鏈�澶ч檺鍒�5MB"></i>
+ </div>
+ <span style="margin-left: 5px">闄勪欢</span>
+ </div>
+ </template>
<div class="annex-view">
- <div @click="addAnnexClick">娣诲姞</div>
+ <div @click="addAnnexClick">
+ <div style="display: flex; float: right">
+ <div style="font-size: 16px"><i class="el-icon-paperclip"></i></div>
+ <span>娣诲姞</span>
+ </div>
+ </div>
<div class="setFormat" @click="setFormatClick">璁剧疆鍏佽涓婁紶鐨勬枃浠舵牸寮�</div>
</div>
</el-form-item>
@@ -167,17 +231,23 @@
浜у搧绠＄悊
<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
+ >
<el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</div>
<div class="product-view">
- <CommonFormTableView :product-table-list="productTableList" />
+ <CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
+ <!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
<div v-if="editConfig.title === '鏂板缓'" class="basic-info-view">
<el-row>
<el-col :span="20">
@@ -219,22 +289,37 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button>
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
+ <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
+ <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
+ <!-- 閫夋嫨瀹㈡埛 -->
+ <SelectClientDialog
+ v-if="editSelectClientConfig.editVisible"
+ :edit-common-config="editSelectClientConfig"
+ @selClient="selClient"
+ />
+ <!-- 閫夋嫨閿�鍞満浼� -->
+ <SelectChanceDialog
+ v-if="editSelectChanceConfig.editVisible"
+ :edit-common-config="editSelectChanceConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
<script>
-import CommonSelectView from "@/components/makepager/CommonSelectView"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import { getAllData } from "@/api/client/client"
+import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
+import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
export default {
name: "AddSalesDetailsDialog",
props: {
@@ -244,54 +329,33 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- customName: "",
- orderNumber: "XSHT521",
- salesOpportunity: "",
- selSourceOrder: "",
- signDate: "",
- salesHead: "",
- deliveryDate: "",
- wechatOrderStatus: "",
- consignee: "",
- consigneeContactInfo: "",
- shippingAddress: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalUrgent: "",
- approvalOpinion: ""
- }
+ infomation: {}
}
}
}
},
- components: { CommonSelectView, CommonFormTableView },
- computed: {},
+ components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog },
+ computed: {
+ clientList() {
+ return this.$store.state.getClientName.clientList
+ },
+ saleChancelist() {
+ return this.$store.state.getClientName.saleChancelist
+ }
+ },
data() {
return {
dialogWidth: "80%",
editConfig: this.editCommonConfig,
rules: {
- customName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- orderNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- signDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- salesHead: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
- approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
+ number: [{ required: true, message: "璇疯緭鍏ヨ鍗曠紪鍙�", trigger: "blur" }],
+ signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+ // approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
- salesHeadOptions: [
- // 閿�鍞礋璐ｄ汉
- { value: "1", label: "BOSS" },
- { value: "2", label: "Mia" },
- { value: "3", label: "璐㈠姟" },
- { value: "4", label: "甯傚満" },
- { value: "5", label: "绯荤粺绠＄悊鍛�" },
- { value: "6", label: "閿�鍞�" },
- { value: "7", label: "閿�鍞�荤洃" }
- ],
- selSourceOrderOptions: [{ value: "1", label: "閿�鍞瓙鍗�" }],
+ memberOptions: [],
+ selSourceOrderOptions: [],
wechatOrderStatusOptions: [], // 寰俊璁㈠崟鐘舵��
currencyOptions: [
{ value: "1", label: "浜烘皯甯�(楼)" },
@@ -299,30 +363,206 @@
{ value: "3", label: "娆у厓(鈧�)" }
], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
- productTableList: {
- tableData: [
- {
- id: "1",
- productNumber: "123",
- productName: "",
- startDate: "",
- endDate: "2016-05-02",
- number: "",
- address: ""
- }
- ]
- }
+ productTableList: {},
+ showSummary: {
+ show: true,
+ total: true,
+ sumProp: ["other1", "other7"],
+ mergeNumber: 2
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelectChanceConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ clientId: this.editCommonConfig.infomation.clientId,
+ saleChanceId: this.editCommonConfig.infomation.saleChanceId
}
},
- created() {},
+ created() {
+ this.$store.dispatch("geClient")
+ this.$store.dispatch("geChance")
+ this.setTableForm()
+ this.getCommonData()
+ },
methods: {
+ getCommonData() {
+ getAllData()
+ .then((res) => {
+ this.memberOptions = res.data.member
+ 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) => {
+ if (valid) {
+ console.log(this.editConfig.infomation)
+ 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({
+ message: "娣诲姞鎴愬姛",
+ type: "success"
+ })
+ this.$parent.getData()
+ }
+ })
+ .catch((err) => {
+ console.log(err)
+ })
+ } else {
+ getUpdateSalesDetails(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)
+ })
+ }
+ } else {
+ console.log("error submit")
+ return false
+ }
+ })
+ },
+ saveParams() {
+ let data = this.editConfig.infomation
+ let params = {
+ id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+ salesDetails: {
+ address: data.address || "",
+ addressee: data.addressee || "",
+ clientId: parseInt(this.clientId),
+ conditions: data.conditions || "",
+ deliveryDate: data.deliveryDate || "",
+ memberId: data.memberId || 0,
+ number: data.number || "",
+ phone: data.phone || "",
+ products: [
+ {
+ amount: 0,
+ desc: "",
+ id: 0,
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ],
+ remark: data.remark || "",
+ saleChanceId: parseInt(this.saleChanceId),
+ saleType: data.saleType || 0,
+ signTime: data.signTime || "",
+ wechatOrderStatus: data.wechatOrderStatus || 0,
+ logisticCompany: data.logisticCompany || "",
+ logisticCost: parseInt(data.logisticCost) || 0,
+ logisticNumber: data.logisticNumber || ""
+ }
+ }
+ return params
+ },
+
handleClose() {
this.editConfig.visible = false
+ },
+ // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ } else if (value === "chance") {
+ restaurants = this.saleChancelist
+ }
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ } else if (value === "chance") {
+ this.saleChanceId = item.id
+ }
+ },
+ selClientClick(value) {
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value === "chance") {
+ this.editSelectChanceConfig.editVisible = true
+ }
+ },
+ selClient(row, value) {
+ 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
+ }
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ 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
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
- setFormatClick() {}
+ setFormatClick() {},
+ setTableForm() {
+ this.productTableList = {
+ tableData: [],
+ tableColumn: [
+ { label: "#", prop: "id", width: 40 },
+ { 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: "other8" },
+ { label: "婧愬崟绫诲瀷", prop: "other2" },
+ { label: "婧愬崟", prop: "other3" }
+ ]
+ }
+ }
}
}
</script>
@@ -343,17 +583,18 @@
.basic-info-view {
margin-top: 10px;
padding-right: 40px;
- .custom-name {
+ .custom-name,
+ .common-select {
display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
.common-select-btn {
margin-left: 5px;
- font-size: 18px;
+ font-size: 16px;
+ cursor: pointer;
}
}
- }
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
}
.annex-view {
display: flex;
@@ -374,31 +615,6 @@
background-color: #f5f5f5;
height: 55px;
line-height: 55px;
- }
-}
-::v-deep {
- .el-dialog__header {
- padding: 12.5px 10px;
- border-bottom: 1px solid #e5e5e5;
- .el-dialog__title {
- font-size: 15px;
- color: #323232;
- font-weight: bold;
- }
- }
- .el-dialog__body {
- padding: 0px;
- }
- .el-dialog__footer {
- padding: 0px;
- text-align: center;
- box-sizing: border-box;
- border-top: 1px solid #dadee5;
- }
- .product-view {
- .el-form-item__label {
- padding: 0;
- }
}
}
</style>
--
Gitblit v1.8.0