数据

src/views/component/inventorysSelect.vue

@@ -24,6 +24,7 @@
 
       <Table
         ref="currentRowTable"
+        :loading="loadingtable"
         highlight-row
         :columns="wuziColumns"
         :data="wzList"
@@ -57,6 +58,7 @@ export default {
     return {
       // 物资
       showLoading: false,
+      loadingtable:false,
       isShowWuzi: false,
       wuziPageIndex: 1,
       wuzibianmakeyword: '',
@@ -129,6 +131,7 @@ export default {
         this.getWuzi()
       }else{
         this.wzList = []
+        this.loadingtable = false
         this.wuziPageIndex = 1
       }
     }
@@ -136,6 +139,7 @@ export default {
   methods: {
     async getWuzi() {
       this.showLoading = true
+      this.loadingtable = true
       const res = await index({
         page_size: 40,
         page: this.wuziPageIndex,
@@ -153,7 +157,7 @@ export default {
         }]
       })
 
-
+      console.log("res.list.data",res.list.data)
       let arr = this.processInventoryData(res.list.data)
       for (var m of arr) {
         m.isSelect = false
@@ -162,6 +166,7 @@ export default {
       console.log("this.wzList",this.wzList)
       this.wuziTotal = res.list.total
       this.showLoading = false
+      this.loadingtable = false
       console.log('res', this.wzList)
     },
     wuziSelect(e) {
@@ -197,7 +202,7 @@ export default {
     processInventoryData(data) {
       // 筛选出wuzileixing = 一物一码的记录 且 没有等待出库的
       const matchedData = data
-        .filter(item => item.wuzileixing === '一物一码' && parseFloat(item.zaikushuliang) !== 0 && parseFloat(item.wait_num)> 0 ); // 新增zaikushuliang !== 0条件
+        .filter(item => item.wuzileixing === '一物一码' && parseFloat(item.zaikushuliang) !== 0 && parseFloat(item.wait_num) === 0 ); // 新增zaikushuliang !== 0条件
 
       // 保存不匹配的记录（直接返回）
       const unmatchedData = data

src/views/jsc/index.vue

@@ -12,13 +12,14 @@
       </div>
       <div class="jscC-center">
         <div class="jscC-center-left" >
-          <Pie3DChart :data="upList"></Pie3DChart>
+          <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
-          <!-- <div class="jscC-center-left-title">物资数量统计</div> -->
+          <div class="jscC-center-left-title">重要防汛物资</div>
-          <!-- <div class="jscC-center-left-content"> -->
+          <div class="jscC-center-left-content">
-            <!-- <div v-for="item in upList">
+            <div v-for="item in upList">
+              <img :src="item.img" alt="">
               <span>{{item.name}}：</span>
-              <span>{{item.total}}{{item.unit?item.unit:''}}</span>
+              <span>{{item.value}}{{item.unit?item.unit:''}}</span>
-            </div> -->
+            </div>
             <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
             <!-- <span
               v-for="item in Object.keys(chartDataMap)"
@@ -28,7 +29,7 @@
             >
               {{ item }}
             </span> -->
-          <!-- </div> -->
+          </div>
           <!-- <Bar3DChart></Bar3DChart> -->
           <!-- <fenleiChart :chart-data="chartData" /> -->
         </div>
@@ -159,7 +160,16 @@ export default {
       }, {
         id: 'weihu',
         value: '维护'
-      }]
+      }],
+      imgList:{
+        '袋类':require("@/assets/dailei.jpg"),
+        '排水类':require('@/assets/beng.jpg'),
+        '土工布类':require('@/assets/tugongbu.jpg'),
+        '动力及照明类':require('@/assets/zhaoming.jpg'),
+        '移动泵车':require('@/assets/bengche.jpg'),
+        '桩类':require('@/assets/zhuanglei.jpg'),
+        '砂石类':require('@/assets/shashi.jpg'),
+      }
     }
   },
   computed: {
@@ -220,6 +230,9 @@ export default {
       //     unit:item.unit
       //   })
       // })
+      res.upList.map(item=>{
+        item.img = this.imgList[item.name]
+      })
       this.upList = this.mergeAndRename(res.upList)
       console.log("this.upList",this.upList)
     },
@@ -228,30 +241,31 @@ export default {
       let pumpTotal = 0; // 排水类总和
       let mobilePumpTotal = 0; // 移动泵车总和
       let pumpUnit = ""; // 排水类的单位
-
+      let pumpImg = this.imgList['排水类']
       // 第一步：遍历数组，处理常规项并统计特殊项
       arr.forEach(item => {
-        const { name, total, unit } = item;
+        const { name, total, unit, img } = item;
         const value = total;
 
         if (name === "排水类") {
           pumpTotal += value;
           // 记录排水类的unit（假设所有排水类unit相同）
           if (!pumpUnit) pumpUnit = unit;
+
         } else if (name === "移动泵车") {
           mobilePumpTotal += value;
           // 正常处理移动泵车，加入结果集
           if (resultMap.has(name)) {
             resultMap.get(name).value += value;
           } else {
-            resultMap.set(name, { name, value, unit });
+            resultMap.set(name, { name, value, unit,img });
           }
         } else {
           // 常规项处理
           if (resultMap.has(name)) {
             resultMap.get(name).value += value;
           } else {
-            resultMap.set(name, { name, value, unit });
+            resultMap.set(name, { name, value, unit,img });
           }
         }
       });
@@ -259,7 +273,7 @@ export default {
       // 第二步：计算泵类值并添加到结果集
       if (pumpTotal > 0) {
         const finalPumpValue = pumpTotal - mobilePumpTotal;
-        resultMap.set("泵", { name: "泵", value: finalPumpValue, unit: pumpUnit });
+        resultMap.set("泵", { name: "泵", value: finalPumpValue, unit: pumpUnit,img:pumpImg });
       }
 
       return Array.from(resultMap.values());
@@ -430,7 +444,7 @@ export default {
 
         // flex-wrap: wrap;
         &-left {
-
+          height: 400px;
           &-title {
             color: #6dcde6;
             text-align: center;
@@ -440,12 +454,21 @@ export default {
           }
           &-content{
             width: 450px;
-            height: 400px;
+            display:flex;
+            flex-wrap: wrap;
             &>div{
-              text-align: center;
+              flex-basis: 50%;
+              text-align: left;
               margin:10px 0;
               color:#fff;
               font-size: 16px;
+                  display: flex;
+                  align-items: center;
+              &>img{
+                width:30px;
+                height:30px;
+                margin-right:10px;
+              }
             }
           }
           .custom-btn {

src/views/outbounds/component/printoutbounds.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="printwrap">
     <Modal v-model="isShow" width="70" title="出库">
-      <div id="printmodal" class="print" :class="{'watermark':!showwatermark}">
+       <!-- :class="{'watermark':!showwatermark}" -->
+      <div id="printmodal" class="print">
         <div class="printtitle">苏州市河道管理处物资出库记录单</div>
         <div class="printtop">
           <span>业务科室:{{ form.jieyongbumen }}</span>
@@ -226,11 +227,11 @@ export default {
         table_name: this.tableName
       })
       this.form = res
-      if (res.zhuangtai == '已办结') {
+      // if (res.zhuangtai == 2) {
-        this.showwatermark = true
+      //   this.showwatermark = true
-      } else {
+      // } else {
-        this.showwatermark = false
+      //   this.showwatermark = false
-      }
+      // }
       this.mingxiList = res.id_outbounds_items_outbounds_id_relation
     },
     handlePrint() {