From 3a46ae62a484b4ea1a9dbfb39859275f5c70ba03 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 18:06:47 +0800
Subject: [PATCH] bug修复
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 2 +-
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 5 ++---
src/views/sales/salesOpportunity/index.vue | 2 +-
src/components/makepager/CommonFormTableView.vue | 7 +++++++
src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 1 +
src/views/sales/contractManage/AddContractManageDialog.vue | 4 ++--
src/views/sales/refundForm/AddRefundFormDialog.vue | 2 --
src/views/sales/contractManage/index.vue | 7 ++++---
src/views/sales/salesDetails/index.vue | 25 ++++++++++++++++++++++---
9 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 00c60c6..398ad6c 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -328,6 +328,13 @@
commonInputChange(val, prop, row) {
console.log(val, prop)
console.log(row)
+ if (prop === "amount") {
+ this.tableList.tableData.map((ite) => {
+ if (ite.name === row.name) {
+ ite.total = row.amount * row.price
+ }
+ })
+ }
this.$emit("inputContent", val, prop, row)
},
// 娓呯┖
diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
index 0d80cbd..ca2fc6d 100644
--- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
+++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -264,6 +264,7 @@
},
handleClose() {
this.editConfig.visible = false
+ this.$parent.getData()
},
setTableForm() {
this.setTableInfomation(this.firstDate)
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index e423c7f..0c2244b 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -413,8 +413,7 @@
clientId: this.editCommonConfig.infomation.client_id,
SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
serviceContractId: this.editCommonConfig.infomation.id,
- tableData: [],
- productId: 1
+ tableData: []
}
},
created() {
@@ -652,7 +651,7 @@
this.productId = 1
this.tableData = [
{
- id: 1,
+ id: 0,
Amount: 0,
IsSale: true,
MaterialMode: "",
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index df7a5ea..a8960f8 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -101,7 +101,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <!-- <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div>
+ <div v-if="isUnflod" class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -126,7 +126,7 @@
</el-form-item>
</el-col>
</el-row>
- </div> -->
+ </div>
<!-- 灞曞紑鏀惰捣 -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="unflod-collapse" @click="unflodCollapseClick">
<div>{{ unflodCollapseStr }}</div>
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index 001d21c..3f755e0 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -119,8 +119,8 @@
tableColumn: [
{ label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true },
{ label: "璐熻矗浜�", prop: "member_name", min: 90 },
- // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
- { label: "鍒涘缓浜�", prop: "creator", min: 100 },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
+ { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus_name", min: 100 },
{ label: "鍒涘缓鏃堕棿", prop: "created_at" }
]
}
@@ -148,7 +148,8 @@
...item,
member_name: item.member.username,
client_name: item.client.name,
- quotation_number: item.quotation.number
+ quotation_number: item.quotation.number,
+ serviceContractStatus_name: item.serviceContractStatus.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index b9dadd8..aecb816 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -365,8 +365,6 @@
},
async getPaymentTypeList() {
await getPaymentTypeList().then((res) => {
- console.log("鏀粯鏂瑰紡")
- console.log(res.data)
if (res.data.code === 200) {
this.paymentTypeListOptions = res.data.data.data
}
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index fad5aa4..2a551be 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -37,11 +37,17 @@
</template>
</TableCommonView>
<!-- 鏂板缓/缂栬緫 -->
- <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddSalesDetailsDialog
+ v-if="editConfig.visible"
+ :edit-common-config="editConfig"
+ @addCollectionPlanClick="addCollectionPlanClick"
+ />
<!-- 閿�鍞槑缁嗚鎯� -->
<DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" />
<!-- 瀹㈡埛璇︽儏 -->
<DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</div>
</template>
@@ -50,6 +56,7 @@
import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
+import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
export default {
name: "SalesDetails",
@@ -69,7 +76,8 @@
components: {
AddSalesDetailsDialog,
DetailSpecification,
- DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddCollectionPlan
},
computed: {
searchCommonHeight() {
@@ -132,7 +140,12 @@
label: "璁㈠崟缂栧彿"
},
keyword: "",
- keywordType: ""
+ keywordType: "",
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ }
}
},
created() {
@@ -282,6 +295,12 @@
console.log(row)
this.specificationDetail.visible = true
this.specificationDetail.infomation = { ...row }
+ },
+ addCollectionPlanClick(row) {
+ this.addCollectionConfig.visible = true
+ this.addCollectionConfig.title = "鏂板缓"
+ this.addCollectionConfig.sourceType = 1
+ this.addCollectionConfig.infomation = { ...row }
}
}
}
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 640b3d3..7ba373f 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -162,7 +162,7 @@
{ label: "鍙兘鎬�(%)", prop: "possibility_name" }, // 鍙兘鎬�
{ label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", min: 130 }, // 棰勮鎴愪氦鏃ユ湡
{ label: "棰勮鍚堝悓閲戦", prop: "projected_amount" }, // 棰勮鍚堝悓閲戦
- { label: "棰勭畻缁濆鍊�", prop: "capital_budget" }, // 棰勭畻缁濆鍊�
+ { label: "棰勭畻缁濆鍊�", prop: "budget" }, // 棰勭畻缁濆鍊�
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
]
}
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 928e399..456ad36 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -460,7 +460,7 @@
show: true,
total: true,
sumProp: ["Amount", "Unit", "total"],
- mergeNumber: 3
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
--
Gitblit v1.8.0