Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

2026-03-24 15:42:48 +08:00
parent b31c3284b6 602b10b689
commit 45f58a7d3e
32 changed files with 842 additions and 385 deletions
--- a/klp-ui/src/views/crm/saleman/index.vue
+++ b/klp-ui/src/views/crm/saleman/index.vue
@@ -0,0 +1,453 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="销售员标签" prop="dictLabel">
+        <el-input
+          v-model="queryParams.dictLabel"
+          placeholder="请输入销售员标签"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <div v-loading="loading" class="card-container">
+      <el-card 
+        v-for="item in dataList" 
+        :key="item.dictCode" 
+        class="saleman-card"
+        shadow="hover"
+      >
+        <div class="card-header">
+          <div class="card-title">
+            <span v-if="item.listClass == '' || item.listClass == 'default'">{{item.dictLabel}}</span>
+            <el-tag v-else :type="item.listClass == 'primary' ? '' : item.listClass">{{item.dictLabel}}</el-tag>
+          </div>
+          <div class="card-actions">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(item)"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(item)"
+            >删除</el-button>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="card-info">
+            <span class="info-label">销售员编码：</span>
+            <span class="info-value">{{item.dictCode}}</span>
+          </div>
+          <div class="card-info">
+            <span class="info-label">排序：</span>
+            <span class="info-value">{{item.dictSort}}</span>
+          </div>
+          <div class="card-info">
+            <span class="info-label">状态：</span>
+            <span class="info-value"><dict-tag :options="dict.type.sys_normal_disable" :value="item.status"/></span>
+          </div>
+          <div class="card-info" v-if="item.remark">
+            <span class="info-label">备注：</span>
+            <span class="info-value">{{item.remark}}</span>
+          </div>
+          <div class="card-info">
+            <span class="info-label">创建时间：</span>
+            <span class="info-value">{{ parseTime(item.createTime) }}</span>
+          </div>
+        </div>
+      </el-card>
+    </div>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="销售员类型">
+          <el-input v-model="form.dictType" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="销售员名称" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入销售员名称" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+        </el-form-item>
+        <el-form-item label="显示排序" prop="dictSort">
+          <el-input-number :controls=false controls-position="right" v-model="form.dictSort" :min="0" />
+        </el-form-item>
+        <el-form-item label="回显样式" prop="listClass">
+          <el-select v-model="form.listClass">
+            <el-option
+              v-for="item in listClassOptions"
+              :key="item.value"
+              :label="item.label + '(' + item.value + ')'"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+
+export default {
+  name: "Data",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 销售员表格数据
+      dataList: [],
+      // 默认销售员类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据标签回显样式
+      listClassOptions: [
+        {
+          value: "default",
+          label: "默认"
+        },
+        {
+          value: "primary",
+          label: "主要"
+        },
+        {
+          value: "success",
+          label: "成功"
+        },
+        {
+          value: "info",
+          label: "信息"
+        },
+        {
+          value: "warning",
+          label: "警告"
+        },
+        {
+          value: "danger",
+          label: "危险"
+        }
+      ],
+      // 类型数据销售员
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" }
+        ],
+        dictValue: [
+          { required: true, message: "数据键值不能为空", trigger: "blur" }
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    // const dictId = this.$route.params && this.$route.params.dictId;
+    const dictId = '2036334758127824897'
+    this.getType(dictId);
+    this.getTypeList();
+  },
+  methods: {
+    /** 查询销售员类型详细 */
+    getType(dictId) {
+      getType(dictId).then(response => {
+        this.queryParams.dictType = response.data.dictType;
+        this.defaultDictType = response.data.dictType;
+        this.getList();
+      });
+    },
+    /** 查询销售员类型列表 */
+    getTypeList() {
+      getDictOptionselect().then(response => {
+        this.typeOptions = response.data;
+      });
+    },
+    /** 查询销售员数据列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictCode: undefined,
+        dictLabel: undefined,
+        cssClass: undefined,
+        listClass: 'default',
+        dictSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/system/dict" };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.dictType = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加销售员数据";
+      this.form.dictType = this.queryParams.dictType;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictCode)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictCode = row.dictCode || this.ids
+      getData(dictCode).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改销售员数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 确保dictLabel和dictValue保持一致
+          this.form.dictValue = this.form.dictLabel;
+          if (this.form.dictCode != undefined) {
+            updateData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.dictCode || this.ids;
+      this.$modal.confirm('是否确认删除销售员编码为"' + dictCodes + '"的数据项？').then(function() {
+        return delData(dictCodes);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/dict/data/export', {
+        ...this.queryParams
+      }, `data_${new Date().getTime()}.xlsx`)
+    },
+    /** 复制按钮操作 */
+    // handleCopy() {
+    //   // 复制销售员进入系统剪切板，数据结构：{dictName: '', dictType: '', data: [
+    //   // 
+    //   // ], status: '0', remark: ''}
+    //   this.reset();
+    //   this.open = true;
+    //   this.title = "复制销售员数据";
+    //   this.form.dictType = this.queryParams.dictType;
+    // }
+  }
+};
+</script>
+
+<style scoped>
+.card-container {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 20px;
+  margin-top: 20px;
+}
+
+.saleman-card {
+  transition: all 0.3s ease;
+}
+
+.saleman-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.card-title {
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.card-actions {
+  display: flex;
+  gap: 10px;
+}
+
+.card-body {
+  padding-top: 10px;
+}
+
+.card-info {
+  display: flex;
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+
+.info-label {
+  width: 100px;
+  color: #606266;
+}
+
+.info-value {
+  flex: 1;
+  color: #303133;
+}
+</style>
--- a/klp-ui/src/views/wms/coil/js/coilPrint.js
+++ b/klp-ui/src/views/wms/coil/js/coilPrint.js
@@ -4,7 +4,8 @@ const ECoilPrintType = {
  '镀锌成品': '4',
  '镀铬成品': 'ge',
  '镀锌原料': '5',
-  '脱脂原料': '6'
+  '脱脂原料': '6',
+  '分条成品': 'split',
 }

 /**
@@ -26,6 +27,11 @@ export const getCoilTagPrintType = (coil) => {
  else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
    type = ECoilPrintType['脱脂原料'];
  }
+  // 分条成品库
+  else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) {
+    type = ECoilPrintType['分条成品'];
+  }
+  // 其他卷使用成品标签
  else if (itemType == 'raw_material') {
    type = ECoilPrintType['原料标签'];
  } else if (itemType == 'product' && itemName == '冷硬卷') {
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="label-container" :style="{ '--print-scale': printScale }">
+    <div class="material-label-grid">
+      <!-- 公司名称行 -->
+      <div class="grid-cell company-cell">嘉祥科伦普重工有限公司</div>
+      
+      <!-- 第一行：冷卷号、热卷号 -->
+      <div class="grid-cell label-cell">原料号</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.enterCoilNo|| '' }}</div>
+      </div>
+      <div class="grid-cell label-cell">钢卷号</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.currentCoilNo || '' }}</div>
+      </div>
+      
+      <!-- 第二行：规格、钢种 -->
+      <div class="grid-cell label-cell">规格</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.specification || '' }}</div>
+      </div>
+      <div class="grid-cell label-cell">净重</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.netWeight || '' }}</div>
+      </div>
+      
+      <!-- 第三行：净重、下工序 -->
+      <div class="grid-cell label-cell">材质</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.material || '' }}</div>
+      </div>
+      <div class="grid-cell label-cell">厂家</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.manufacturer }}</div>
+      </div>
+      
+      <!-- 第四行：包装要求、切边要求 -->
+      <div class="grid-cell label-cell">生产班组</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ content.team || '' }}</div>
+      </div>
+      <div class="grid-cell label-cell">生产日期</div>
+      <div class="grid-cell value-cell">
+        <div class="nob">{{ formatDate(content.createTime) }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import QRCode from '@/components/QRCode/index.vue';
+
+export default {
+  name: 'ZincRawTag',
+  components: {
+    QRCode
+  },
+  props: {
+    content: {
+      type: Object,
+      default: () => ({
+        currentCoilNo: '',
+        entryCoilNo: '',
+        specification: '',
+        material: '',
+        netWeight: '',
+        nextProcess: '',
+        packagingRequirements: '',
+        trimmingRequirements: '',
+        team: '',
+        createTime: '',
+        qrcodeRecordId: '',
+      })
+    },
+    paperWidthMm: {
+      type: Number,
+      default: 100
+    },
+    paperHeightMm: {
+      type: Number,
+      default: 80
+    }
+  },
+  data() {
+    return {
+      printScale: 1,
+      printMediaQuery: null
+    }
+  },
+  mounted() {
+    this.printMediaQuery = window.matchMedia('print');
+    this.printMediaQuery.addListener(this.handlePrintMediaChange);
+    window.addEventListener('beforeprint', this.handleBeforePrint);
+    window.addEventListener('afterprint', this.handleAfterPrint);
+    this.$nextTick(() => {
+      this.calculatePrintScale();
+    });
+  },
+  beforeDestroy() {
+    if (this.printMediaQuery) {
+      this.printMediaQuery.removeListener(this.handlePrintMediaChange);
+    }
+    window.removeEventListener('beforeprint', this.handleBeforePrint);
+    window.removeEventListener('afterprint', this.handleAfterPrint);
+  },
+  methods: {
+    handlePrintMediaChange(mq) {
+      mq.matches ? this.calculatePrintScale() : this.resetPrintScale();
+    },
+    handleBeforePrint() {
+      setTimeout(() => this.calculatePrintScale(), 100);
+    },
+    handleAfterPrint() {
+      this.resetPrintScale();
+    },
+    calculatePrintScale() {
+      this.$nextTick(() => {
+        const container = this.$el;
+        if (!container) return;
+
+        const dpi = 96;
+        const mmToPx = dpi / 25.4;
+        const paperWidthPx = this.paperWidthMm * mmToPx;
+        const paperHeightPx = this.paperHeightMm * mmToPx;
+        const marginPx = 2 * mmToPx;
+
+        const rect = container.getBoundingClientRect();
+        const contentWidth = rect.width || container.scrollWidth;
+        const contentHeight = rect.height || container.scrollHeight;
+
+        const availableWidth = paperWidthPx - marginPx * 2;
+        const availableHeight = paperHeightPx - marginPx * 2;
+
+        const scaleX = contentWidth > 0 ? availableWidth / contentWidth : 1;
+        const scaleY = contentHeight > 0 ? availableHeight / contentHeight : 1;
+
+        this.printScale = Math.min(scaleX, scaleY, 1);
+        container.style.setProperty('--print-scale', this.printScale);
+        container.style.setProperty('--paper-width', `${this.paperWidthMm}mm`);
+        container.style.setProperty('--paper-height', `${this.paperHeightMm}mm`);
+      });
+    },
+    resetPrintScale() {
+      this.printScale = 1;
+      if (this.$el) {
+        this.$el.style.setProperty('--print-scale', 1);
+        this.$el.style.removeProperty('--paper-width');
+        this.$el.style.removeProperty('--paper-height');
+      }
+    },
+    formatDate(dateStr) {
+      // 格式化为YYYY.mm.dd
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}.${month}.${day}`;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.label-container {
+  width: 45em;
+  height: 25em;
+  padding: 16px;
+  font-family: "SimSun", serif;
+  box-sizing: border-box;
+}
+
+/* 核心Grid布局 */
+.material-label-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr); /* 4列等宽 */
+  grid-auto-rows: 1fr; /* 行高自适应 */
+  width: 100%;
+  height: 100%;
+  border: 1px solid #333;
+  box-sizing: border-box;
+}
+
+.grid-cell {
+  border: 1px solid #333;
+  padding: 4px;
+  font-size: 20px;
+  box-sizing: border-box;
+  text-align: center;
+  word-break: break-all;
+  overflow-wrap: break-word;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 公司名称单元格 */
+.company-cell {
+  grid-column: span 4; /* 跨4列 */
+  font-size: 24px;
+  font-weight: bold;
+  /* background-color: #f5f5f5; */
+}
+
+/* 标签单元格（左） */
+.label-cell {
+  /* background-color: #f5f5f5; */
+  font-weight: bold;
+}
+
+/* 值单元格 */
+.value-cell {
+  text-align: center;
+  font-weight: bold;
+}
+
+.date-cell {
+  grid-column: span 2;
+}
+
+/* 二维码单元格（跨2列+2行） */
+.qrcode-cell {
+  grid-row: span 2; /* 跨2行 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.qrcode-container {
+  width: 80%;
+  height: 80%;
+  border: 1px dashed #999; /* 占位虚线 */
+}
+
+/* 内容可编辑区域 */
+.nob {
+  width: 100%;
+  height: 100%;
+  border: none;
+  outline: none;
+  background: transparent;
+  text-align: center;
+  font-size: inherit;
+  word-break: break-all;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
+  font-size: 1.2em;
+}
+
+/* 打印样式 */
+@media print {
+  @page {
+    size: 100mm 80mm;
+    margin: 0 !important;
+  }
+
+  * {
+    -webkit-print-color-adjust: exact !important;
+    print-color-adjust: exact !important;
+  }
+
+  html,
+  body {
+    margin: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+  }
+
+  body>*:not(.label-container) {
+    display: none !important;
+  }
+
+  .label-container {
+    page-break-inside: avoid !important;
+    break-inside: avoid !important;
+    transform: scale(var(--print-scale, 1)) !important;
+    transform-origin: top left !important;
+    max-width: var(--paper-width, 100mm) !important;
+    max-height: var(--paper-height, 80mm) !important;
+    overflow: hidden !important;
+  }
+}
+</style>
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -44,6 +44,12 @@
        :paperWidthMm="180"
        :paperHeightMm="100"
      />
+      <SplitTag
+        v-if="tagType === 'split'"
+        :content="content"
+        :paperWidthMm="180"
+        :paperHeightMm="100"
+      />
    </div>
    <div class="action-buttons" v-if="!hideActions">
      <el-button type="primary" @click="downloadLabelAsImage">下载标签图片</el-button>
@@ -65,7 +71,7 @@ import WhereTag from './WhereTag.vue';
 import ZincRawTag from './ZincRawTag.vue';
 import DuGeTag from './DuGeTag.vue';
 import TuoZhiTag from './TuoZhiTag.vue';
-
+import SplitTag from './SplitTag.vue';

 export default {
  name: 'LabelRender',
@@ -77,6 +83,7 @@ export default {
    ZincRawTag,
    DuGeTag,
    TuoZhiTag,
+    SplitTag,
    // SampleTagPreview,
    // ForgeTagPreview,
    // SaltSprayTagPreview,
@@ -113,6 +120,10 @@ export default {
          width: 180,
          height: 100,
        },
+        'split': {
+          width: 180,
+          height: 100,
+        },
      }
    }
  },
