loulijun2021
2023-01-04 ff345ebb3fcece2ebafc3333b895d9481bd9435e
1.列展示设置    功能基本实现,细节待优化
已修改4个文件
360 ■■■■■ 文件已修改
src/components/DndList/index.vue 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/TableColumnSettings/index.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/zzjg.vue 250 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/xtsz/bmgz.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/DndList/index.vue
@@ -2,30 +2,32 @@
  <div class="dndList">
    <div :style="{width:'100%'}" class="dndList-list">
      <div style="display: flex;justify-content: space-between;">
        <el-checkbox v-model="checkedAll" @change="checkedAllClick">列展示</el-checkbox>
        <el-checkbox v-model="checkedAll" @change="checkedAllChange">列展示</el-checkbox>
        <div style="cursor: pointer" :style="{color:$store.state.settings.theme}" @click="resetColumn">重置</div>
      </div>
      <el-checkbox-group v-model="checkedList">
      <el-checkbox-group v-model="checkedList" @change="checkedListChange">
        <draggable :set-data="setData" :list="list1" class="dragArea" animation="300" @end="draggableEnded">
          <div v-for="item in list1" :key="item.id" class="list-complete-item">
            <div style="display: flex">
              <div style="width: 20px;height: 20px;margin-right: 4px;cursor:move"><i class="el-icon-rank" /></div>
              <el-checkbox :label="item.name" class="list-complete-item-handle" />
              <el-checkbox :label="item.label" class="list-complete-item-handle" />
            </div>
            <div>
              <el-tooltip class="item" effect="dark" content="固定到左侧" placement="bottom">
                <i
                  style="transform:rotate(90deg);cursor:pointer;"
                  style="transform:rotate(90deg);cursor:pointer;font-weight: bolder"
                  class="el-icon-download"
                  @click="fixedToLeft(item.name)"
                  :style="{color:item.fixed==='left'?$store.state.settings.theme:''}"
                  @click="fixedToLeft(item.label)"
                />
              </el-tooltip>
              <el-divider direction="vertical" />
              <el-tooltip class="item" effect="dark" content="固定到右侧" placement="bottom">
                <i
                  style="transform:rotate(-90deg);cursor:pointer"
                  style="transform:rotate(-90deg);cursor:pointer;font-weight: bolder"
                  class="el-icon-download"
                  @click="fixedToRight(item.name)"
                  :style="{color:item.fixed==='right'?$store.state.settings.theme:''}"
                  @click="fixedToRight(item.label)"
                />
              </el-tooltip>
            </div>
