feat(wms): 调整钢卷管理界面列顺序和标签

refactor(login): 重构登录页面布局和样式

klp-ui/src/views/wms/coil/box.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="statistics-container">
+  <div class="statistics-container" v-loading="loading">
     <!-- 统计方式选择 -->
     <el-form inline>
       <el-form-item label="统计方式" prop="statType">
@@ -100,8 +100,11 @@
               <el-table-column prop="warehouseName" label="仓库名称" align="center" min-width="150"></el-table-column>
               <el-table-column prop="currentCoilNo" label="当前卷号" align="center" min-width="120"></el-table-column>
               <el-table-column prop="enterCoilNo" label="入场卷号" align="center" min-width="180"></el-table-column>
-              <el-table-column prop="grossWeight" label="毛重(kg)" align="center" min-width="100"></el-table-column>
-              <el-table-column prop="netWeight" label="净重(kg)" align="center" min-width="100"></el-table-column>
+              <el-table-column label="库区" align="center" prop="itemType">
+                <template slot-scope="scope">
+                  {{ scope.row.itemType == 'product' ? '成品' : '原料' }}
+                </template>
+              </el-table-column>
               <el-table-column label="物料信息" align="center" min-width="250">
                 <template slot-scope="scope">
                   <ProductInfo v-if="scope.row.itemType === 'product'" :productId="scope.row.itemId">
@@ -116,13 +119,8 @@
                   </RawMaterialInfo>
                 </template>
               </el-table-column>
-              <el-table-column prop="coilStatus" label="状态" align="center" min-width="100">
-                <template slot-scope="scope">
-                  <el-tag :type="getCoilStatusTagType(scope.row.coilStatus)">
-                    {{ formatCoilStatus(scope.row.coilStatus) }}
-                  </el-tag>
-                </template>
-              </el-table-column>
+              <el-table-column prop="grossWeight" label="毛重(kg)" align="center" min-width="100"></el-table-column>
+              <el-table-column prop="netWeight" label="净重(kg)" align="center" min-width="100"></el-table-column>
             </el-table>
           </el-skeleton>
 
@@ -160,6 +158,7 @@ export default {
         itemType: undefined,
         itemId: undefined,
       },
+      loading: false,
       list: [],
       // 科技风配色方案（蓝色系为主，体现科技感）
       techColors: [
@@ -209,17 +208,20 @@ export default {
   },
   methods: {
     getList() {
+      this.loading = true;
       if (this.queryParams.statType === '1') {
         // 物料统计：仓库字段无效，以物料为核心
         getMaterialCoilDistributionByType(this.queryParams).then(res => {
           this.list = res.data || [];
           this.updateCharts();
+          this.loading = false;
         })
       } else if (this.queryParams.statType === '2') {
         // 仓库统计：物料字段无效，以仓库为核心
         getMaterialCoilDistributionByWarehouse(this.queryParams).then(res => {
           this.list = res.data || [];
           this.updateCharts();
+          this.loading = false;
         })
       }
     },
@@ -279,11 +281,11 @@ export default {
             warehouseId: item.warehouseId,
             warehouseName: item.warehouseName,
             itemStyle: { color: this.getTechColor(index) },
-            children: [{
-              name: `卷数: ${item.coilCount}`,
-              value: item.coilCount,
-              itemStyle: { color: this.getTechColor(index + 1).replace('rgb', 'rgba').replace(')', ', 0.7)') }
-            }]
+            // children: [{
+            //   name: `卷数: ${item.coilCount}`,
+            //   value: item.coilCount,
+            //   itemStyle: { color: this.getTechColor(index + 1).replace('rgb', 'rgba').replace(')', ', 0.7)') }
+            // }]
           }))
         };
       }