From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/sales/subOrder/DetailSubOrder.vue | 102 +++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 4fd0fbe..9046af6 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -9,7 +9,7 @@
>
<template slot="title">
<div class="header">
- <span class="header-label">鍗曟嵁缂栧彿</span>
+ <span class="header-label">閿�鍞瓙鍗�</span>
<span class="header-title">{{ detailConfig.infomation.number }}</span>
</div>
</template>
@@ -37,18 +37,18 @@
<li v-for="(item, i) in basicInfoList" :key="i">
<div class="left">
<div class="content-title">{{ item.leftStr + "锛�" }}</div>
- <div class="content-data">{{ item.leftValue }}</div>
+ <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
- <div class="right">
- <div class="content-title">{{ item.rightStr }}</div>
- <div class="content-data">{{ item.rightValue }}</div>
+ <div v-if="item.rightStr" class="right">
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+ <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
</ul>
</div>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info">
+ <!-- <div class="basic-info">
<div class="basic-info-label" @click="expandClick('annex')">
<i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
@@ -64,7 +64,7 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info">
<div class="basic-info-label" @click="expandClick('product')">
@@ -83,7 +83,7 @@
</div>
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -93,6 +93,7 @@
<script>
import SalesDetails from "@/views/sales/salesDetails"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+
export default {
name: "DetailSubOrder",
props: {
@@ -119,31 +120,42 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
- this.setData()
+ this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ keywordType: "閿�鍞瓙鍗�",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ 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,
+ subbill_name: this.detailConfig.infomation.number
+ }
this.setTableForm()
},
mounted() {},
methods: {
- setData() {
+ setData(item) {
this.basicInfoList = [
{
leftStr: "瀹㈡埛鍚嶇О",
- leftValue: "",
+ leftValue: item.client.name,
rightStr: "鍗曟嵁缂栧彿",
- rightValue: ""
+ rightValue: item.number
},
{
leftStr: "閿�鍞�诲崟",
- leftValue: "",
+ leftValue: item.masterOrder.number,
rightStr: "璐熻矗浜�",
- rightValue: ""
+ rightValue: item.member.username
},
{
leftStr: "鍒涘缓浜�",
@@ -156,19 +168,19 @@
leftValue: "",
rightStr: "鏇存柊鏃堕棿",
rightValue: ""
- },
- {
- leftStr: "瀹℃壒鐘舵��",
- leftValue: "",
- rightStr: "鏈�鏂板鎵规椂闂�",
- rightValue: ""
- },
- {
- leftStr: "涓婁竴姝ュ鎵逛汉",
- leftValue: "",
- rightStr: "褰撳墠瀹℃壒浜�",
- rightValue: ""
}
+ // {
+ // leftStr: "瀹℃壒鐘舵��",
+ // leftValue: "",
+ // rightStr: "鏈�鏂板鎵规椂闂�",
+ // rightValue: ""
+ // },
+ // {
+ // leftStr: "涓婁竴姝ュ鎵逛汉",
+ // leftValue: "",
+ // rightStr: "褰撳墠瀹℃壒浜�",
+ // rightValue: ""
+ // }
]
},
handleClose() {
@@ -191,33 +203,13 @@
},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
- }
- ],
+ tableData: this.detailConfig.infomation.products,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" }
+ { 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 }
]
}
}
--
Gitblit v1.8.0