From ea4f9ee1d7a6333bd516deb09c1d12f18a168787 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 19:04:53 +0800
Subject: [PATCH] bug 修复
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 18 ++++
src/views/sales/subOrder/index.vue | 12 ++
src/views/service/serviceContract/DetailServiceContract.vue | 3
src/views/service/clientServiceOrder/DetailClientServiceOrder.vue | 2
src/views/client/client/DetailClientManage.vue | 42 +++++++++-
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 6 +
src/components/makepager/CommonFormTableView.vue | 3
src/views/other/commonDialog/SelectCommonDialog.vue | 6
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 23 +++++
src/views/sales/refundForm/AddRefundFormDialog.vue | 8 -
src/views/sales/refundForm/index.vue | 4
src/views/client/contacts/index.vue | 2
src/views/client/salesLead/DetailSalesLead.vue | 35 ++++++--
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 6
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 1
src/views/sales/salesOpportunity/DetailOpportunity.vue | 2
src/views/sales/salesReturn/index.vue | 4
src/views/sales/quotation/DetailQuotation.vue | 8 +-
src/views/sales/salesOpportunity/index.vue | 8 +
src/api/common/other.js | 7 +
src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 22 +++--
src/views/service/serviceContract/index.vue | 7 +
src/views/sales/quotation/index.vue | 4
src/views/sales/salesDetails/index.vue | 4
24 files changed, 172 insertions(+), 65 deletions(-)
diff --git a/src/api/common/other.js b/src/api/common/other.js
index 282149f..9c1eda8 100644
--- a/src/api/common/other.js
+++ b/src/api/common/other.js
@@ -54,3 +54,10 @@
params: data
})
}
+
+// 鑾峰彇甯歌闂鍒楄〃
+export const getFaqList = async (data) => {
+ return await axios.get(`/api/faq/list`, {
+ params: data
+ })
+}
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index b955bf0..3981921 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -334,6 +334,9 @@
})
.then(() => {
this.$emit("recalculateProductClick")
+ this.tableList.tableData.map((ite) => {
+ ite.total = ite.amount ? ite.amount * ite.price : 1 * ite.price
+ })
})
.catch(() => {})
},
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index d71dab4..278d899 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -225,6 +225,7 @@
import SubOrder from "@/views/sales/subOrder"
import SalesDetails from "@/views/sales/salesDetails"
import Receipt from "@/views/other/payment/receipt"
+import { getContactList } from "@/api/client/contacts"
export default {
name: "DetailClientManage",
props: {
@@ -256,10 +257,16 @@
addressInfoList: [],
isRemarkExpand: true, // 澶囨敞淇℃伅
isAnnexExpand: true, // 闄勪欢淇℃伅
- addConfig: {}
+ addConfig: {},
+ contact_name: "",
+ contact_phone: "",
+ contact_position: "",
+ contact_wechat: "",
+ contact_email: ""
}
},
created() {
+ this.getContactList()
this.setData(this.detailConfig.infomation)
this.addConfig = {
id_name: "client_name",
@@ -324,19 +331,19 @@
this.contactList = [
{
leftStr: "鑱旂郴浜哄鍚�",
- leftValue: item.contact_name,
+ leftValue: this.contact_name,
rightStr: "鑱旂郴浜烘墜鏈�",
- rightValue: item.contact_phone
+ rightValue: this.contact_phone
},
{
leftStr: "鑱旂郴浜鸿亴鍔�",
- leftValue: "",
+ leftValue: this.contact_position,
rightStr: "鑱旂郴浜哄井淇�",
- rightValue: ""
+ rightValue: this.contact_wechat
},
{
leftStr: "鑱旂郴浜篍mail",
- leftValue: "",
+ leftValue: this.contact_email,
rightStr: "",
rightValue: ""
}
@@ -442,6 +449,29 @@
}
}
return fmt
+ },
+ getContactList() {
+ getContactList({
+ search_map: {
+ client_id: this.clientManageDetail.infomation.id
+ },
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ if (res.code === 200) {
+ console.log(res.data.list)
+ if (res.data.list && res.data.list.length > 0) {
+ let data = res.data.list[0]
+ console.log(data)
+ this.contact_name = data.name
+ this.contact_phone = data.phone
+ this.contact_position = data.position
+ this.contact_wechat = data.wechat
+ this.contact_email = data.email
+ }
+ }
+ this.setData(this.detailConfig.infomation)
+ })
}
}
}
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index d3c4b98..a8f919f 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -250,7 +250,7 @@
},
// 瀹㈡埛鍚嶇О璇︽儏
selClientClick(row) {
- // console.log(row)
+ console.log(row)
this.clientDeail.visible = true
this.clientDeail.infomation = {
...row.Client,
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 35dc51c..d58b2fa 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -175,6 +175,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
@@ -341,6 +342,11 @@
}
]
},
+ pickerOptions: {
+ disabledDate: (time) => {
+ return time.getTime() > Date.now()
+ }
+ },
clientStatusOptions: [], // 瀹㈡埛鐘舵��
contactInfoOptions: [], // 鑱旂郴鏂瑰紡
memberOptions: [],
diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue
index 8a3a847..adafad6 100644
--- a/src/views/client/salesLead/DetailSalesLead.vue
+++ b/src/views/client/salesLead/DetailSalesLead.vue
@@ -62,7 +62,7 @@
</li>
</ul>
<div class="business_scope">
- <div class="content-title">{{ "鏈�鏂拌繘灞�" }}</div>
+ <div class="content-title">{{ "鏈�鏂拌繘灞曪細" }}</div>
<div class="content-data">{{ record ? record : "--" }}</div>
</div>
</div>
@@ -150,7 +150,9 @@
isRemarkExpand: true, // 澶囨敞淇℃伅
remarkInfoList: [],
addConfig: {},
- record: ""
+ record: "", // 鏈�鏂拌繘灞�
+ noContactDays: 0,
+ newContactDays: ""
}
},
created() {
@@ -168,6 +170,10 @@
setData(item) {
if (item.FollowRecord && item.FollowRecord.length > 0) {
this.record = item.FollowRecord[0].record
+ console.log(item.FollowRecord[0].follow_time)
+ let follow_time = item.FollowRecord[0].follow_time
+ this.newContactDays = follow_time.substring(0, 10)
+ this.noContactDays = this.getDiffDay(Date.now(), this.newContactDays)
}
this.basicInfoList = [
{
@@ -216,15 +222,9 @@
this.dynamicInfoList = [
{
leftStr: "鏈仈绯诲ぉ鏁�",
- leftValue: "",
+ leftValue: this.noContactDays,
rightStr: "鏈�鏂拌仈绯绘棩鏈�",
- rightValue: ""
- },
- {
- leftStr: "鏈�鏂拌繘灞�",
- leftValue: this.record,
- rightStr: "",
- rightValue: ""
+ rightValue: this.newContactDays
}
]
this.addressInfoList = [
@@ -261,6 +261,19 @@
} else if (value === "remark") {
this.isRemarkExpand = !this.isRemarkExpand
}
+ },
+ // 璁＄畻涓や釜鏃ユ湡涔嬮棿鐨勫樊鍊�
+ getDiffDay(date_1, date_2) {
+ let totalDays, diffDate
+ let myDate_1 = date_1
+ let myDate_2 = Date.parse(date_2)
+ // 灏嗕袱涓棩鏈熼兘杞崲涓烘绉掓牸寮忥紝鐒跺悗鍋氬樊
+ diffDate = Math.abs(myDate_1 - myDate_2) // 鍙栫浉宸绉掓暟鐨勭粷瀵瑰��
+
+ totalDays = Math.floor(diffDate / (1000 * 3600 * 24)) // 鍚戜笅鍙栨暣
+ // console.log(totalDays)
+
+ return totalDays // 鐩稿樊鐨勫ぉ鏁�
}
}
}
@@ -329,7 +342,7 @@
align-items: center;
height: 40px;
.content-title {
- width: 220px;
+ width: 320px;
text-align: right;
color: #555;
}
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 60238cb..3090ad6 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -149,7 +149,7 @@
{ label: "浜у搧缂栧彿", prop: "number" }
]
}
- this.searchSel = { value: "Name", label: "浜у搧鍚嶇О" }
+ this.searchSel = { value: "name", label: "浜у搧鍚嶇О" }
}
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
@@ -305,8 +305,8 @@
// 浜у搧鍚嶇О
async getProductList() {
await getProductList({
- productName: "",
- productNumber: "",
+ productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
+ productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
page: 1,
pageSize: 5
}).then((res) => {
diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
index bf6b7cd..7a67908 100644
--- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
+++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -25,11 +25,11 @@
</div>
<div class="collection-view">
<div class="label">閲戦</div>
- <div>{{ editConfig.infomation.amount }}</div>
+ <div>{{ editConfig.infomation.amountTotal }}</div>
</div>
<div class="collection-view">
<div class="label">鏈鍒掗噾棰�</div>
- <div>{{ editConfig.infomation.amount }}</div>
+ <div>{{ editConfig.infomation.amountTotal }}</div>
</div>
<div class="collection-view">
<div class="label">鏀舵璁″垝璐熻矗浜�</div>
@@ -205,10 +205,14 @@
methods: {
// 璁剧疆鍒濆鍊�
setData() {
+ this.amount =
+ typeof this.editCommonConfig.infomation.amountTotal == "string"
+ ? parseInt(this.editCommonConfig.infomation.amountTotal)
+ : this.editCommonConfig.infomation.amountTotal
this.editConfig.infomation = {
collectionType: this.collectionType,
moneyType: "浜烘皯甯�",
- amount: this.amount.toFixed(2)
+ amountTotal: this.editCommonConfig.infomation.amountTotal
}
},
getCommonData() {
@@ -283,7 +287,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.3,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -301,7 +305,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 1),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -319,7 +323,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.2,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(date, 2),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -346,7 +350,7 @@
amount: this.amount,
amountReceivable: this.amount,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -367,7 +371,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 0),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
@@ -385,7 +389,7 @@
amount: this.amount,
amountReceivable: this.amount * 0.5,
amountReceived: 0,
- amountTotal: 0,
+ amountTotal: this.amount,
collectionDate: this.setDate(this.firstDate, 1),
collectionType: this.editConfig.infomation.collectionType,
fileId: 0,
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index d19d174..e423c7f 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -266,6 +266,7 @@
@addProductClick="addProductClick"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
/>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index bf0fc69..dc5160e 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -14,15 +14,15 @@
</div>
</template>
<div class="content">
- <div class="top">{{ "鍚堝悓鍙戣捣浜猴細" + "" }}</div>
+ <!-- <div class="top">{{ "鍚堝悓鍙戣捣浜猴細" + "" }}</div> -->
<div class="tab-view">
<el-tabs v-model="activeName" @tab-click="tabsClick">
<el-tab-pane label="璇︽儏" name="first"></el-tab-pane>
- <el-tab-pane label="鎶ヤ环鍙樻洿鍗�" name="changeOrder">
- <!-- <template slot="label">
+ <!-- <el-tab-pane label="鎶ヤ环鍙樻洿鍗�" name="changeOrder"> -->
+ <!-- <template slot="label">
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
<el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
</el-tabs>
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index c9606c0..721cba3 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -208,14 +208,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index f00aa48..41b7f0d 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -179,13 +179,7 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select
- v-model="editConfig.infomation.currency"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- disabled
- >
+ <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
<el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index 2876234..3fc25a8 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -206,14 +206,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 155b823..e7b4149 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -224,14 +224,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, sale_chance_name: "" }
+ this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index b57cefe..34e33e8 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -184,10 +184,10 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鍙兘鎬�(%)" prop="possibilities">
+ <el-form-item label="鍙兘鎬�(%)" prop="possibilities_id">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.possibilities"
+ v-model="editConfig.infomation.possibilities_id"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -702,7 +702,7 @@
number: data.number || "",
opportunities: data.opportunities || "",
pain_points: data.pain_points || "",
- possibilities: data.possibilities || 0,
+ possibilities: data.possibilities_id || 0,
process: data.process || "",
projected_amount: data.projected_amount || 0,
province_id: data.province_id || 0,
diff --git a/src/views/sales/salesOpportunity/DetailOpportunity.vue b/src/views/sales/salesOpportunity/DetailOpportunity.vue
index d26b156..553a7aa 100644
--- a/src/views/sales/salesOpportunity/DetailOpportunity.vue
+++ b/src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -22,7 +22,7 @@
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
</el-tab-pane>
- <el-tab-pane label="鏀舵棰勬祴" name="collectionForecast"></el-tab-pane>
+ <!-- <el-tab-pane label="鏀舵棰勬祴" name="collectionForecast"></el-tab-pane> -->
<el-tab-pane label="鎶ヤ环鍗�" name="quotation"></el-tab-pane>
<el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 8d8c905..640b3d3 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -283,7 +283,13 @@
selContactsClick(row) {
console.log(row)
this.contactsDeail.visible = true
- this.contactsDeail.infomation = { ...row.contact, sale_chance_name: row.name, sale_chance_id: row.id }
+ this.contactsDeail.infomation = {
+ ...row.contact,
+ sale_chance_name: row.name,
+ sale_chance_id: row.id,
+ Client: { name: row.client.name, client_status_id: row.client.client_status_id },
+ client_name: row.name
+ }
},
// 鏈轰細鍚嶇О璇︽儏
selCommonClick(row) {
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index f0f727b..cd9f47f 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -210,14 +210,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index bd300a8..1b473a3 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -216,14 +216,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, masterOrderNumber: "" }
+ this.editConfig.infomation = { ...row, masterOrderNumber: "", currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
@@ -260,7 +260,13 @@
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row, client_name: row.name }
+ this.clientDeail.infomation = {
+ ...row.client,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name,
+ contact_name: row.name
+ }
},
// 閿�鍞�诲崟璇︽儏
selMasterClick(row) {
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index 79fffc7..3b1b54c 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -408,7 +408,16 @@
<el-row>
<el-col :span="12">
<el-form-item label="甯歌闂" prop="faqId">
- <el-input v-model="editConfig.infomation.faqId"></el-input>
+ <!-- <el-input v-model="editConfig.infomation.faqId"></el-input> -->
+ <el-select
+ v-model="editConfig.infomation.faqId"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in faqOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -569,6 +578,7 @@
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
+import { getFaqList } from "@/api/common/other"
import {
getFaultTypeList,
getServiceTypeList,
@@ -639,6 +649,7 @@
priorityLevelOptions: [], // 浼樺厛绾у埆
statusOptions: Status.processStatus, // 澶勭悊鐘舵��
timeSpentOptions: [], // 鑺辫垂鏃堕棿
+ faqOptions: [], // 甯歌闂
editSelectClientConfig: {
editVisible: false,
title: "",
@@ -719,6 +730,16 @@
this.reportSourceOptions = res.data.reportSource
})
this.getServiceTypeList()
+ this.getFaqList()
+ },
+ // 鑾峰彇甯歌闂鍒楄〃
+ async getFaqList() {
+ await getFaqList().then((res) => {
+ console.log(res)
+ if (res.data.code === 200) {
+ this.faqOptions = res.data.data.data
+ }
+ })
},
// 淇濆瓨
saveClick(formName) {
diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
index 6ca36fb..eb07bb8 100644
--- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
+++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
@@ -327,7 +327,7 @@
contactId: this.detailConfig.infomation.contactId,
contact_name: this.detailConfig.infomation.contact_name,
service_number: this.detailConfig.infomation.serviceNumber,
- serviceId: this.detailConfig.infomation.id
+ serviceOrderId: this.detailConfig.infomation.id
}
},
mounted() {},
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 52743f7..9791014 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -229,7 +229,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="搴旀湇鍔℃鏁�" prop="serviceTimes">
- <el-input v-model="editConfig.infomation.serviceTimes"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.serviceTimes"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -760,7 +767,11 @@
this.productTableList.tableData = this.tableData
},
// 浜у搧閲嶇畻
- recalculateProductClick() {}
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ }
}
}
</script>
@@ -815,6 +826,9 @@
height: 55px;
line-height: 55px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index 403dc17..dcc2619 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -216,7 +216,8 @@
client_name: this.detailConfig.infomation.client.name,
contact_name: this.detailConfig.infomation.contact_name,
client_id: this.detailConfig.infomation.client_id,
- contact_id: this.detailConfig.infomation.contact_id
+ contact_id: this.detailConfig.infomation.contact_id,
+ amountTotal: this.detailConfig.infomation.amountTotal
}
this.setTableForm()
},
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 55b18a7..82b640e 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -144,7 +144,7 @@
{ label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
{ label: "鏈嶅姟寮�濮嬫棩", prop: "startTime" }, // 鏈嶅姟寮�濮嬫棩
{ label: "鏈嶅姟鍒版湡鏃�", prop: "endTime" }, // 鏈嶅姟鍒版湡鏃�
- { label: "浠风◣鍚堣", prop: "priceTax" } // 浠风◣鍚堣
+ { label: "浠风◣鍚堣", prop: "amountTotal" } // 浠风◣鍚堣
]
}
this.searchOptions = []
@@ -207,7 +207,7 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
@@ -217,7 +217,8 @@
this.editConfig.infomation = {
...row,
contract_number: row.salesDetails.number,
- quotation_number: row.quotation.number
+ quotation_number: row.quotation.number,
+ currency: "浜烘皯甯�"
}
},
// 鍒犻櫎
--
Gitblit v1.8.0