From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 2
src/views/service/serviceFollowup/DetailServiceFollowup.vue | 30 ++++++---------
src/views/service/serviceFollowup/AddServiceFollowupDialog.vue | 4 +-
src/views/sales/quotation/AddQuotationDialog.vue | 2
src/views/sales/subOrder/AddSubOrderDialog.vue | 2
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 4 +-
src/views/sales/contractManage/DetailContractManage.vue | 12 +++---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 2
src/views/sales/contractManage/AddContractManageDialog.vue | 6 +-
src/views/sales/refundForm/AddRefundFormDialog.vue | 2
src/views/sales/contractManage/index.vue | 4 +
src/views/sales/salesDetails/index.vue | 8 +++
12 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 2303dd3..6108b21 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -61,10 +61,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓鐘舵��" prop="status_id">
+ <el-form-item label="鍚堝悓鐘舵��" prop="statusId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.status_id"
+ v-model="editConfig.infomation.statusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -77,7 +77,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞姤浠峰崟" prop="quotationId">
+ <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
diff --git a/src/views/sales/contractManage/DetailContractManage.vue b/src/views/sales/contractManage/DetailContractManage.vue
index 1bf21f0..8309a5b 100644
--- a/src/views/sales/contractManage/DetailContractManage.vue
+++ b/src/views/sales/contractManage/DetailContractManage.vue
@@ -48,7 +48,7 @@
</div>
<div v-if="activeName === 'first'" class="detail">
<!-- 杩涘害杩借釜 -->
- <div class="basic-info">
+ <!-- <div class="basic-info">
<div class="basic-info-label" @click="expandClick('schdule')">
<i v-if="isSchduleExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
@@ -69,13 +69,13 @@
</el-steps>
</div>
</div>
- </div>
- <!-- 鏈轰細鍩烘湰淇℃伅 -->
+ </div> -->
+ <!-- 鍩烘湰淇℃伅 -->
<div class="basic-info">
<div class="basic-info-label" @click="expandClick('basic')">
<i v-if="isBasicExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
- <span style="margin-left: 10px">鏈轰細鍩烘湰淇℃伅</span>
+ <span style="margin-left: 10px">鍩烘湰淇℃伅</span>
</div>
<div v-show="isBasicExpand" class="basic-info-content">
<ul>
@@ -209,13 +209,13 @@
leftStr: "璐熻矗浜�",
leftValue: item.member.username,
rightStr: "鍚堝悓鐘舵��",
- rightValue: item.statusId
+ rightValue: item.serviceContractStatus.name
},
{
leftStr: "鍒涘缓浜�",
leftValue: "",
rightStr: "鍒涘缓鏃堕棿",
- rightValue: ""
+ rightValue: item.created_at
},
{
leftStr: "鏈�鏂版洿鏂颁汉",
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index 28a94ea..001d21c 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -146,7 +146,9 @@
const list = res.data.list.map((item) => {
return {
...item,
- member_name: item.member.username
+ member_name: item.member.username,
+ client_name: item.client.name,
+ quotation_number: item.quotation.number
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 45e4c87..a191a7b 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -510,7 +510,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 426fbd3..ff4d7df 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -428,7 +428,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 22497dc..5ab433f 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -493,7 +493,7 @@
signTime: data.signTime || "",
wechatOrderStatus: data.wechatOrderStatus || 0,
logisticCompany: data.logisticCompany || "",
- logisticCost: parseInt(data.logisticCost) || 0,
+ logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || ""
}
let params = {}
@@ -567,7 +567,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 1d673c7..fad5aa4 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -269,7 +269,13 @@
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row, client_name: row.name }
+ this.clientDeail.infomation = {
+ ...row.client,
+ member: row.Member,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name
+ }
},
// 鑱旂郴浜鸿鎯�
selCommonClick(row) {
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index fc3c689..a7d1e66 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -385,7 +385,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 2003554..7f89c86 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -381,7 +381,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index f3de9ef..e1c27ff 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -684,7 +684,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 8c98d07..6d31c79 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -102,7 +102,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="椤圭洰璁″垝" prop="planId">
<div class="custom-name">
<el-input v-model="editConfig.infomation.planId"></el-input>
@@ -110,7 +110,7 @@
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="婊℃剰搴�" prop="satisfactionId">
<div class="common-select">
diff --git a/src/views/service/serviceFollowup/DetailServiceFollowup.vue b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
index d27b411..daa2526 100644
--- a/src/views/service/serviceFollowup/DetailServiceFollowup.vue
+++ b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
@@ -140,31 +140,25 @@
{
leftStr: "鍥炶浜�",
leftValue: item.Member.username,
- rightStr: "椤圭洰璁″垝",
- rightValue: ""
+ rightStr: "婊℃剰搴�",
+ rightValue: item.satisfaction.name
},
{
- leftStr: "婊℃剰搴�",
- leftValue: item.satisfaction.name,
- rightStr: "鍙婃椂鐜�",
- rightValue: item.timelyRate.name
+ leftStr: "鍙婃椂鐜�",
+ leftValue: item.timelyRate.name,
+ rightStr: "瑙ｅ喅鐜�",
+ rightValue: item.solveRate.name
},
{
- leftStr: "瑙ｅ喅鐜�",
- leftValue: item.solveRate.name,
- rightStr: "鍘熸湇鍔′汉鍛�",
- rightValue: item.oldMember.username
+ leftStr: "鍘熸湇鍔′汉鍛�",
+ leftValue: item.oldMember.username,
+ rightStr: "鏈嶅姟浜哄憳鏄惁鏉ヨ繃",
+ rightValue: item.isVisit.name
},
{
- leftStr: "鏈嶅姟浜哄憳鏄惁鏉ヨ繃",
- leftValue: item.isVisit.name,
- rightStr: "鍒涘缓鏃堕棿",
- rightValue: ""
- },
- {
- leftStr: "淇敼鏃堕棿",
+ leftStr: "鍒涘缓鏃堕棿",
leftValue: "",
- rightStr: "",
+ rightStr: "淇敼鏃堕棿",
rightValue: ""
}
]
--
Gitblit v1.8.0