1、调整跟踪表共通

components/dkbase/dk-list-report/dk-list-report.wxml

@@ -6,10 +6,10 @@
       <view class="table-content-row">
         <view class="table-content-row-title-two">
           <!-- 标题 -->
-          <view class="title-class" style="width:70%">
+          <view class="title-class" >
             <dk-text fontSize="15px" value="{{item[title]}}"></dk-text>
           </view>
-          <view wx:if="{{item[subTitle]}}" style="text-align: right;width: 30%;">
+          <view wx:if="{{item[subTitle]}}" style="text-align: right;">
             <view class="status-detail-class">{{wxmlUtil.format(item[subTitle]) }}
             </view>
           </view>
@@ -19,54 +19,44 @@
       <view class="table-content-row">
         <view class="table-content-row-title-two">
           <!-- 单号 -->
-          <view class="title-class" style="width:65%;">
+          <view class="title-class" >
             <dk-text fontWeight="400" data-item="{{item}}" fontSize="14px" value="{{item[no]}}"></dk-text>
           </view>
           <!-- 状态 -->
-          <view style="width: 35%;display: flex;justify-content: right;">
-            <view style="width: 45%;text-align: right;">
-              <dk-tag wx:if="{{item[statusLeft]}}" fontSize="14px" border="{{'1rpx solid '+  colorLeft}}" height="40rpx" color="transparent" textColor="{{colorLeft}}" radius="8rpx" roundFlag="{{true}}" size="medium" value="{{item[statusLeft]}}"></dk-tag>
-            </view>
-            <view style="width: 5%;"></view>
-            <view style="width: 45%;text-align: right;">
-              <dk-tag wx:if="{{item[statusRight]}}" fontSize="14px" border="{{'1rpx solid '+  colorRight}}" height="40rpx" color="transparent" textColor="{{colorRight}}" radius="8rpx" roundFlag="{{true}}" size="medium" value="{{item[statusRight]}}"></dk-tag>
+          <view style="display: flex;margin-left: 20rpx;">
+              <dk-tag wx:if="{{item[statusLeft]}}" fontSize="14px" border="{{'1rpx solid '+  colorLeft}}" height="40rpx" color="transparent" textColor="{{colorLeft}}" radius="8rpx" fontWeight="600"  roundFlag="{{true}}" size="medium" value="{{item[statusLeft]}}"></dk-tag>
+            <view style="margin-left: 15rpx;">
+              <dk-tag wx:if="{{item[statusRight]}}" fontSize="14px" border="{{'1rpx solid '+  colorRight}}" height="40rpx" color="transparent" textColor="{{colorRight}}" radius="8rpx" fontWeight="600" roundFlag="{{true}}" size="medium" value="{{item[statusRight]}}"></dk-tag>
             </view>
           </view>
         </view>
       </view>
-
-
-
-
-
     </view>
     <!-- 内容 -->
-    <view  style="display: flex;">
-      <view wx:if="{{!contentCol}}" class="table-content-row-1" wx:for="{{content}}" wx:for-item="col" data-item="{{col}}">
-      <view style="background: linear-gradient(201.07deg, #F7FBFF 23.68%, #E7F2FF 95.12%);border-radius: 16rpx;text-align: center;width: 208rpx;">
-        <view style="padding:20rpx;">
-          <view style="color:#606EB2;font-size:14px;font-weight: bold;text-align: left;">{{col.lebel}}</view>
-
-          <view>
-            <view style="color:#606EB2;display: flex;margin-top: 10rpx;">
-            <view style="color:#002340;font-size:11px;width: 30%;">{{col.numberKeyLabel}}</view>
-            <view style="display: flex;align-items: center;font-size: 15px;font-weight: bold;width: 70%;margin-left: 10rpx;">{{wxmlUtil.setItemValue(item,col.numberKey)}}</view>
-          </view>
-          <view style="color:#606EB2;margin-top: 10rpx;">
-          <view style="display: flex;">
-            <view style="color:#002340;font-size:11px;width: 30%;">{{col.amountKeyLabel}}</view>
-            <view style="display: flex;align-items: center;font-size: 15px;font-weight: bold;width: 70%;margin-left: 10rpx;">{{wxmlUtil.setItemValue(item,col.amountKey)}}</view>
-          </view>
-          
-          </view>
+    <view style="display: flex;flex-wrap: wrap;justify-content: center;">
+      <view wx:if="{{!contentCol}}" class="card-class" wx:for="{{content}}" wx:for-item="col" data-item="{{col}}">
+          <image src="{{imageUrl + col.image + '.png'}} " class="card-bottom-image" />
+          <view style="padding:20rpx 10rpx;position: absolute;z-index: 1;">
+            <view style="color:#606EB2;font-size:14px;font-weight: bold;text-align: left;">{{col.lebel}}</view>
+            <view>
+              <view style="color:#606EB2;display: flex;margin-top: 10rpx;">
+                <view class="card-label-class">{{col.numberKeyLabel}}</view>
+                <view style="display: flex;align-items: center;font-size: 15px;font-weight: bold;margin-left: 10rpx;">{{wxmlUtil.setItemValue(item,col.numberKey)}}</view>
+              </view>
+              <view style="color:#606EB2;margin-top: 10rpx;">
+                <view style="display: flex;">
+                  <view class="card-label-class">{{col.amountKeyLabel}}</view>
+                  <!-- <view style="display: flex;align-items: center;font-size: 15px;font-weight: bold;width: 70%;margin-left: 10rpx;">{{wxmlUtil.setItemValue(item,col.amountKey)}}</view> -->
+                  <dk-cell contentRight="{{false}}" left="0" contentFontSize="14" contentColor="#606EB2"
+                  contentFontWeight="bold"  content="{{item[col.amountKey]?item[col.amountKey]:0}}"></dk-cell>
+                </view>
+              </view>
+             <view>
+              <!-- <image src="{{imageUrl + col.image + '.png'}} " class="card-bottom-image" /> -->
+             </view>
+            </view>
           </view>
