1.存货档案修改

loulijun2021

2023-02-14 b46bc2dba51a3885a68e4c58316b41a31ea16bb2

 src/views/zzmx/chda.vue

@@ -4,26 +4,29 @@

      <div class="bodyTopButtonGroup" style="justify-content: space-between;">

        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-office-building" @click="office">单位</el-button>-->
        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <!--        <el-button v-waves type="primary" icon="el-icon-office-building" @click="office">单位</el-button>-->
        <div style="display: flex">
          <el-button
            v-waves
            icon="el-icon-refresh-right"
            @click="syncSeaveSearchUnit"
          >同步计量单位
          </el-button>
          <el-button
            v-waves
            icon="el-icon-refresh-right"
            @click="syncInventoryFileSelect"
          >同步存货档案
          </el-button>
          <el-button
            v-waves
            icon="el-icon-refresh-right"
            @click="syncStockTypeSelect"
          >同步存货类型
          </el-button>
        </div>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
        <!--        <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
@@ -32,10 +35,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="物料编码" style=" display: flex;">
            <el-form-item label="物料编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="物料名称" style=" display: flex;">
@@ -78,7 +81,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="所属仓库" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="所属仓库" style=" display: flex;">
              <el-select
                v-model="form.storehousecode"
                filterable
@@ -96,9 +99,12 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
@@ -147,6 +153,7 @@
          />
          <el-table-column
            prop="partcode"
            show-tooltip-when-overflow
            label="物料编码"
            min-width="160"
            sortable="custom"
@@ -154,6 +161,7 @@
          <el-table-column
            prop="partname"
            min-width="160"
            show-tooltip-when-overflow
            label="物料名称"
            sortable="custom"
          />
@@ -173,12 +181,14 @@
            prop="uom_name"
            label="单位"
            width="75"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="stocktypename"
            label="存货类型"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <!--          <el-table-column-->
@@ -189,6 +199,7 @@
          <el-table-column
            prop="stck_name"
            label="仓库名称"
            show-tooltip-when-overflow
            sortable="custom"
            min-width="110"
          >
@@ -201,6 +212,7 @@
            prop="maxqty"
            label="库存上限"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -212,6 +224,7 @@
            prop="minqty"
            label="库存下限"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -221,6 +234,7 @@
          </el-table-column>
          <el-table-column
            prop="lm_user"
            show-tooltip-when-overflow
            label="创建人员"
            sortable="custom"
            width="110"
@@ -228,18 +242,30 @@
          <el-table-column
            prop="lm_date"
            label="创建时间"
            show-tooltip-when-overflow
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="工艺路线"
            width="80"
            show-tooltip-when-overflow
            prop="proute_id"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
                <i v-if="row.proute_id==='N'" style="color:rgb(180 ,181, 185)" class="el-icon-share" @click="routeClick(row)" />
                <i
                  v-if="row.proute_id==='Y'"
                  :style="{color:$store.state.settings.theme}"
                  class="el-icon-share"
                  @click="routeClick(row)"
                />
                <i
                  v-if="row.proute_id==='N'"
                  style="color:rgb(180 ,181, 185)"
                  class="el-icon-share"
                  @click="routeClick(row)"
                />
              </div>
            </template>
          </el-table-column>
@@ -251,10 +277,14 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                  <i
                    :style="{color:$store.state.settings.theme}"
                    class="el-icon-edit-outline"
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" @click="del(row)" />
                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
                </el-tooltip>
              </div>
            </template>
@@ -276,6 +306,7 @@

    <!--新增编辑对话框-->
    <el-dialog
      v-el-drag-dialog
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
@@ -284,7 +315,17 @@
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
      <div>
        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 20px" />基础信息：
      </div>
      <el-form
        ref="dialogForm"
        inline
        :rules="dialogFormRules"
        :model="dialogForm"
        label-width="80px"
        style="padding: 0 80px"
      >
        <el-form-item label="物料编码" prop="materialcode">
          <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