@@ -51,12 +53,19 @@
        return []
      }
    }
  },
  data() {
    return {
      checkedList: ['楼李俊2'],
      checkedList: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 列展示值
      checkedListDefaultLabel: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 重置默认值label
      // checkedListDefaultFixed: this.list1.map(i => i.show ? i.label : '').filter(i => i !== ''), // 重置默认值fixed
      checkedAll: true
    }
  },
  created() {
  },
  mounted() {
  },
  methods: {
    setData(dataTransfer) {
@@ -64,20 +73,54 @@
      // Detail see : https://github.com/RubaXa/Sortable/issues/1012
      dataTransfer.setData('Text', '')
    },
    // 重置
    resetColumn() {
      console.log('resetColumn')
      this.checkedList = this.checkedListDefaultLabel
      this.list1.forEach((i, j) => {
        i.show = !!this.checkedListDefaultLabel.includes(i.label)
      })
      this.$emit('tableColumnUpdate', this.checkedListDefaultLabel)
    },
    checkedAllClick() {
      console.log('checkedAllClick')
    // 列展示
    checkedAllChange() {
      this.list1.forEach(i => {
        if (this.checkedAll) {
          i.show = true
          this.checkedList = this.list1.map(j => j.label)
        } else {
          i.show = false
          this.checkedList = []
        }
      })
      this.$emit('tableColumnUpdate', this.checkedList)
    },
    // 固定到左侧
    fixedToLeft(val) {
      console.log('fixedToLeft', val)
      this.list1.find(i => i.label === val).fixed = this.list1.find(i => i.label === val).fixed !== 'left' ? 'left' : false
      this.$emit('tableColumnUpdate', this.checkedList)
    },
    // 固定到右侧
    fixedToRight(val) {
      console.log('fixedToRight', val)
      this.list1.find(i => i.label === val).fixed = this.list1.find(i => i.label === val).fixed !== 'right' ? 'right' : false
      this.$emit('tableColumnUpdate', this.checkedList)
    },
    // 拖动结束事件
    draggableEnded({ to, from, item, clone, oldIndex, newIndex }) {
      console.log(to, from, item, clone, oldIndex, newIndex)
      // console.log(this.list1, 123456789)
      this.$emit('tableColumnUpdate', this.list1, true)// 传给爷爷  isCopyTrue:复值给爷爷
    },
    // 多选框值改变事件
    checkedListChange(val) {
      console.log(val, 1)
      this.checkedAll = val.length !== 0
      this.list1.forEach((i, j) => {
        i.show = !!val.includes(i.label)
      })
      this.$emit('tableColumnUpdate', val)
    }
  }
}
@@ -86,7 +129,7 @@
<style lang="scss" scoped>
.dndList {
  background: #fff;
  padding-bottom: 40px;
  //padding-bottom: 40px;
  &:after {
    content: "";
@@ -96,7 +139,7 @@
  .dndList-list {
    float: left;
    padding-bottom: 30px;
    //padding-bottom: 30px;
    &:first-of-type {
      margin-right: 2%;
src/components/TableColumnSettings/index.vue
@@ -5,8 +5,8 @@
      width="265"
      trigger="click"
    >
      <dnd-list :list1="list1" />
      <!--      <dnd-list :list1="list1" v-bind="$attrs" v-on="$listeners" />-->
      <dnd-list v-bind="$attrs" v-on="$listeners" />
      <el-button
        slot="reference"
        style="cursor: pointer;position: absolute;padding:0;top:11px;right: 60px;z-index: 99;"
@@ -24,26 +24,15 @@
export default {
  name: 'Index',
  components: { DndList },
  props: {
    list1: {
      type: Array,
      default() {
        return []
      }
    }
  },
  data() {
    return {
      // list1: [
      //   { id: 1, name: '预计完工时间' },
      //   { id: 2, name: '楼李俊2' },
      //   { id: 3, name: '楼李俊3' },
      //   { id: 4, name: '楼李俊4' }
      // ]
    }
  },
  methods: {}
  components: { DndList }
  // props: {
  //   list1: {
  //     type: Array,
  //     default() {
  //       return []
  //     }
  //   }
  // }
}
</script>
src/views/jcsz/zzjg.vue
@@ -53,9 +53,13 @@
        />
      </div>
      <div class="elTableDiv">
        <TableColumnSettings :list1="list1" />
        <TableColumnSettings
          :list1="tableColumnSettingsArray"
          @tableColumnUpdate="tableColumnUpdate"
        />
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :data="tableData"
          border
@@ -68,71 +72,87 @@
          @sort-change="sortChange"
        >
          <el-table-column
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="row[item.prop]==='D'">部门</div>
              <div v-else-if="row[item.prop]==='W'">车间</div>
              <div v-else-if="row[item.prop]===null">/</div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            prop="RowNum"-->
          <!--            width="50"-->
          <!--            label="序号"-->
          <!--            fixed-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="org_code"
            label="组织编码"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            prop="org_name"
            label="组织名称"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            prop="description"
            label="组织类型"
            min-width="110"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
              <!--              <div v-if="row.description==='F'">工厂</div>-->
              <div v-if="row.description==='D'">部门</div>
              <div v-if="row.description==='W'">车间</div>
              <!--              <div v-if="row.description==='K'">科室</div>-->
              <!--              <div v-if="row.description==='L'">生产线</div>-->
            </template>
          </el-table-column>
          <el-table-column
            prop="parentorg_name"
            label="上级单位"
            sortable="custom"
            show-tooltip-when-overflow
            min-widt="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.parentorg_name===null">/</div>
              <div v-else>{{ row.parentorg_name }}</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="160"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <!--          <el-table-column-->
          <!--            prop="org_code"-->
          <!--            label="组织编码"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="org_name"-->
          <!--            label="组织名称"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="description"-->
          <!--            label="组织类型"-->
          <!--            min-width="110"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              &lt;!&ndash;              <div v-if="row.description==='F'">工厂</div>&ndash;&gt;-->
          <!--              <div v-if="row.description==='D'">部门</div>-->
          <!--              <div v-if="row.description==='W'">车间</div>-->
          <!--              &lt;!&ndash;              <div v-if="row.description==='K'">科室</div>&ndash;&gt;-->
          <!--              &lt;!&ndash;              <div v-if="row.description==='L'">生产线</div>&ndash;&gt;-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="parentorg_name"-->
          <!--            label="上级单位"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-widt="110"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.parentorg_name===null">/</div>-->
          <!--              <div v-else>{{ row.parentorg_name }}</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="lm_user"-->
          <!--            label="创建人员"-->
          <!--            width="110"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="lm_date"-->
          <!--            label="创建时间"-->
          <!--            width="160"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            fixed="right"
            label="操作"
@@ -246,6 +266,7 @@
  components: {
    Pagination, TableColumnSettings
  },
  data() {
    // const validateName = (rule, value, callback) => {
    //   if (!value) {
@@ -288,14 +309,91 @@
        // { label: '科室', value: 'K' },
        // { label: '生产线', value: 'L' }
      ],
      list1: [
        { name: '预计开工时间', id: 1 },
        { name: '楼李俊1', id: 2 },
        { name: '楼李俊2', id: 3 },
        { name: '楼李俊3', id: 4 },
        { name: '楼李俊4', id: 5 }
      tableColumnSettingsArray: [
        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 隐藏列  show: false隐藏,true显示
        { minWidth: 25, width: 50, prop: 'RowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        {
          minWidth: 110,
          width: false,
          prop: 'org_code',
          label: '组织编码',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'org_name',
          label: '组织名称',
          id: 4,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'description',
          label: '组织类型',
          id: 5,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'parent_id',
          label: '上级id',
          id: 6,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'parentorg_code',
          label: '上级编码',
          id: 7,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'parentorg_name',
          label: '上级单位',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_user',
          label: '创建人员',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_date',
          label: '创建时间',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key
      total: 10,
      tableData: [],
@@ -363,6 +461,18 @@
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      console.log(val, isCopyTrue, 1111)
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }
      this.tableTimeStampKey = new Date().getTime()
      // this.$nextTick(() => {
      this.$refs.tableDataRef.doLayout()
      // })
    },
    async getOrganizationSearch() {
      const res = await OrganizationSearch(this.form)
      this.tableData = res.data
src/views/xtsz/bmgz.vue
@@ -98,7 +98,7 @@
          </el-table-column>
          <el-table-column
            prop="filingdate"
            label="提交日期"
            label="编码格式"
            show-tooltip-when-overflow
            sortable="custom"
          >
@@ -148,7 +148,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'编码格式'"
      :title="operation==='add'?'新增':'编辑格式'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
@@ -161,7 +161,7 @@
        <el-form-item label="固定字符" prop="prefix">
          <el-input v-model="dialogForm.prefix" style="width: 220px" />
        </el-form-item>
        <el-form-item prop="filingdate" label="提交日期">
        <el-form-item prop="filingdate" label="编码格式">
          <el-select
            v-model="dialogForm.filingdate"
            style="width: 220px"
@@ -248,7 +248,7 @@
        rightcode: '', // 功能编码
        rightname: '', // 功能名称
        prefix: '', // 固定字符
        filingdate: '', // 提交日期
        filingdate: '', // 编码格式
        incbit: '' // 自增位数
      },
      operation: '',