-       
-        </view>
-
       </view>
     </view>
-    
-    </view>
-
   </view>
 </view>

components/dkbase/dk-list-report/dk-list-report.wxss

@@ -18,11 +18,15 @@
 }
 
 .table-content-row {
-  padding: 15px 32rpx 10rpx 32rpx;
+  padding: 15rpx 32rpx 10rpx 32rpx;
 }
+
 .table-content-row-1 {
-  padding: 10px 10rpx 10rpx 10rpx;
+  padding: 10rpx 10rpx 10rpx 10rpx;
+  width: 100%;
+
 }
+
 .table-content-row-font {
   font-size: 14px;
   color: #95A8CB;
@@ -50,14 +54,6 @@
   justify-content: space-between;
 }
 
-.oas-title-value {
-  width: 100rpx;
-  font-size: 5px;
-  text-align: right;
-  padding-left: 5rpx;
-  color: #437FF8;
-}
-
 .title-class {
   /* width: calc(70% - 39rpx); */
   display: flex;
@@ -73,160 +69,30 @@
 }
 
 .status-detail-class {
-  /* width: 120rpx;
-  height: 40rpx;
-  text-align: center;
-  font-size: 13px;
-  font-weight: 600;
-  color: #95A8CB;
-  padding: 0 2rpx; */
   font-size: 14px;
   color: #95A8CB;
 }
 
 
