生产调度变更记录功能

zouyu

2024-03-05 d896d25a2bee6dc9496f102035b2d68d17f3de65

 src/views/common/ztt-table.vue

@@ -182,6 +182,7 @@
          v-if="options.multiSelect && !isEdit"
          style="width: 55px;"
          :selectable="selectHandle"

        >
        </el-table-column>
        <!--单选框-->
@@ -508,9 +509,9 @@
              <div class="el-upload__tip" slot="tip" >
                只能上传xlsx/xls文件，且不超过10M<el-button
                  type="text"
                  style="font-size:12px;"
                  @click="downDataTemplate(uploadInfo.fileName)"   
                  v-if="uploadInfo.Download"
                  style="font-size:14px;text-decoration: underline;"
                  @click="downDataTemplate(uploadInfo.fileName)"
                  v-if="uploadInfo.download"
                  >下载模板</el-button
                >
              </div>
@@ -567,6 +568,13 @@
      default: ()=>{
        return 'id'
      }
    },
    //需要合并的字段集合
    mergeSpanArr: {
        type: Array,
        default: ()=>{
            return []
        }
    },
    toolbarMaxLength: {
      type: Number,
@@ -928,22 +936,41 @@
    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      if (this.options.tableCellMerge) {
        let result = ''
        this.$emit(
          'objectSpanMethod',
          row,
          column,
          rowIndex,
          columnIndex,
          (val) => {
            if (val) {
              result = val
        const propName = column.property
        if (propName) {
            if(this.mergeSpanArr.includes(propName)){
                if (rowIndex > 0 && row[propName] === this.tableData[rowIndex - 1][propName]) {
                    return { rowspan: 0, colspan: 0 };
                } else {
                    let rowspan = 1;
                    for (let i = rowIndex + 1; i < this.tableData.length; i++) {
                        if (this.tableData[i][propName] === row[propName]) {
                            rowspan++;
                        } else {
                            break;
                        }
                    }
                    return { rowspan: rowspan, colspan: 1 };
                }
            }
          }
        )
        if (result) {
          return result
        }
        // let result = ''
        // this.$emit(
        //   'objectSpanMethod',
        //   row,
        //   column,
        //   rowIndex,
        //   columnIndex,
        //   (val) => {
        //     console.log(val);
        //     if (val) {
        //       result = val
        //     }
        //   }
        // )
        // if (result) {
        //   return result
        // }
      }
    },
    getDataList(selectedId) {