From bd42b949807795c581e9193d92834a6187fc10d2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 18:42:59 +0800
Subject: [PATCH] 销售管理模块联调

---
 src/views/sales/salesReturn/DetailReturn.vue |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/sales/salesReturn/DetailReturn.vue b/src/views/sales/salesReturn/DetailReturn.vue
index a678fda..9cd2e7e 100644
--- a/src/views/sales/salesReturn/DetailReturn.vue
+++ b/src/views/sales/salesReturn/DetailReturn.vue
@@ -37,11 +37,11 @@
                 <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>
@@ -59,11 +59,11 @@
                 <li v-for="(item, i) in dynamicInfoList" :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>
@@ -81,14 +81,14 @@
                 <li>
                   <div class="left remark">
                     <div class="content-title">{{ "閫�璐у師鍥狅細" }}</div>
-                    <div class="content-data">{{ "" }}</div>
+                    <div class="content-data">{{ detailConfig.infomation.reason }}</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>
@@ -104,7 +104,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠$悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -169,34 +169,34 @@
     }
   },
   created() {
-    this.setData()
+    this.setData(this.detailConfig.infomation)
     this.setTableForm()
   },
   mounted() {},
   methods: {
-    setData() {
+    setData(item) {
       this.basicInfoList = [
         {
           leftStr: "瀹㈡埛鍚嶇О",
-          leftValue: "",
+          leftValue: item.client.name,
           rightStr: "閿�鍞��璐у崟缂栧彿",
-          rightValue: ""
+          rightValue: item.number
         },
         {
           leftStr: "閫夋嫨婧愬崟",
           leftValue: "",
           rightStr: "閫�鍏ヤ粨搴�",
-          rightValue: ""
+          rightValue: item.repository
         },
         {
           leftStr: "閿�鍞礋璐d汉",
-          leftValue: "",
+          leftValue: item.Member.username,
           rightStr: "瀹℃壒鐘舵��",
           rightValue: ""
         },
         {
           leftStr: "閫�璐ф棩鏈�",
-          leftValue: "",
+          leftValue: item.returnDate,
           rightStr: "鍒涘缓鏃堕棿",
           rightValue: ""
         },
@@ -216,7 +216,7 @@
         },
         {
           leftStr: "鐘舵��",
-          leftValue: "",
+          leftValue: item.SalesReturnStatus.name,
           rightStr: "宸查��娆�",
           rightValue: ""
         }

--
Gitblit v1.8.0