From b01b18c05b3e0d00576a02c9c83df8c8033e5986 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 16:28:06 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 5ab433f..67b27cd 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"
>
@@ -27,6 +27,7 @@
<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) => {
@@ -39,21 +40,26 @@
<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
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ 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-input v-model="editConfig.infomation.number" style="width:100%"></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) => {
@@ -66,8 +72,12 @@
<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
+ v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
@@ -92,6 +102,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width:100%"
>
</el-date-picker>
</el-form-item>
@@ -99,10 +110,11 @@
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
+
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 +128,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width:100%"
>
</el-date-picker>
</el-form-item>
@@ -159,9 +172,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"
@@ -197,8 +211,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"
@@ -212,7 +227,7 @@
<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 }"
@@ -335,6 +350,8 @@
:edit-common-config="editSelectChanceConfig"
@selClient="selClient"
/>
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</el-dialog>
</div>
</template>
@@ -345,6 +362,7 @@
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"
export default {
name: "AddSalesDetailsDialog",
props: {
@@ -359,7 +377,7 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -370,7 +388,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "60%",
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -404,7 +422,13 @@
clientId: this.editCommonConfig.infomation.client_id,
saleChanceId: this.editCommonConfig.infomation.saleChanceId,
productId: 1,
- isNoProduct: true
+ isNoProduct: true,
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ amountTotal: 0
}
},
created() {
@@ -454,8 +478,14 @@
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
+ this.tableData.map((item) => {
+ this.amountTotal += item.total
+ })
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
}
})
} else {
@@ -532,8 +562,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) {
@@ -593,7 +625,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "閿�鍞崟浠�", prop: "price",inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
@@ -653,6 +685,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