Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/CollectOrderStats.vue

@@ -145,7 +145,7 @@
                 已上传单据
               </span>
             <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
-                {{ alreadyUploadingCount }}
+                {{ stats.alreadyUploadingCount }}
               </span>
           </div>
         </el-row>
@@ -168,7 +168,7 @@
               </span>
             <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
 
-                {{ notUploadingCount }}
+                {{ stats.notUploadingCount }}
               </span>
           </div>
         </el-row>
@@ -189,14 +189,86 @@
                 上传失败单据
               </span>
             <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
-                {{ uploadingFailCount }}
+                {{ stats.uploadingFailCount }}
               </span>
           </div>
         </el-row>
       </el-card>
     </div>
 
+    <div class="mt10 grid-container grid-container3" style="height: 15%">
+
+
+      <el-card class="grid-item" body-style="padding:0px;height:100%"  >
+
+        <el-row >
+          <div class="height-full fl center ml20" style="width: 30%" >
+            <el-image style="border-radius: 4%;width: 90%;height: 90%"
+                      :src="alreadyUploadingSvg"
+            >
+              <div slot="placeholder" class="image-slot">
+                加载中<span class="dot">...</span>
+              </div>
+            </el-image>
+          </div>
+          <div class="height-full fr center mr20" >
+              <span class="header d-block">
+                总上传码数量
+              </span>
+            <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
+                {{ stats.codeCount }}
+              </span>
+          </div>
+        </el-row>
+      </el-card>
+
+      <el-card class="grid-item" body-style="padding:0px;height:100%">
+        <el-row>
+          <div class="height-full fl center ml20" style="width: 30%" >
+            <el-image style="border-radius: 4%;width: 90%;height: 90%"
+                      :src="notUploadingSvg"
+            >
+              <div slot="placeholder" class="image-slot">
+                加载中<span class="dot">...</span>
+              </div>
+            </el-image>
+          </div>
+          <div class="height-full fr center mr20" >
+              <span class="header d-block">
+               采购上传率
+              </span>
+            <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
+
+                {{ stats.buyerCentage }}%
+              </span>
+          </div>
+        </el-row>
+      </el-card>
+      <el-card class="grid-item" body-style="padding:0px;height:100%">
+        <el-row>
+          <div class="height-full fl center ml20" style="width: 30%" >
+            <el-image style="border-radius: 4%;width: 90%;height: 90%"
+                      :src="notUploadingSvg"
+            >
+              <div slot="placeholder" class="image-slot">
+                加载中<span class="dot">...</span>
+              </div>
+            </el-image>
+          </div>
+          <div class="height-full fr center mr20">
+              <span class="header d-block">
+                销售上传率
+              </span>
+            <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
+                {{ stats.salesCentage }}%
+              </span>
+          </div>
+        </el-row>
+      </el-card>
+    </div>
   </div>
+
+
 </template>
 
 <script>
@@ -224,9 +296,15 @@ export default {
       alreadyUploadingSvg: alreadyUploadingSvg,
       notUploadingSvg: notUploadingSvg,
       uploadingFailSvg: uploadingFailSvg,
-      alreadyUploadingCount: 0,
+      stats:{
-      notUploadingCount: 0,
+        alreadyUploadingCount: 0,
-      uploadingFailCount: 0,
+        notUploadingCount: 0,
+        uploadingFailCount: 0,
+        buyerCentage: 0,
+        salesCentage: 0,
+        codeCount: 0,
+      },
+
       // 待办==================================================
       msgLoading: false,
       todoCount: 0,
@@ -327,26 +405,23 @@ export default {
         this.filterQuery.endTime = null
       }
       uploadCount(this.filterQuery).then(res => {
-        // console.log('res',res)
+        console.log('res111',res)
 
         if (res.code === 20000) {
           // this.loading = false
           // this.list = res.data || []
           // console.log('res.data',res.data)
-          this.notUploadingCount = 0
+          this.stats = {
-          this.alreadyUploadingCount = 0
+            notUploadingCount:res.data.notUploadingCount,
-          this.uploadingFailCount = 0
+            alreadyUploadingCount:res.data.alreadyUploadingCount,
-
+            uploadingFailCount:res.data.uploadingFailCount,
-          for (let map of res.data) {
+            buyerCentage:res.data.buyerCentage,
-
+            salesCentage:res.data.salesCentage,
-            if(map.uploadStatus == "1"){
+            codeCount:res.data.codeCount,
-              this.notUploadingCount = map.count
-            }else if(map.uploadStatus == "2"){
-              this.alreadyUploadingCount  = map.count
-            }else if(map.uploadStatus == "3"){
-              this.uploadingFailCount = map.count
-            }
           }
+
+
+
         }else {
           // this.loading = false
           this.$message.error(res.message);