@@ -151,8 +162,10 @@ export default {
          this.labelType = '6';
        } else if (itemType == 'raw_material') {
          this.labelType = '2';
-        } else if (itemType == 'product') {
-          this.labelType = 'where';
+        } 
+        // 分条成品
+        else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) {
+          this.labelType = 'split';
        } else if (itemType == 'product' && itemName == '冷硬卷') {
          this.labelType = '3';
        } else if (itemType == 'product' && itemName == '热轧卷板') {
--- a/klp-ui/src/views/wms/packing/packing.vue
+++ b/klp-ui/src/views/wms/packing/packing.vue
@@ -25,6 +25,12 @@
                <el-form-item label="批次号" prop="batchNo">
                  <el-input v-model="form.batchNo" placeholder="请输入批次号" clearable />
                </el-form-item>
+                <el-form-item label="销售员" prop="saleName">
+                  <el-select v-model="form.saleName" placeholder="请选择销售名称" clearable filterable>
+                    <el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="打包时间" prop="packingTime">
@@ -34,8 +40,6 @@
                <el-form-item label="操作人" prop="packingBy">
                  <el-input v-model="form.packingBy" placeholder="请输入操作人" clearable />
                </el-form-item>
-              </el-col>
-              <el-col :span="24">
                <el-form-item label="备注" prop="remark">
                  <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
                </el-form-item>
@@ -66,19 +70,15 @@
            <el-table-column label="重量" align="center" prop="coilNetWeight" width="80">
              <template slot-scope="scope">{{ scope.row.coilNetWeight }}t</template>
            </el-table-column>
-            <el-table-column label="销售名称" align="center" prop="saleName" width="100">
+            <!-- <el-table-column label="销售名称" align="center" prop="saleName" width="140">
              <template slot-scope="scope">
-                <el-input v-model="scope.row.saleName"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="打包前位置" align="center" prop="fromWarehouseName" min-width="120"
-              show-overflow-tooltip />
-            <!-- <el-table-column label="打包后位置" align="center" prop="toWarehouseName" min-width="120">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.editing" v-model="scope.row.toWarehouseName" size="mini" placeholder="输入位置" />
-                <span v-else>{{ scope.row.toWarehouseName || '—' }}</span>
+                <el-select v-model="scope.row.saleName" placeholder="请选择销售名称">
+                  <el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
              </template>
            </el-table-column> -->
+            <el-table-column label="打包前位置" align="center" prop="fromWarehouseName" min-width="120"
+              show-overflow-tooltip />
            <el-table-column label="操作" align="center" width="100">
              <template slot-scope="scope">
                <template v-if="scope.row.editing">
@@ -86,7 +86,6 @@
                  <el-button size="mini" type="text" @click="scope.row.editing = false">取消</el-button>
                </template>
                <template v-else>
-                  <!-- <el-button size="mini" type="text" @click="handleEditDetail(scope.row)">修改</el-button> -->
                  <el-button size="mini" type="text" @click="handleDeleteDetail(scope.row)">删除</el-button>
                </template>
              </template>
@@ -142,6 +141,7 @@ export default {
    ProductInfo,
    RawMaterialInfo
  },
+  dicts: ['wip_pack_saleman'],
  data() {
    return {
      // 表单参数
@@ -237,7 +237,6 @@ export default {
          };
          createPacking(data).then(response => {
            this.$modal.msgSuccess('创建成功');
-            this.form.packingNo = response.data.packingNo;
            this.getRecentList();
            this.resetForm();
          }).finally(() => {
--- a/klp-ui/src/views/wms/packing/record.vue
+++ b/klp-ui/src/views/wms/packing/record.vue
@@ -41,6 +41,7 @@
        <el-table-column label="批次号" align="center" prop="batchNo" />
        <el-table-column label="打包日期" align="center" prop="packingTime" />
        <el-table-column label="操作人" align="center" prop="packingBy" />
+        <el-table-column label="销售员" align="center" prop="saleName" />
        <el-table-column label="卷数" align="center" prop="coilCount" />
        <el-table-column label="总重" align="center" prop="totalNetWeight">
          <template slot-scope="scope">{{ scope.row.totalNetWeight }}t</template>
@@ -93,6 +94,11 @@
              <el-input v-model="selectedPacking.packingBy" @change="handleSaveEdit" placeholder="请输入操作人" clearable
                style="width: 180px" />
            </el-descriptions-item>
+            <el-descriptions-item label="销售员">
+               <el-select v-model="selectedPacking.saleName" placeholder="请选择销售名称" filterable  @change="handleSaveEdit">
+              <el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            </el-descriptions-item>
            <el-descriptions-item label="卷数">{{ selectedPacking.coilCount }}</el-descriptions-item>
            <el-descriptions-item label="总重">{{ selectedPacking.totalNetWeight }}t</el-descriptions-item>

@@ -119,9 +125,11 @@
        <el-table-column label="重量" align="center" prop="coilNetWeight" width="80"></el-table-column>
        <el-table-column label="质量状态" align="center" prop="coil.qualityStatus" width="80"></el-table-column>
        <el-table-column label="实际库区" align="center" prop="coil.actualWarehouseName"></el-table-column>
-        <el-table-column label="销售名称" align="center" prop="coil.saleName" width="100">
+        <el-table-column label="销售名称" align="center" prop="coil.saleName" width="140">
          <template slot-scope="scope">
-            <el-input v-model="scope.row.coil.saleName" @change="updateSaleName(scope.row.coil)"></el-input>
+            <el-select v-model="scope.row.coil.saleName" placeholder="请选择销售名称" @change="updateSaleName(scope.row.coil)" filterable>
+              <el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
          </template>
        </el-table-column>
        <!-- <el-table-column label="打包前位置" align="center" prop="fromWarehouseName" min-width="120" show-overflow-tooltip /> -->
@@ -158,6 +166,7 @@ export default {
    ProductInfo,
    RawMaterialInfo
  },
+  dicts: ['wip_pack_saleman'],
  data() {
    return {
      // 遮罩层
--- a/klp-ui/src/views/wms/report/duge/day.vue
+++ b/klp-ui/src/views/wms/report/duge/day.vue
@@ -9,6 +9,7 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { dugeConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'LossReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [505, 120],
-      actionQueryParams: {
-        createBy: 'dugekuguan'
-      },
-      baseQueryParams: {
-        createBy: 'dugekuguan',
-      },
-      warehouseOptions: [
-        {value: '1988151132361519105', label: '镀铬成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...dugeConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/duge/month.vue
+++ b/klp-ui/src/views/wms/report/duge/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { dugeConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [505, 120],
-      actionQueryParams: {
-        createBy: 'dugekuguan'
-      },
-      baseQueryParams: {
-        createBy: 'dugekuguan',
-      },
-      warehouseOptions: [
-        {value: '1988151132361519105', label: '镀铬成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...dugeConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/duge/team.vue
+++ b/klp-ui/src/views/wms/report/duge/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { dugeConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [505, 120],
-      actionQueryParams: {
-        createBy: 'dugekuguan'
-      },
-      baseQueryParams: {
-        createBy: 'dugekuguan',
-      },
-      warehouseOptions: [
-        {value: '1988151132361519105', label: '镀铬成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...dugeConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/duge/year.vue
+++ b/klp-ui/src/views/wms/report/duge/year.vue
@@ -9,6 +9,7 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { dugeConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'YearReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [505, 120],
-      actionQueryParams: {
-        createBy: 'dugekuguan'
-      },
-      baseQueryParams: {
-        createBy: 'dugekuguan',
-      },
-      warehouseOptions: [
-        {value: '1988151132361519105', label: '镀铬成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...dugeConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/day.vue
+++ b/klp-ui/src/views/wms/report/lajiao/day.vue
@@ -9,28 +9,16 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { lajiaoConfig } from '@/views/wms/report/js/config.js'

 export default {
-  name: 'LossReport',
+  name: 'DayReport',
  components: {
    DayTemplate,
  },
  data() {
    return {
-      actionTypes: [503, 120],
-      actionQueryParams: {
-        createBy: 'lajiaokuguan'
-      },
-      baseQueryParams: {
-        createBy: 'lajiaokuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150915591499777', label: '拉矫成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...lajiaoConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/month.vue
+++ b/klp-ui/src/views/wms/report/lajiao/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { lajiaoConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [503, 120],
-      actionQueryParams: {
-        createBy: 'lajiaokuguan'
-      },
-      baseQueryParams: {
-        createBy: 'lajiaokuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150915591499777', label: '拉矫成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...lajiaoConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/team.vue
+++ b/klp-ui/src/views/wms/report/lajiao/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { lajiaoConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [503, 120],
-      actionQueryParams: {
-        createBy: 'lajiaokuguan'
-      },
-      baseQueryParams: {
-        createBy: 'lajiaokuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150915591499777', label: '拉矫成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...lajiaoConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/lajiao/year.vue
+++ b/klp-ui/src/views/wms/report/lajiao/year.vue
@@ -9,6 +9,7 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { lajiaoConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'YearReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [503, 120],
-      actionQueryParams: {
-        createBy: 'lajiaokuguan'
-      },
-      baseQueryParams: {
-        createBy: 'lajiaokuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150915591499777', label: '拉矫成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...lajiaoConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/shuang/day.vue
+++ b/klp-ui/src/views/wms/report/shuang/day.vue
@@ -9,6 +9,7 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { shuangConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'LossReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [504, 120],
-      actionQueryParams: {
-        createBy: 'shuangkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'shuangkuguan',
-      },
-      warehouseOptions: [
-        {value: '1992873437713080322', label: '双机架成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...shuangConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/shuang/month.vue
+++ b/klp-ui/src/views/wms/report/shuang/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { shuangConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [504, 120],
-      actionQueryParams: {
-        createBy: 'shuangkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'shuangkuguan',
-      },
-      warehouseOptions: [
-        {value: '1992873437713080322', label: '双机架成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...shuangConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/shuang/team.vue
+++ b/klp-ui/src/views/wms/report/shuang/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { shuangConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [504, 120],
-      actionQueryParams: {
-        createBy: 'shuangkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'shuangkuguan',
-      },
-      warehouseOptions: [
-        {value: '1992873437713080322', label: '双机架成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...shuangConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/shuang/year.vue
+++ b/klp-ui/src/views/wms/report/shuang/year.vue
@@ -9,6 +9,7 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { shuangConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'YearReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [504, 120],
-      actionQueryParams: {
-        createBy: 'shuangkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'shuangkuguan',
-      },
-      warehouseOptions: [
-        {value: '1992873437713080322', label: '双机架成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...shuangConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/tuozhi/day.vue
+++ b/klp-ui/src/views/wms/report/tuozhi/day.vue
@@ -9,6 +9,8 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { tuozhiConfig } from '@/views/wms/report/js/config.js'
+

 export default {
  name: 'LossReport',
@@ -17,20 +19,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [502, 120],
-      actionQueryParams: {
-        createBy: 'tuozhikuguan'
-      },
-      baseQueryParams: {
-        createBy: 'tuozhikuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150586938421250', label: '脱脂成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...tuozhiConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/tuozhi/month.vue
+++ b/klp-ui/src/views/wms/report/tuozhi/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { tuozhiConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [502, 120],
-      actionQueryParams: {
-        createBy: 'tuozhikuguan'
-      },
-      baseQueryParams: {
-        createBy: 'tuozhikuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150586938421250', label: '脱脂成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...tuozhiConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/tuozhi/out.vue
+++ b/klp-ui/src/views/wms/report/tuozhi/out.vue
@@ -7,6 +7,7 @@

 <script>
 import OutTemplate from "@/views/wms/report/template/out.vue";
+import { tuozhiConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'ZhaTemplate',
@@ -15,16 +16,7 @@ export default {
  },
  data() {
    return {
-      baseQueryParams: {
-        createBy: 'tuozhikuguan',
-      },
-      warehouseOptions: [
-       {value: '1988150586938421250', label: '脱脂成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...tuozhiConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/tuozhi/team.vue
+++ b/klp-ui/src/views/wms/report/tuozhi/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { tuozhiConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [502, 120],
-      actionQueryParams: {
-        createBy: 'tuozhikuguan'
-      },
-      baseQueryParams: {
-        createBy: 'tuozhikuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150586938421250', label: '脱脂成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...tuozhiConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/tuozhi/year.vue
+++ b/klp-ui/src/views/wms/report/tuozhi/year.vue
@@ -9,6 +9,7 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { tuozhiConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'YearReport',
@@ -17,20 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [502, 120],
-      actionQueryParams: {
-        createBy: 'tuozhikuguan'
-      },
-      baseQueryParams: {
-        createBy: 'tuozhikuguan',
-      },
-      warehouseOptions: [
-        {value: '1988150586938421250', label: '脱脂成品库'},
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...tuozhiConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zha/day.vue
+++ b/klp-ui/src/views/wms/report/zha/day.vue
@@ -9,6 +9,7 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { suanzhaConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'LossReport',
@@ -17,23 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [11, 120],
-      actionQueryParams: {
-        createBy: 'suanzhakuguan'
-      },
-      baseQueryParams: {
-        createBy: 'suanzhakuguan',
-      },
-      warehouseOptions: [
-        { label: '酸连轧成品库', value: '1988150099140866050' },
-        { label: '镀锌原料库', value: '1988150263284953089' },
-        { label: '脱脂原料库', value: '1988150545175736322' },
-        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...suanzhaConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zha/month.vue
+++ b/klp-ui/src/views/wms/report/zha/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { suanzhaConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,23 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [11, 120],
-      actionQueryParams: {
-        createBy: 'suanzhakuguan'
-      },
-      baseQueryParams: {
-        createBy: 'suanzhakuguan',
-      },
-      warehouseOptions: [
-        { label: '酸连轧成品库', value: '1988150099140866050' },
-        { label: '镀锌原料库', value: '1988150263284953089' },
-        { label: '脱脂原料库', value: '1988150545175736322' },
-        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...suanzhaConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zha/team.vue
+++ b/klp-ui/src/views/wms/report/zha/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { suanzhaConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,23 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [11, 120],
-      actionQueryParams: {
-        createBy: 'suanzhakuguan'
-      },
-      baseQueryParams: {
-        createBy: 'suanzhakuguan',
-      },
-      warehouseOptions: [
-        { label: '酸连轧成品库', value: '1988150099140866050' },
-        { label: '镀锌原料库', value: '1988150263284953089' },
-        { label: '脱脂原料库', value: '1988150545175736322' },
-        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...suanzhaConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zha/year.vue
+++ b/klp-ui/src/views/wms/report/zha/year.vue
@@ -9,6 +9,7 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { suanzhaConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'YearReport',
@@ -17,23 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [11, 120],
-      actionQueryParams: {
-        createBy: 'suanzhakuguan'
-      },
-      baseQueryParams: {
-        createBy: 'suanzhakuguan',
-      },
-      warehouseOptions: [
-        { label: '酸连轧成品库', value: '1988150099140866050' },
-        { label: '镀锌原料库', value: '1988150263284953089' },
-        { label: '脱脂原料库', value: '1988150545175736322' },
-        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-        { label: '技术部', value: '2019583656787259393' },
-        { label: '小钢卷库', value: '2019583325311414274' },
-        { label: '废品库', value: '2019583429955104769' },
-        { label: '退货库', value: '2019583137616310273' },
-      ],
+      ...suanzhaConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zha_.vue
+++ b/klp-ui/src/views/wms/report/zha_.vue
@@ -17,7 +17,7 @@
      return {
        actionTypes: [11, 120],
        actionQueryParams: {
-          updateBy: 'suanzhakuguan'
+          createBy: 'suanzhakuguan'
        },
      }
    }
--- a/klp-ui/src/views/wms/report/zinc/day.vue
+++ b/klp-ui/src/views/wms/report/zinc/day.vue
@@ -9,29 +9,16 @@

 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'

 export default {
-  name: 'LossReport',
+  name: 'DayReport',
  components: {
    DayTemplate,
  },
  data() {
    return {
-      actionTypes: [501, 120],
-      actionQueryParams: {
-        createBy: 'duxinkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'duxinkuguan',
-      },
-      warehouseOptions: [
-        { value: '1988150323162836993', label: '镀锌成品库' },
-        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
-        { value: '2019583656787259393', label: '技术部' },
-        { value: '2019583325311414274', label: '小钢卷库' },
-        { value: '2019583429955104769', label: '废品库' },
-        { value: '2019583137616310273', label: '退货库' },
-      ],
+      ...zincConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zinc/month.vue
+++ b/klp-ui/src/views/wms/report/zinc/month.vue
@@ -9,6 +9,7 @@

 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'MonthReport',
@@ -17,21 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [501, 120],
-      actionQueryParams: {
-        createBy: 'duxinkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'duxinkuguan',
-      },
-      warehouseOptions: [
-        { value: '1988150323162836993', label: '镀锌成品库' },
-        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
-        { value: '2019583656787259393', label: '技术部' },
-        { value: '2019583325311414274', label: '小钢卷库' },
-        { value: '2019583429955104769', label: '废品库' },
-        { value: '2019583137616310273', label: '退货库' },
-      ],
+      ...zincConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zinc/team.vue
+++ b/klp-ui/src/views/wms/report/zinc/team.vue
@@ -9,6 +9,7 @@

 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'

 export default {
  name: 'TeamReport',
@@ -17,21 +18,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [501, 120],
-      actionQueryParams: {
-        createBy: 'duxinkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'duxinkuguan',
-      },
-      warehouseOptions: [
-        { value: '1988150323162836993', label: '镀锌成品库' },
-        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
-        { value: '2019583656787259393', label: '技术部' },
-        { value: '2019583325311414274', label: '小钢卷库' },
-        { value: '2019583429955104769', label: '废品库' },
-        { value: '2019583137616310273', label: '退货库' },
-      ],
+      ...zincConfig,
    }
  }
 }
--- a/klp-ui/src/views/wms/report/zinc/year.vue
+++ b/klp-ui/src/views/wms/report/zinc/year.vue
@@ -9,6 +9,8 @@

 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+

 export default {
  name: 'YearReport',
@@ -17,21 +19,7 @@ export default {
  },
  data() {
    return {
-      actionTypes: [501, 120],
-      actionQueryParams: {
-        createBy: 'duxinkuguan'
-      },
-      baseQueryParams: {
-        createBy: 'duxinkuguan',
-      },
-      warehouseOptions: [
-        { value: '1988150323162836993', label: '镀锌成品库' },
-        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
-        { value: '2019583656787259393', label: '技术部' },
-        { value: '2019583325311414274', label: '小钢卷库' },
-        { value: '2019583429955104769', label: '废品库' },
-        { value: '2019583137616310273', label: '退货库' },
-      ],
+      ...zincConfig,
    }
  }
 }