2024-01-10 拆单导出1红色款改为1红，红色贺岁款库存表格加合计数，数据统计加简约版和红色贺岁版

src/api/datascreen.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: zhiquz zhiquz@163.com
+ * @Date: 2023-11-02 11:03:54
+ * @LastEditors: zhiquz zhiquz@163.com
+ * @LastEditTime: 2024-01-10 17:00:49
+ * @FilePath: \appadmin-new\src\api\datascreen.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import request from '@/utils/request'
 
 export function getSizeList(params) {

src/pages/dataScreen/pc.vue

@@ -61,50 +61,74 @@
               </div>
             </div>
           </div>
-          <!-- <div class="style s_smiple">
+          <div class="style s_tester">
+            <div class="s_title">
+              <img src="../../assets/order_goods/style_icon4.png" alt="">
+              <span>大卫博士精装版</span>
+            </div>
+            <div class="s_detail">
+              <div class="s_detail_item">
+                <p>{{ data.hard }}</p>
+                <p>数量</p>
+              </div>
+              <div class="s_detail_item">
+                <p>{{ data.hard_money }}</p>
+                <p>金额</p>
+              </div>
+              <div class="s_detail_item">
+                <p>{{ data.hard_today }}</p>
+                <p>新增</p>
+              </div>
+              <div class="s_detail_item">
+                <p>{{ getPer(data.hard_money) }}%</p>
+                <p>金额占比</p>
+              </div>
+            </div>
+          </div>
+          <div class="style s_smiple">
             <div class="s_title">
               <img src="@/assets/order_goods/style_icon3.png" alt="">
-              <span>大卫博士简约版</span>
+              <span>大卫博士青春版</span>
             </div>
             <div class="s_detail">
               <div class="s_detail_item">
-                <p>{{ data.simple }}</p>
+                <p>{{ data.youth || '0' }}</p>
                 <p>数量</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.simple_money }}</p>
+                <p>{{ data.youth_money || '0' }}</p>
                 <p>金额</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.simple_today }}</p>
+                <p>{{ data.youth_today || '0' }}</p>
                 <p>新增</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ getPer(data.simple_money) }}%</p>
+                <p>{{ getPer(data.youth_money) }}%</p>
                 <p>金额占比</p>
               </div>
             </div>
-          </div> -->
-          <div class="style s_tester">
+          </div>
+          <div class="style s_smiple">
             <div class="s_title">
-              <img src="../../assets/order_goods/style_icon4.png" alt="">
-              <span>大卫博士精装版</span>
+              <img src="@/assets/order_goods/style_icon3.png" alt="">
+              <span>大卫博士简约版</span>
             </div>
             <div class="s_detail">
               <div class="s_detail_item">
-                <p>{{ data.hard }}</p>
+                <p>{{ data.simple }}</p>
                 <p>数量</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.hard_money }}</p>
+                <p>{{ data.simple_money }}</p>
                 <p>金额</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.hard_today }}</p>
+                <p>{{ data.simple_today }}</p>
                 <p>新增</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ getPer(data.hard_money) }}%</p>
+                <p>{{ getPer(data.simple_money) }}%</p>
                 <p>金额占比</p>
               </div>
             </div>
@@ -112,23 +136,23 @@
           <div class="style s_smiple">
             <div class="s_title">
               <img src="@/assets/order_goods/style_icon3.png" alt="">
-              <span>大卫博士青春版</span>
+              <span>大卫博士红色贺岁款</span>
             </div>
             <div class="s_detail">
               <div class="s_detail_item">
-                <p>{{ data.youth || '0' }}</p>
+                <p>{{ data.right || '0' }}</p>
                 <p>数量</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.youth_money || '0' }}</p>
+                <p>{{ data.right_money || '0' }}</p>
                 <p>金额</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ data.youth_today || '0' }}</p>
+                <p>{{ data.right_today || '0' }}</p>
                 <p>新增</p>
               </div>
               <div class="s_detail_item">
-                <p>{{ getPer(data.youth_money) }}%</p>
+                <p>{{ getPer(data.right_money) }}%</p>
                 <p>金额占比</p>
               </div>
             </div>
@@ -280,9 +304,10 @@
           />
           <el-table-column label="地区" prop="name" align="center" />
           <el-table-column label="精装版数量" prop="hard" align="center" />
-          <!-- <el-table-column label="简约版数量" prop="simple" align="center" /> -->
+          <el-table-column label="简约版数量" prop="simple" align="center" />
           <el-table-column label="高腰版数量" prop="old" align="center" />
           <el-table-column label="青春版数量" prop="youth" align="center" />
+          <el-table-column label="红色贺岁版数量" prop="right" align="center" />
           <!-- <el-table-column label="纯棉老人版数量" prop="newold" align="center" /> -->
           <el-table-column label="总金额" prop="value" align="center" />
         </el-table>
@@ -311,9 +336,10 @@
           </el-table-column>
           <el-table-column label="批发商" prop="nickname" align="center" />
           <el-table-column label="精装版" prop="hard" align="center" />
-          <!-- <el-table-column label="简约版" prop="simple" align="center" /> -->
+          <el-table-column label="简约版" prop="simple" align="center" />
           <el-table-column label="高腰版" prop="old" align="center" />
