Merge branch 'stage' into dev0.3

src/views/salesMange/saleContract/middle/index.vue

@@ -581,7 +581,11 @@ const clickPrint = (row) => {
   };
   openPrint.value = true;
   proxy.post("/intermediateContract/getPrintInfo", { id: row.id }).then((res) => {
-    printDetails.value = {...res,...res.contractMap.contract};
+    printDetails.value = {...res,...res.contractMap.contract,
+    buyContactName:res.buyContactName,
+    buyContactNumber:res.buyContactNumber,
+    
+    };
     console.log(printDetails.value.contractMap.contractProductList);
   });
 };

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -119,14 +119,14 @@
                   <span class="table-btn">CNY {{ moneyFormat(row.purchaseAmount, 2) }}</span>
                 </template>
                 <el-table :data="row.purchaseList">
-                  <el-table-column width="150" property="date" label="交易金额">
+                  <el-table-column width="140" property="date" label="交易金额">
                     <template #default="{ row }">
                       <div>{{row.currency}} {{ moneyFormat(row.amount, 2) }}</div>
                     </template>
                   </el-table-column>
-                  <el-table-column width="60" property="rate" label="汇率" />
-                  <el-table-column width="160" property="purchaseName" label="业务员" />
-                  <el-table-column width="190" property="createTime" label="操作时间" />
+                  <el-table-column width="120" property="rate" label="汇率" />
+                  <el-table-column min-width="130" property="purchaseName" label="业务员" />
+                  <el-table-column width="160" property="createTime" label="操作时间" />
                 </el-table>
               </el-popover>
             </template>