Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/4

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -74,8 +74,8 @@
       @get-checked-columns="getCheckedColumns"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="60" />
+      <el-table-column type="selection" width="60" fixed="left" />
-      <el-table-column type="expand">
+      <el-table-column type="expand" fixed="left">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
             <VueDraggable
@@ -91,8 +91,8 @@
                 stripe
                 style="width: 80%; margin: 0 auto"
               >
-                <el-table-column prop="productName" label="成交产品" />
+                <el-table-column prop="productName" label="成交产品" width="120px" />
-                <el-table-column prop="specsName" label="产品规格" />
+                <el-table-column prop="specsName" label="产品规格" width="120px" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
                 <el-table-column prop="remark" label="成交备注" width="100px" />
                 <el-table-column label="生产状态" width="160px">

src/views/Home/CloseRate.vue

@@ -23,7 +23,7 @@
 
       <el-table v-loading="loading" :data="tableList" border stripe>
         <el-table-column type="index" width="50" fixed="left" />
-        <el-table-column prop="nickname" label="姓名" width="80" />
+        <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
         <el-table-column
           v-for="(item, index) in new Date().getMonth() + 1"
           :key="index"

src/views/Home/Comp/SignListCard.vue

@@ -38,31 +38,42 @@
     </el-form>
     <el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
       <el-table-column label="周期" prop="period" width="110px" />
-      <el-table-column prop="signNumber" label="成交数" />
+      <el-table-column label="成交" align="center">
-      <el-table-column prop="signPrice" label="成交额" />
+        <el-table-column prop="signNumber" label="成交数" />
-      <el-table-column
+        <el-table-column prop="signPrice" label="成交额" />
-        prop="signPriceSequentialGrowth"
+        <el-table-column prop="signPriceSequentialGrowth" label="环比" :formatter="parseRate" />
-        label="成交额环比增长"
+        <el-table-column
-        :formatter="parseRate"
+          prop="signPriceSamePeriodCompareGrowth"
-      />
+          label="同比"
-      <el-table-column
+          :formatter="parseRate"
-        prop="signPriceSamePeriodCompareGrowth"
+        />
-        label="成交额同比增长"
+      </el-table-column>
-        :formatter="parseRate"
+      <el-table-column label="利润" align="center">
-      />
+        <el-table-column prop="profit">
-      <el-table-column prop="profit" label="利润" />
+          <template #header> <Tooltip message="公司利润" /> <span>利润</span> </template>
-      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
+        </el-table-column>
-      <el-table-column
+        <el-table-column prop="profitSequentialGrowth" label="环比" :formatter="parseRate" />
-        prop="profitSamePeriodCompareGrowth"
+        <el-table-column prop="profitSamePeriodCompareGrowth" label="同比" :formatter="parseRate" />
-        label="利润同比增长"
+      </el-table-column>
-        :formatter="parseRate"
+
-      />
+      <el-table-column prop="notReceivedMoney">
-      <el-table-column prop="notReceivedMoney" label="未到账金额" />
+        <template #header>
-      <el-table-column prop="receivedMoney" label="已到账金额" />
+          <Tooltip message="回款列表中未审核的公司利润" /> <span>未到账</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="receivedMoney">
+        <template #header>
+          <Tooltip message="回款列表中已审核的公司利润" /> <span>已到账</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="waitSettleMoney" label="待结算金额" />
       <el-table-column prop="settledMoney" label="已结算金额" />
       <el-table-column prop="refundAmount" label="已退款金额" />
-      <el-table-column prop="remainMoney" label="结余" />
+      <el-table-column prop="remainMoney">
+        <template #header>
+          <Tooltip message="已到账金额-已结算金额-已退款金额" /> <span>结余</span>
+        </template>
+      </el-table-column>
     </el-table>
   </ContentWrap>
 </template>
@@ -129,14 +140,16 @@ function getSummaries({ columns, data }) {
       if (column.property.includes('Growth')) {
         sums[index] = ''
       } else {
-        sums[index] = values.reduce((prev, curr) => {
+        sums[index] = values
-          const value = Number(curr)
+          .reduce((prev, curr) => {
-          if (!Number.isNaN(value)) {
+            const value = Number(curr)
-            return prev + curr
+            if (!Number.isNaN(value)) {
-          } else {
+              return prev + curr
-            return prev
+            } else {
-          }
+              return prev
-        }, 0)
+            }
+          }, 0)
+          .toFixed(2)
       }
     } else {
       sums[index] = ''

src/views/MiniMall/Product/index.vue

@@ -49,7 +49,7 @@
 
   <!-- 列表 -->
   <el-table v-loading="loading" class="mt-20px" :data="tableList" border>
-    <el-table-column type="expand" width="30">
+    <el-table-column type="expand" width="30" fixed="left">
       <template #default="{ row }">
         <div class="pl-100px pr-100px">
           <el-table :data="row.productSpecList">
@@ -71,16 +71,16 @@
       </template>
     </el-table-column>
     <el-table-column key="productId" label="产品编码" prop="productId" />
-    <el-table-column show-overflow-tooltip label="产品名称" min-width="200" prop="productName" />
+    <el-table-column show-overflow-tooltip label="产品名称" min-width="100" prop="productName" />
-    <el-table-column label="分类" min-width="90" prop="productCategoryName" />
+    <el-table-column label="分类" width="90" prop="productCategoryName" />
-    <el-table-column label="品牌" min-width="90" prop="productBrandName" />
+    <el-table-column label="品牌" width="90" prop="productBrandName" />
     <el-table-column label="商品图" min-width="80">
       <template #default="{ row }">
         <el-image :src="row.mainImage" @click="imagePreview(row.mainImage)" class="w-30px h-30px" />
       </template>
     </el-table-column>
-    <el-table-column label="简介" min-width="70" prop="productIntro" />
+    <el-table-column label="简介" min-width="200" prop="productIntro" />
-    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="180" />
+    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="120" />
     <el-table-column v-for="item in diyFieldList" :key="item.clueParamId" :label="item.label">
       <template #default="{ row }">
         <div v-if="item.component == 'DatePicker'">