@@ -366,14 +407,96 @@
        <el-form-item label="最大库存" prop="maxstockqty">
          <el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
          <el-form-item label="最小库存" prop="minstockqty" style="margin-left: 10px">
            <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
            <el-input
              v-model="dialogForm.minstockqty"
              oninput="value=value.replace(/[^0-9]/g,'')"
              style="width: 200px"
            />
          </el-form-item>
        </el-form-item>
      </el-form>

      <el-collapse>
        <el-collapse-item title="一致性 Consistency" name="1">
          <template slot="title">
            <div>
              <i
                class="el-icon-s-operation"
                :style="{color:$store.state.settings.theme}"
                style="margin: -20px 10px 20px 20px"
              />高级设置：
            </div>
          </template>
          <div style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between">
            <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
              <div>
                <el-tooltip
                  class="item"
                  effect="dark"
                  content=""
                  placement="top"
                >
                  <div slot="content" style="width: 300px">启用管理后库存数量会按标签分开显示，需要做采购到货才能入库，且生产发料需要扫码标签进行发料，不启用批次管理的不需要采购到货，可以直接选择物料采购入库，且入库后会合并显示该物料的库存，生产发料则按库位进行出库。</div>
                  <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
                </el-tooltip>
              </div>

              <div style="margin: 0 3px">批次管理：</div>
              <el-switch
                v-model="isBatchNo"
              />
            </div>
            <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
              <div style="margin: 0 3px">先进先出：</div>
              <el-switch
                v-model="isFifo"
              />
            </div>
            <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
              <div>
                <el-tooltip
                  class="item"
                  effect="dark"
                  content=""
                  placement="top"
                >
                  <div slot="content" style="width: 300px">开启后该物料必须做入厂检验或质量判断合格后才能做入厂反则该物料质量状态为待检状态是不允许入厂的。</div>
                  <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
                </el-tooltip>
              </div>

              <div style="margin: 0 3px">入厂检验：</div>
              <el-switch
                v-model="isInCheck"
              />
            </div>
            <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
              <div>
                <el-tooltip
                  class="item"
                  effect="dark"
                  content=""
                  placement="top"
                >
                  <div slot="content" style="width: 300px">开启后该物料必须做出厂检验或质量判断合格后才能做出厂，反则该物料质量状态为待检状态是不允许出厂的。</div>
                  <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
                </el-tooltip>
              </div>

              <div style="margin: 0 3px">出厂检验：</div>
              <el-switch
                v-model="isOutCheck"
              />
            </div>
          </div>
        </el-collapse-item>
      </el-collapse>
      <!--      </div>-->
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
@@ -385,6 +508,7 @@

    <!--    单位按钮对话框-->
    <el-dialog
      v-el-drag-dialog
      :close-on-click-modal="false"
      title="单位设置"
      :visible.sync="officeDialogVisible"
@@ -394,8 +518,8 @@
      @close="handleCloseOffice"
    >
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addOffice">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>-->
        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addOffice">新增</el-button>
        <!--        <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>-->
      </div>
      <el-table
        :data="officeTableData"
@@ -417,6 +541,7 @@
        />
        <el-table-column
          prop="code"
          show-tooltip-when-overflow
          label="类型编码"
          sortable="custom"
        >
@@ -428,6 +553,7 @@
        <el-table-column
          prop="name"
          label="类型名称"
          show-tooltip-when-overflow
          sortable="custom"
        >
          <template slot-scope="{row}">
@@ -438,6 +564,7 @@
        <el-table-column
          prop="digdect"
          label="小数位数"
          show-tooltip-when-overflow
          sortable="custom"
        >
          <template slot-scope="{row}">
@@ -454,6 +581,7 @@
        <el-table-column
          prop="r_ule"
          label="取整规则"
          show-tooltip-when-overflow
          sortable="custom"
        >

