fix(wms): 修正异常钢卷导出接口路径和文件名

将导出接口从'materialCoil/export'改为'materialCoil/exportAbnormal'，同时将导出文件名从'materialCoil'改为'abnormalCoil'以更准确反映功能
Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X
2026-05-06 17:45:22 +08:00 · 2026-05-06 17:31:36 +08:00 · 2026-05-06 16:21:32 +08:00 · 2026-05-06 16:21:06 +08:00
6 changed files with 19 additions and 16 deletions
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -213,6 +213,16 @@
          </el-table-column>
          
          <el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
+          
+          <el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
+          <el-table-column v-if="moreColumn" label="物料" prop="itemName"></el-table-column>
+          <el-table-column v-if="moreColumn" label="材质" prop="material"></el-table-column>
+          <el-table-column v-if="moreColumn" label="厂家" prop="manufacturer"></el-table-column>
+          <el-table-column v-if="moreColumn" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+          <el-table-column v-if="moreColumn" label="品质" prop="qualityStatus"></el-table-column>
+          <el-table-column v-if="moreColumn" label="切边" prop="trimmingRequirement"></el-table-column>
+          <el-table-column v-if="moreColumn" label="包装" prop="packagingRequirement"></el-table-column>
+          <el-table-column v-if="moreColumn" label="镀层质量" prop="zincLayer"></el-table-column>
          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />

          <el-table-column v-if="hasTransferType" label="调拨类型" align="center" prop="transferType" />
@@ -323,15 +333,7 @@
              {{ formatDuration(scope.row.productionDuration * 60 * 1000) }}
            </template>
          </el-table-column>
-          <el-table-column v-if="moreColumn" label="物料" prop="itemName"></el-table-column>
-          <el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
-          <el-table-column v-if="moreColumn" label="材质" prop="material"></el-table-column>
-          <el-table-column v-if="moreColumn" label="厂家" prop="manufacturer"></el-table-column>
-          <el-table-column v-if="moreColumn" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
-          <el-table-column v-if="moreColumn" label="品质" prop="qualityStatus"></el-table-column>
-          <el-table-column v-if="moreColumn" label="切边" prop="trimmingRequirement"></el-table-column>
-          <el-table-column v-if="moreColumn" label="包装" prop="packagingRequirement"></el-table-column>
-          <el-table-column v-if="moreColumn" label="镀层质量" prop="zincLayer"></el-table-column>
+          

          <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width" v-if="!moreColumn">
            <template slot-scope="scope">
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -525,7 +525,7 @@ export default {
      // 双机架修复工序
      else if (this.acidRollingActionType == 524) {
        return {
-          background: 'linear-gradient(45deg, #orange 0% 90%, #FFAACC 90% 100%)',
+          background: 'linear-gradient(45deg, orange 0% 90%, #FFAACC 90% 100%)',
          color: '#fff'
        }
      }
--- a/klp-ui/src/views/wms/delivery/canuse/index.vue
+++ b/klp-ui/src/views/wms/delivery/canuse/index.vue
@@ -26,7 +26,8 @@ export default {
        materialType: '成品',
        itemType: 'product',
        status: 0,
-        orderBy: true
+        orderBy: true,
+        excludeBound: true,
      },
      labelType: '3',
      showStatus: true,
--- a/klp-ui/src/views/wms/report/abnormal.vue
+++ b/klp-ui/src/views/wms/report/abnormal.vue
@@ -348,9 +348,9 @@ export default {
        this.$message.warning('暂无数据可导出')
        return
      }
-      this.download('wms/materialCoil/export', {
+      this.download('wms/materialCoil/exportAbnormal', {
        coilIds: this.outList.map(item => item.coilId).join(',')
-      }, `materialCoil_${new Date().getTime()}.xlsx`)
+      }, `abnormalCoil_${new Date().getTime()}.xlsx`)
    },

    // 导出消耗钢卷
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -163,8 +163,8 @@ export default {
      
      // 厂家材质透视表配置
      hierarchicalPivotConfig: {
-        groupFields: ['manufacturer', 'material'],
-        groupLabels: ['厂家', '材质'],
+        groupFields: ['manufacturer', 'material', 'specification'],
+        groupLabels: ['厂家', '材质', '规格'],
        summaryFields: [
          { prop: 'count', label: '求和项:件数', field: '', align: 'center' },
          { prop: 'weight', label: '求和项:重量', field: 'netWeight', align: 'center' }
--- a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
+++ b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
@@ -147,7 +147,7 @@ export default {
          small: 43 + 42,
          rows: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26],
          // 支持拆分的列
-          splitColumns: [1, 2, 3]
+          splitColumns: [1, 2, 3, 4, 5]
        }
      },
      dialogOpen: false,
Author	SHA1	Message	Date
砂糖	bb97d0d2a7	fix(wms): 修正异常钢卷导出接口路径和文件名将导出接口从'materialCoil/export'改为'materialCoil/exportAbnormal'，同时将导出文件名从'materialCoil'改为'abnormalCoil'以更准确反映功能	2026-05-06 17:45:22 +08:00
砂糖	484d16017d	Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X	2026-05-06 17:31:36 +08:00
砂糖	5950118c86	feat(wms): 添加excludeBound参数并调整表格列顺序 - 在delivery/canuse页面添加excludeBound参数 - 修复coil/panels/do页面颜色渐变语法错误 - 在report/receive页面透视表配置中添加规格字段 - 调整coil/panels/base页面表格列顺序	2026-05-06 16:21:32 +08:00
砂糖	d26f98440f	feat(warehouse): 增加支持拆分的列数将 splitColumns 从 [1,2,3] 扩展为 [1,2,3,4,5]，以支持更多列的拆分操作	2026-05-06 16:21:06 +08:00