-          <el-table-column label="青春版数量" prop="youth" align="center" />
+          <el-table-column label="青春版" prop="youth" align="center" />
+          <el-table-column label="红色贺岁版" prop="right" align="center" />
           <!-- <el-table-column label="纯棉老人版数量" prop="newold" align="center" /> -->
           <el-table-column label="销售金额" prop="money" align="center" />
         </el-table>
@@ -519,7 +545,8 @@ export default {
         this.data.old_money +
         this.data.simple_money +
         this.data.newold_money +
-        this.data.youth_money
+        this.data.youth_money +
+        this.data.right_money
       if (all === 0) {
         return 0
       }
@@ -574,6 +601,8 @@ export default {
                   精装版套数：${this.data.list[params.dataIndex].hard} <br />
                   高腰版件数：${this.data.list[params.dataIndex].old} <br />
                   青春版件数：${this.data.list[params.dataIndex].youth || '0'} <br />
+                  简约版件数：${this.data.list[params.dataIndex].simple || '0'} <br />
+                  红色贺岁版件数：${this.data.list[params.dataIndex].right || '0'} <br />
                 `
                 }
                 //   return `

src/pages/order/list.vue

@@ -2956,10 +2956,10 @@ export default {
             let size = item['红色'][f].size.split('-')[1]
             size = size === '3XL' ? 'XXXL' : size
             if (sex === '男款') {
-              obj[size] = `${item['红色'][f].num}${item['红色'][f].main_attr}`
+              obj[size] = `${item['红色'][f].num}红`
               num_all += item['红色'][f].num
             } else {
-              obj['女' + size] = `${item['红色'][f].num}${item['红色'][f].main_attr}`
+              obj['女' + size] = `${item['红色'][f].num}红`
               num_all += item['红色'][f].num
             }
           } else {
@@ -2967,11 +2967,11 @@ export default {
               item['红色'][f].size = 'XXXL'
             }
             if (item['红色'][f].sec_attr === '男款') {
-              obj[item['红色'][f].size] = `${item['红色'][f].num}${item['红色'][f].main_attr}`
+              obj[item['红色'][f].size] = `${item['红色'][f].num}红`
               num_all += item['红色'][f].num
             }
             if (item['红色'][f].sec_attr === '女款') {
-              obj['女' + item['红色'][f].size] = `${item['红色'][f].num}${item['红色'][f].main_attr}`
+              obj['女' + item['红色'][f].size] = `${item['红色'][f].num}红`
               num_all += item['红色'][f].num
             }
           }
@@ -3007,10 +3007,10 @@ export default {
             let size = item['红色混合'][g].size.split('-')[1]
             size = size === '3XL' ? 'XXXL' : size
             if (sex === '男款') {
-              obj[size] = `${item['红色混合'][g].num}${item['红色混合'][g].main_attr}`
+              obj[size] = `${item['红色混合'][g].num}红`
               num_all += item['红色混合'][g].num
             } else {
-              obj['女' + size] = `${item['红色混合'][g].num}${item['红色混合'][g].main_attr}`
+              obj['女' + size] = `${item['红色混合'][g].num}红`
               num_all += item['红色混合'][g].num
             }
           } else {
@@ -3018,11 +3018,11 @@ export default {
               item['红色混合'][g].size = 'XXXL'
             }
             if (item['红色混合'][g].sec_attr === '男款') {
-              obj[item['红色混合'][g].size] = `${item['红色混合'][g].num}${item['红色混合'][g].main_attr}`
+              obj[item['红色混合'][g].size] = `${item['红色混合'][g].num}红`
               num_all += item['红色混合'][g].num
             }
             if (item['红色混合'][g].sec_attr === '女款') {
-              obj['女' + item['红色混合'][g].size] = `${item['红色混合'][g].num}${item['红色混合'][g].main_attr}`
+              obj['女' + item['红色混合'][g].size] = `${item['红色混合'][g].num}红`
               num_all += item['红色混合'][g].num
             }
           }

src/pages/stock/red.vue

@@ -2,7 +2,7 @@
  * @Author: zhiquz zhiquz@163.com
  * @Date: 2024-01-10 10:46:18
  * @LastEditors: zhiquz zhiquz@163.com
- * @LastEditTime: 2024-01-10 13:15:32
+ * @LastEditTime: 2024-01-10 14:14:13
  * @FilePath: \appadmin-new\src\pages\stock\red.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -26,6 +26,7 @@
       <el-table-column prop="realname" label="批发商姓名" align="center" />
       <el-table-column prop="mobile" label="批发商授权手机号" align="center" />
       <el-table-column prop="status" label="状态" align="center" />
+      <el-table-column prop="all" label="合计数" align="center" />
       <el-table-column prop="男款-L" label="男L" align="center" />
       <el-table-column prop="男款-XL" label="男XL" align="center" />
       <el-table-column prop="男款-XXL" label="男2XL" align="center" />
@@ -90,6 +91,7 @@ export default {
               批发商姓名: item.realname,
               批发商授权手机号: item.mobile,
               状态: item.status,
+              合计数: item.all,
               男L: item['男款-L'],
               男XL: item['男款-XL'],
               男2XL: item['男款-XXL'],