@@ -482,9 +610,9 @@
        <el-table-column label="操作">
          <template slot-scope="{row}">
            <div class="operationClass">
              <el-button v-if="row.isVisible===0" type="text" @click="delOffice(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="saveOffice(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="cancelOffice(row)">取消</el-button>
              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delOffice(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveOffice(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelOffice(row)">取消</el-button>
            </div>
          </template>
        </el-table-column>
@@ -501,56 +629,71 @@
      />
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="officeDialogVisibleCancel">返回</el-button>
          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">确 定</el-button>-->
          <el-button v-waves @click="officeDialogVisibleCancel">返回</el-button>
          <!--          <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>

    <!--    工艺路线对话框-->
    <el-dialog
      v-el-drag-dialog
      :close-on-click-modal="false"
      title="关联工艺路线"
      :visible.sync="dialogVisibleRoute"
      width="800px"
      top="10vh"
      top="5vh"
      :fullscreen="isIpad"
      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
    >
      <div>
        <i class="el-icon-s-comment" style="color:#42b983;" /> 产品名称：{{ dialogFormRoute.projectName }}
        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 产品名称：{{
          dialogFormRoute.projectName
        }}
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工艺路线集合
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工艺路线集合
      </div>

      <div class="myCheckboxGroup">
        <div
          v-for="item in dialogFormRoute.routeOperationArr"
          :key="item.code"
          :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
          :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
          class="myCheckbox"
          @click="myCheckboxClick(item)"
        >
          <input
            class="myCheckboxInput"
            type="checkbox"
            :value="item.code"
            :name="item.name"
            :style="{color:item.isSelected2?'#42b983':'#fff'}"
            @click="myCheckboxInputClick(item)"
          >{{ item.name }}
          <!--          <input-->
          <!--            class="myCheckboxInput"-->
          <!--            type="checkbox"-->
          <!--            :value="item.code"-->
          <!--            :name="item.name"-->
          <!--            :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
          <!--            @click="myCheckboxInputClick(item)"-->
          <!--          >{{ item.name }}-->
          <!--            父子点击事件不影响-->
          <!--            onClick="event.cancelBubble = true"-->
          <el-checkbox
            :key="item.code"
            v-model="item.isSelected2"
            class="myCheckboxInput"
            :value="item.code"
            :name="item.name"
            :label="item.name"
            :checked="item.isSelected2"
            @change="myCheckboxInputClick(item)"
          />
          <div class="myCheckboxInputLabel">{{ item.name }}</div>

        </div>
      </div>

      <el-divider />
      <div>
        <i class="el-icon-s-operation" style="color:#42b983;" /> 默认工艺路线
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
@@ -570,7 +713,7 @@
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工序列表
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工序列表
      </div>
      <div style="overflow-y: scroll">
        <el-table
@@ -591,28 +734,38 @@
          />
          <el-table-column
            prop="stepcode"
            show-tooltip-when-overflow
            label="工序编码"
          />
          <el-table-column
            prop="stepname"
            label="工序名称"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="enable"
            label="启用状态"
            show-tooltip-when-overflow
            fixed="right"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />是</div>
              <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />否</div>
              <div v-if="row.enable==='Y'">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                是
              </div>
              <div v-if="row.enable==='N'">
                <i class="el-icon-info" style="margin-right: 2px" />
                否
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="routeDialogVisibleCancel">取 消</el-button>
          <el-button v-waves @click="routeDialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
@@ -640,12 +793,15 @@
import $ from 'jquery'
import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

export default {
  name: 'CHDA',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
@@ -681,8 +837,8 @@
        warehousecode: '', // 所属仓库编码
        stocktypecode: '', // 存货类型编码
        materialtypecode: '', // 物料类型编码
        minstockqty: '', // 最小库存
        maxstockqty: '', // 最大库存
        minstockqty: null, // 最小库存
        maxstockqty: null, // 最大库存
        OperType: '' // 操作类型
      },
      uomArr: [], // 单位数组编码
@@ -741,7 +897,11 @@
      },
      defaultroute_code: '', // 默认工艺路线选中值
      defaultroute_codeArr: '', // 默认工艺路线数组
      projectTableData: []// 设备列表
      projectTableData: [], // 设备列表
      isBatchNo: false, // 是否批次管理
      isFifo: false, // 是否先进先出
      isInCheck: false, // 是否入库检验
      isOutCheck: false// 是否出厂检验
    }
  },
  created() {
@@ -787,7 +947,7 @@
      }
    },
    // 同步存货档案
    async  syncInventoryFileSelect() {
    async syncInventoryFileSelect() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步存货档案，请稍等...',
@@ -901,7 +1061,7 @@
      this.getuomSelect()
    },
    // 修改按钮
    async   edit(operation, row) {
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      // await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
@@ -914,8 +1074,12 @@
        this.dialogForm.warehousecode = row.stck_code
        this.dialogForm.stocktypecode = row.stocktypecode
        this.dialogForm.materialtypecode = row.materialtypecode
        this.dialogForm.minstockqty = row.maxqty
        this.dialogForm.maxstockqty = row.minqty
        this.dialogForm.minstockqty = row.minqty
        this.dialogForm.maxstockqty = row.maxqty
        this.isBatchNo = row.is_batchno === 'Y'
        this.isFifo = row.is_fifo === 'Y'
        this.isInCheck = row.is_incheck === 'Y'
        this.isOutCheck = row.is_outcheck === 'Y'
      })
      await this.getuomSelect()
    },