-.status-font-class {
-  font-size: 13px;
-  color: #FFFFFF;
-}
-
-/**品类*/
-.category-class {
-  /* width: 40%; */
-  font-size: 15px;
-  color: #95A8CB;
-  align-items: center;
-  display: flex;
-}
-
-
-/**合计金额*/
-.totalamount-class {
-  /* width: 100%; */
-  text-align: right !important;
-}
-
-.footer-tag-class {
-  width: 100%;
-  margin-top: 20rpx;
-  text-align: right !important;
-}
-
-/**副标题*/
-.sub-title-class {
-  display: flex;
-  width: 100%;
-  text-align: right;
-  height: 47rpx;
-  justify-content: flex-end;
-}
-
-.sub-title-detail-class {
-  height: 47rpx;
-  line-height: 47rpx;
-  background-color: #EAF1FF;
-  border-radius: 0px 0px 0px 30px;
-  width: 210rpx;
-  text-align: center;
-  font-size: 14px;
-  color: #808080;
-}
-
-.status-view {
+.card-bottom-image {
   position: absolute;
-  /* 位置 */
-  top: 50px;
-  right: 30px;
-}
-
-.corner-view {
-  width: 70rpx;
-  height: 40rpx;
-  text-align: center;
-  background-color: #FFE5BD;
-}
-
-.corner-view-text {
-  /* transform: rotate(-45deg); */
-  /* 字体颜色 */
-  color: #4C2F05;
-  font-weight: 600;
-  font-size: 26rpx;
-}
-
-
-/**功能pop*/
-.function-pop-class {
-  /* height:40% !important; */
-  padding-bottom: 130rpx !important;
-  width: 100%;
-  z-index: 10;
-  border-radius: 30rpx 30rpx 0rpx 0rpx !important;
-  padding-top: 20rpx;
-}
-
-.function-cell-group {
-  margin-top: 10rpx;
-  width: 94%;
-  margin-left: 3%;
-}
-
-/**功能菜单的图标样式*/
-.function-pop-image {
-  width: 80rpx;
-  height: 80rpx;
-  display: flex;
-  align-items: center;
-  text-align: center;
-  margin-bottom: 27rpx;
-}
-
-.popup-button {
-  position: fixed;
   width: 100%;
-  bottom: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  padding-bottom: 15rpx;
-  padding-top: 15rpx;
-  background: #fff;
-  height: 100rpx;
+  height: 100%;
 }
 
-.bottom-bar {
-  display: flex;
-  justify-content: space-between;
-  background: #FBF6EF !important;
-  border-radius: 0px 0px 15rpx 15rpx;
-  align-items: center;
-  height: 115rpx;
+.card-class {
+  position: relative;
+  margin: 15rpx 0.4% 15rpx 1.25%;
+  width: 31%;
+  height: 215rpx;
+  border-radius: 19rpx;
 }
 
-.bottom-title-class {
-  display: block;
+.card-label-class {
   color: #002340;
-  margin-left: 30rpx;
-  font-size: 13px;
-}
-
-/**收款*/
-.collect-class {
-  height: 70rpx;
-  line-height: 70rpx;
-  background: #F2E0BC;
-  border-radius: 8px;
-  text-align: center;
+  font-size: 11px;
+  width: 49rpx;
   display: flex;
-  padding: 0 20rpx;
-  font-size: 15px;
-  color: #FF7B1A;
-  margin-right: 30rpx;
-}
-
-.sign-class {
-  padding-left: 10rpx;
-  padding-right: 5rpx;
-  padding-top: 5rpx;
-  font-size: 10px;
+  align-items: center;
+  transform: scale(0.8)
 }

components/dkbase/dk-tag/dk-tag.js

@@ -136,6 +136,13 @@ Component({
       value:'10px'
     },
     /**
+     * 字体粗细（默认normal)
+     */
+    fontWeight:{
+      type:String,
+      value:'normal'
+    },
+    /**
      * 内边距
      */
     padding:{

components/dkbase/dk-tag/dk-tag.wxml

@@ -1,3 +1,3 @@
-<van-tag catchtap="tapClick" type="{{type}}" color="{{color}}" size="{{size}}" plain="{{plain}}" round="{{round}}" closeable="{{closeable}}" text-color="{{textColor}}" class="tagStyle" style="--fontSize--:{{fontSize}}; --radius--:{{roundFlag? (radius + ' ' + radius): (radius + ' ' + 0)}};--border--:{{border}};--height--:{{height}};--marginRight--:{{marginRight}};--padding--:{{padding}};--padding-left--:{{paddingLeft}};--padding-right--:{{paddingRight}}">
+<van-tag catchtap="tapClick" type="{{type}}" color="{{color}}" size="{{size}}" plain="{{plain}}" round="{{round}}" closeable="{{closeable}}" text-color="{{textColor}}" class="tagStyle" style="--fontSize--:{{fontSize}};--fontWeight--:{{fontWeight}}; --radius--:{{roundFlag? (radius + ' ' + radius): (radius + ' ' + 0)}};--border--:{{border}};--height--:{{height}};--marginRight--:{{marginRight}};--padding--:{{padding}};--padding-left--:{{paddingLeft}};--padding-right--:{{paddingRight}}">
   {{displayValue}}
 </van-tag>

components/dkbase/dk-tag/dk-tag.wxss

@@ -14,4 +14,5 @@
   border:var(--border--) !important;
   height: var(--height--) !important;
   padding:var(--padding--) !important;
+  font-weight: var(--fontWeight--) !important;
 }

package-purchase/pages/pur-track-report/pur-track-report.js

@@ -17,9 +17,9 @@ Page({
     ],
     // 列表区（内容）
     contentList: [
-      {  lebel: '采购订单',numberKeyLabel:'订单数量', numberKey:'sumQuantity' ,amountKeyLabel:'订单金额',amountKey:'sumAmount'},
-      { lebel: '采购出库',numberKeyLabel:'出库数量', numberKey:'outQty' ,amountKeyLabel:'退货金额',amountKey:'returnAmt'},
-      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'amtHandle' ,amountKeyLabel:'未核销',amountKey:'amtReceivable'},
+      {  lebel: '采购订单',numberKeyLabel:'订单数量', numberKey:'sumQuantity' ,amountKeyLabel:'订单金额',amountKey:'sumAmount',image:'order-bg'},
+      { lebel: '采购出库',numberKeyLabel:'出库数量', numberKey:'outQty' ,amountKeyLabel:'退货金额',amountKey:'returnAmt',image:'inbound-bg'},
+      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'amtHandle' ,amountKeyLabel:'未核销',amountKey:'amtReceivable',image:'reverse-bg'},
     ],
   },
 

package-sales/pages/sales-tracking-report/sales-tracking-report.js

@@ -18,9 +18,9 @@ Page({
     ],
     // 列表区（内容）
     contentList: [
-      {  lebel: '销售订单',numberKeyLabel:'订单数量', numberKey:'sumQuantity' ,amountKeyLabel:'订单金额',amountKey:'sumAmount'},
-      { lebel: '销售出库',numberKeyLabel:'出库数量', numberKey:'outQty' ,amountKeyLabel:'退货金额',amountKey:'returnAmt'},
-      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'sumUsePaymentResidue' ,amountKeyLabel:'未核销',amountKey:'sumShouldHandle'},
+      {  lebel: '销售订单',numberKeyLabel:'订单数量', numberKey:'sumQuantity' ,amountKeyLabel:'订单金额',amountKey:'sumAmount',image:'order-bg'},
+      { lebel: '销售出库',numberKeyLabel:'出库数量', numberKey:'outQty' ,amountKeyLabel:'退货金额',amountKey:'returnAmt',image:'inbound-bg'},
+      {  lebel: '核销信息',numberKeyLabel:'已核销', numberKey:'sumUsePaymentResidue' ,amountKeyLabel:'未核销',amountKey:'sumShouldHandle',image:'reverse-bg'},
     ],
   },