1.生产入库无源单提交测试OK 生产入库开发完成2.MES工单 流程单新增工单编码二维码

loulijun2021

2023-06-07 9edc20f04ae1cdc847a2f709831b8d0e6f4f0eda

 src/views/basicSettings/roleList.vue

@@ -63,8 +63,13 @@
      </div>

      <div class="elTableDiv">
        <TableColumnSettings
          :list1="tableColumnSettingsArray"
          @tableColumnUpdate="tableColumnUpdate"
        />
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          :data="tableData"
          class="tableFixed"
          border
@@ -77,111 +82,50 @@
          @sort-change="sortChange"
        >

          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="role_code"
            label="角色编码"
            sortable="custom"
            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
            min-width="110"
          />
          <el-table-column
            prop="role_name"
            label="角色名称"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            prop="roletype_name"
            label="角色类型"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            prop="description"
            min-width="160"
            label="角色描述"
            sortable="custom"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="row.description">{{ row.description }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
            width="110"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.lm_user===null">/</div>
              <div v-else>{{ row.lm_user }}</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_date"
            label="创建时间"
            show-tooltip-when-overflow
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="is_user"
            label="关联用户"
            show-tooltip-when-overflow
            width="120"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <i
                v-if="row.is_user==='Y'"
                class="el-icon-user-solid"
                style=" cursor: pointer"
                :style="{color:styleObject}"
                @click="userClick(row)"
              />
              <i
                v-if="row.is_user==='N'"
                class="el-icon-user-solid"
                style="color: rgb(180 ,181, 185);cursor: pointer"
                @click="userClick(row)"
              />
            </template>
          </el-table-column>
          <el-table-column
            prop="is_right"
            label="分配权限"
            sortable="custom"
            show-tooltip-when-overflow
            width="120"
          >
            <template slot-scope="{row}">
              <i
                v-if="row.is_right==='Y'"
                :style="{color:styleObject}"
                class="el-icon-share"
                @click="rightClick(row)"
              />
              <i
                v-if="row.is_right==='N'"
                class="el-icon-share"
                style="color: rgb(180 ,181, 185)"
                @click="rightClick(row)"
              />
              <div v-if="!row[item.prop]">/</div>
              <div v-else-if="item.prop==='is_user'">
                <i
                  v-if="row[item.prop]==='Y'"
                  class="el-icon-user-solid"
                  style=" cursor: pointer"
                  :style="{color:styleObject}"
                  @click="userClick(row)"
                />
                <i
                  v-if="row[item.prop]==='N'"
                  class="el-icon-user-solid"
                  style="color: rgb(180 ,181, 185);cursor: pointer"
                  @click="userClick(row)"
                />
              </div>
              <div v-else-if="item.prop==='is_right'">
                <i
                  v-if="row[item.prop]==='Y'"
                  :style="{color:styleObject}"
                  class="el-icon-share"
                  @click="rightClick(row)"
                />
                <i
                  v-if="row[item.prop]==='N'"
                  class="el-icon-share"
                  style="color: rgb(180 ,181, 185)"
                  @click="rightClick(row)"
                />
              </div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>
          <el-table-column
@@ -452,7 +396,7 @@
        </el-button>
      </div>
      <el-table
        ref="multipleTable"
        ref="multipleTableRef"
        :data="dialogFormUserTable"
        border
        :row-class-name="tableRowClassName"
@@ -668,11 +612,12 @@
import clearAllChildren, { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'JSQD',
  components: {
    Pagination, ImportPicker
    Pagination, ImportPicker, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  data() {
@@ -701,6 +646,103 @@
        order: 'desc'
      },
      tableData: [],

      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: 'role_code',
          label: '角色编码',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'role_name',
          label: '角色名称',
          id: 4,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'roletype_code',
          label: '角色类型编码',
          id: 5,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'roletype_name',
          label: '角色类型',
          id: 6,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 330,
          width: false,
          prop: 'description',
          label: '角色描述',
          id: 7,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'is_user',
          label: '关联用户',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'is_right',
          label: '分配权限',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_user',
          label: '创建人员',
          id: 10,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_date',
          label: '创建时间',
          id: 11,
          show: true,
          fixed: false,
          sortable: true
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key

      dialogVisible: false,
      dialogForm: {
        RoleId: '',
@@ -800,6 +842,15 @@
    this.getHeight()
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }

      this.tableTimeStampKey = new Date().getTime()

      this.$refs.tableDataRef.doLayout()
    },
    handleRequest() {
      this.getRoleSearch().then(res => {
        if (res.code === '200') {
@@ -1056,7 +1107,7 @@
    },

    /* 关联用户模块*/
    async userClick(row) {
    userClick(row) {
      if (row.role_code === 'S001') {
        return this.$message.info('此角色无法操作！')
      }
@@ -1070,29 +1121,31 @@

      this.userForm.roleName = row.role_name
      this.dialogFormUser.rolecode = row.role_code
      const res = await this.getRoleAssociationUser()

      if (res.code === '200') {
        setTimeout(() => {
          loading.close()
          this.userDialogVisible = true
          this.$nextTick(() => {
            this.$refs.multipleTable.doLayout()
      this.getRoleAssociationUser().then(res => {
        if (res.code === '200') {
          setTimeout(() => {
            loading.close()

            this.$nextTick(() => {
              this.$refs.multipleTableRef.doLayout()
            })
          })
        }, 1000)
      } else {
        loading.close()
      }
        } else {
          loading.close()
        }
      })
    },
    // 获取角色清单关联用户
    async getRoleAssociationUser() {
      const res = await RoleAssociationUser(this.dialogFormUser)
      this.dialogFormUserTable = res.data
      this.dialogFormUserTableLength = res.count
      this.userDialogVisible = true
      this.$nextTick(() => {
        this.dialogFormUserTable.forEach((item, index) => {
          if (item.flag === 'Y') {
            this.$refs.multipleTable.toggleRowSelection(this.dialogFormUserTable[index], true)
            this.$refs.multipleTableRef.toggleRowSelection(this.dialogFormUserTable[index], true)
          }
        })
      })
@@ -1139,7 +1192,7 @@
      this.dialogFormUser.orgcode = ''
      this.dialogFormUser.isrole = ''
      this.$refs.dialogCascaderUser.checkedValue = ''
      this.$refs.multipleTable.clearSelection()
      this.$refs.multipleTableRef.clearSelection()
    },
    // 关联用户对话框关闭
    userDialogVisibleCancel() {