@@ -950,6 +1114,10 @@
      this.dialogForm.materialtypecode = ''
      this.dialogForm.minstockqty = ''
      this.dialogForm.maxstockqty = ''
      this.isBatchNo = false
      this.isFifo = false
      this.isInCheck = false
      this.isOutCheck = false
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -958,10 +1126,7 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      if (this.defaultroute_codeArr.length > 0 && this.defaultroute_code === '') {
        return this.$message.info('默认工艺路线不能为空！')
      }

      console.log(this.dialogForm.minstockqty, 1)
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.$store.state.app.buttonIsDisabled = true
@@ -974,10 +1139,15 @@
            warehousecode: this.dialogForm.warehousecode,
            stocktypecode: this.dialogForm.stocktypecode,
            materialtypecode: this.dialogForm.materialtypecode,
            minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
            maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
            minstockqty: this.dialogForm.minstockqty ? parseFloat(this.dialogForm.minstockqty) : 0,
            maxstockqty: this.dialogForm.maxstockqty ? parseFloat(this.dialogForm.maxstockqty) : 0,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            is_batchno: this.isBatchNo ? 'Y' : 'N',
            is_fifo: this.isFifo ? 'Y' : 'N',
            is_incheck: this.isInCheck ? 'Y' : 'N',
            is_outcheck: this.isOutCheck ? 'Y' : 'N'
          }
          console.log(data, 111)
          AddUpdateInventoryFile(data).then(res => {
            if (res.code === '200') {
              this.dialogVisible = false
@@ -1071,8 +1241,8 @@
    },
    // 确定
    async routeDialogVisibleConfirm() {
      const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      if (this.defaultroute_code === '' && temp.length > 0) {
      console.log(this.defaultroute_code)
      if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
        return this.$message.info('默认工艺路线不能为空！')
      }

@@ -1103,8 +1273,8 @@
    },
    // 小盒子点击事件
    myCheckboxInputClick(val) {
      console.log(val, 2)
      val.isSelected2 = !val.isSelected2
      // console.log(val, 2)
      val.isSelected2 = !!val.isSelected2

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        if (val.code === item.code) {
@@ -1250,10 +1420,19 @@
      margin: 10px 30px 0 0;
      border-radius: 5px;
      cursor: default;
      position: relative;

      .myCheckboxInput {
        margin: 1px 5px 0 0;
        cursor: pointer;
      }

      .myCheckboxInputLabel {
        position: absolute;
        left: 29px;
        padding: 5px;
        top: 6px;
        color: transparent;
      }

    }
@@ -1296,7 +1475,7 @@
  }
}

.defaultroute_code ::v-deep .el-input__suffix-inner{
.defaultroute_code ::v-deep .el-input__suffix-inner {
  display: flex;
  align-items: center;
  justify-content: center;
@@ -1307,11 +1486,12 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{

.el-icon-edit-outline {
  margin-right: 15px;
}

@@ -1338,7 +1518,8 @@
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
  //padding: 20px 100px !important;
  padding: 20px 20px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
@@ -1372,8 +1553,8 @@
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
@@ -1389,26 +1570,30 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}
.tableFixed{
  ::v-deep .el-table__fixed-right{

.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}
</style>
<style>
.osloading{
.osloading {
  font-size: 26px !important;
}

.el-loading-text{
.el-loading-text {
  font-size: 26px !important;
}

.el-table .custom-row {
  background: #f8f8fa;
}