From 3d04f62e6c9124e2d37b5d09191a02fc6390d16f Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 13 十月 2023 17:07:10 +0800
Subject: [PATCH] bug修复
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 305 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 204 insertions(+), 101 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 3aa7e53..e487891 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,26 @@
<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="client_name">
<div class="custom-name">
<el-autocomplete
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -35,25 +52,31 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ :disabled="isNameChanceEdit"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('client')">
+ <div v-if="!isNameChanceEdit" 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
+ "
+ 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">
<div class="custom-name">
<el-autocomplete
+ style="width: 100%"
v-model="editConfig.infomation.sale_chance_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -62,12 +85,21 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
+ :disabled="isNameChanceEdit"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('chance')">
+ <div v-if="!isNameChanceEdit" 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
+ "
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
@@ -92,6 +124,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -102,7 +135,7 @@
v-model="editConfig.infomation.memberId"
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>
@@ -116,6 +149,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -159,9 +193,10 @@
<el-input v-model="editConfig.infomation.phone"></el-input>
</el-form-item>
</el-col>
- <el-col :span="24">
+ <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"
@@ -180,7 +215,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
- <el-input v-model="editConfig.infomation.logisticCost"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.logisticCost"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -190,8 +232,9 @@
<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"
@@ -205,8 +248,12 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.notes"></el-input>
+ <el-form-item label="澶囨敞" prop="remark" label-width="15%">
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2 }"
+ v-model="editConfig.infomation.remark"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -257,6 +304,7 @@
@addProductClick="addProductClick"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
/>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -323,6 +371,8 @@
:edit-common-config="editSelectChanceConfig"
@selClient="selClient"
/>
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</el-dialog>
</div>
</template>
@@ -333,8 +383,11 @@
import { getAddSalesDetails, getUpdateSalesDetails } 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 "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddSalesDetailsDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -347,7 +400,7 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -358,7 +411,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -376,7 +429,7 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other7"],
+ sumProp: ["Amount", "total"],
mergeNumber: 2
},
editSelectClientConfig: {
@@ -391,7 +444,15 @@
},
clientId: this.editCommonConfig.infomation.client_id,
saleChanceId: this.editCommonConfig.infomation.saleChanceId,
- productId: 1
+ productId: 1,
+ isNoProduct: true,
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ amountTotal: 0,
+ isNameChanceEdit: false
}
},
created() {
@@ -399,8 +460,33 @@
this.$store.dispatch("geChance")
this.setTableForm()
this.getCommonData()
+ this.formInfo()
+ if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) {
+ this.isNameChanceEdit = true
+ }
+ // else {
+
+ // }
+ },
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editClientManageConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ 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) => {
@@ -423,26 +509,44 @@
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.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ 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 {
- getUpdateSalesDetails(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
+ 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.tableData.map((item) => {
+ this.amountTotal += item.total
+ })
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
+ }
+ })
+ } else {
+ getUpdateSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
}
} else {
console.log("error submit")
@@ -461,25 +565,16 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
signTime: data.signTime || "",
wechatOrderStatus: data.wechatOrderStatus || 0,
logisticCompany: data.logisticCompany || "",
- logisticCost: parseInt(data.logisticCost) || 0,
- logisticNumber: data.logisticNumber || ""
+ logisticCost: data.logisticCost || 0,
+ logisticNumber: data.logisticNumber || "",
+ codeRule: this.codeRule
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -517,8 +612,10 @@
handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.editConfig.infomation.client_name = item.name
} else if (value === "chance") {
this.saleChanceId = item.id
+ this.editConfig.infomation.client_name = item.name
}
},
selClientClick(value) {
@@ -529,9 +626,9 @@
}
},
selClient(row, value) {
- if (value === "contact") {
- this.editConfig.infomation.contact_name = row.name
- this.contactId = row.id
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -552,86 +649,84 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
} else {
this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
}
this.productTableList = {
tableData: this.tableData,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "Number" },
- { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "Unit", input: true },
- { label: "浠风◣鍚堣", prop: "total", input: true },
- { label: "鎻忚堪", prop: "other8" }
+ { 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) {
- console.log("aaaaaaaa")
- console.log(val, prop)
- this.productId = row.id
+ this.productId = row.productId
this.tableData.map((item) => {
- if (item.id === row.id) {
+ if (item.productId === row.productId) {
item[prop] = val
}
})
- console.log(this.tableData)
},
// 浜у搧鏂板
addProductClick() {
this.productId++
this.tableData.push({
- id: this.productId,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
})
+ this.showSummary.show = true
},
// 浜у搧娓呯┖
emptyProductClick() {
this.productId = 1
this.tableData = [
{
- id: 1,
- Amount: 0,
- IsSale: true,
- MaterialMode: "",
- MinInventory: 0,
- Name: "",
- Number: "",
- PurchaseType: "",
- SalePrice: 0,
- Unit: ""
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
]
this.productTableList.tableData = this.tableData
},
// 浜у搧閲嶇畻
- recalculateProductClick() {}
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ }
}
}
</script>
@@ -640,6 +735,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;
@@ -686,6 +786,9 @@
height: 55px;
line-height: 55px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
--
Gitblit v1.8.0