1.解决两个账号登录，是否被挤掉的问题

loulijun2021

2022-10-29 e713b378b01d189f972cfb5b9eae749ee95a8b51

 src/views/jcsz/wldw.vue

@@ -1,23 +1,42 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
      <div style="height: 50px;">
    <div class="body" :style="{height:mainHeight+'px'}">

      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <div style="display: flex">
          <el-button
            icon="el-icon-refresh-right"
            @click="syncSeaveSearchPartner"
          >同步往来单位
          </el-button>
          <el-button icon="el-icon-download" @click="upload">导入</el-button>
        </div>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div style="display: flex;justify-content: space-around;width: 85%">
            <el-form-item label="单位编码" style=" display: flex;">
              <el-input v-model="form.CuntUnitCode" placeholder="请输入" style="width: calc(100%-30px)" />
          <div class="elForm">
            <el-form-item label-width="70px" label="单位编码" style=" display: flex;">
              <el-input v-model="form.CuntUnitCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="单位名称" style=" display: flex;">
              <el-input v-model="form.CuntUnitName" placeholder="请输入" style="width: calc(100%-30px)" />
              <el-input v-model="form.CuntUnitName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="单位属性" style=" display: flex;">
              <el-select v-model="form.UnitAttr" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select
                v-model="form.UnitAttr"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in UnitAttrArr"
                  :key="item.value"
@@ -27,27 +46,31 @@
              </el-select>
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.CreateUser" style="width: calc(100%-30px)" placeholder="请输入" />
              <el-input v-model="form.CreateUser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <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>
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
      </div>
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2">导入</el-button>
      </div>
      <!--      :style="{width: 100+'%',height:isCompatible?(tableHeight+'px'):'800px'}"-->
      <div style="display: flex;border: 1px solid #eee">

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
          :data="tableData"
          border
          class="tableFixed"
          :height="tableHeight+'px'"
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          :style="{width: 100+'%',height:tableHeight+'px'}"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
@@ -57,93 +80,121 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="code"
            label="单位编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="name"
            label="单位名称"
            show-overflow-tooltip
            sortable="custom"
            min-width="200px"
            min-width="160px"
            show-tooltip-when-overflow
          />
          <el-table-column
            label="单位属性"
            width="150"
            width="240"
          >
            <!--            sortable="custom"-->

            <el-table-column
              prop="mtype"
              width="120"
            >
              <template slot-scope="{row}">
                <div v-if="row.mtype==='WG'">外购供方</div>
                <div v-else>/</div>
              </template>
            </el-table-column>
            <el-table-column
              prop="btype"
              width="120"
            >
              <template slot-scope="{row}">
                <div v-if="row.btype==='WX'">外斜供方</div>
                <div v-else>/</div>
              </template>
            </el-table-column>
            <el-table-column
              prop="htype"
              width="120"
            >
              <template slot-scope="{row}">
            <template slot-scope="{row}">
              <div style="display: flex;justify-content: flex-start">
                <div v-if="row.mtype==='WG'" style="margin-right: 15px">外购供方</div>
                <div v-if="row.btype==='WX'" style="margin-right: 15px;">外协供方</div>
                <div v-if="row.htype==='KH'">客户</div>
                <div v-else>/</div>
              </template>
            </el-table-column>
            <!--            <template slot-scope="{row}">-->
            <!--              <div v-if="row.unitattribute==='WG'">外购</div>-->
            <!--              <div v-if="row.unitattribute==='WX'">外协</div>-->
            <!--              <div v-if="row.unitattribute==='KH'">客户</div>-->
            <!--            </template>-->
              </div>
            </template>
            <!--            <el-table-column-->
            <!--              prop="mtype"-->
            <!--              width="80"-->
            <!--            >-->
            <!--              <template slot-scope="{row}">-->
            <!--                <div v-if="row.mtype==='WG'">外购供方</div>-->
            <!--                <div v-else>/</div>-->
            <!--              </template>-->
            <!--            </el-table-column>-->
            <!--            <el-table-column-->
            <!--              prop="btype"-->
            <!--              width="80"-->
            <!--            >-->
            <!--              <template slot-scope="{row}">-->
            <!--                <div v-if="row.btype==='WX'">外协供方</div>-->
            <!--                <div v-else>/</div>-->
            <!--              </template>-->
            <!--            </el-table-column>-->
            <!--            <el-table-column-->
            <!--              prop="htype"-->
            <!--              width="80"-->
            <!--            >-->
            <!--              <template slot-scope="{row}">-->
            <!--                <div v-if="row.htype==='KH'">客户</div>-->
            <!--                <div v-else>/</div>-->
            <!--              </template>-->
            <!--            </el-table-column>-->
          </el-table-column>
          <el-table-column
            prop="conttacts"
            label="联系人"
            width="110"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.conttacts">{{ row.conttacts }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="conttphone"
            label="联系方式"
            width="160"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.conttphone">{{ row.conttphone }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="addr"
            min-width="160"
            label="补充描述"
            show-tooltip-when-overflow
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.addr">{{ row.addr }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            width="200"
            show-overflow-tooltip
            width="160"
          />
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i 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)" />
                </el-tooltip>
              </div>
            </template>
          </el-table-column>
@@ -151,38 +202,37 @@
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getCurrentUnitSearch"
      />
    </div>

    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">

        <el-form-item label="供方编码" prop="unitcode">
        <el-form-item label="单位编码" prop="unitcode">
          <el-input v-model="dialogForm.unitcode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
        <el-form-item label="供方名称" prop="unitname">
        <el-form-item label="单位名称" prop="unitname">
          <el-input v-model="dialogForm.unitname" style="width: 220px" />
        </el-form-item>
        <el-form-item style="width: 100%" label="供方属性" prop="checkboxIsSelected">
        <el-form-item style="width: 100%" label="单位属性" prop="checkboxIsSelected">
          <el-checkbox-group v-model="dialogForm.checkboxIsSelected" @change="checkboxGroupChange">
            <el-checkbox label="外购供方" />
            <el-checkbox label="外协供方" />
            <el-checkbox label="客户" />
            <el-checkbox key="WG" value="WG" label="外购供方" />
            <el-checkbox key="WX" value="WX" label="外协供方" />
            <el-checkbox key="KH" value="KH" label="客户" />
          </el-checkbox-group>
        </el-form-item>
        <el-form-item label="联系人" prop="person">
@@ -198,45 +248,53 @@
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>
          <el-button
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="dialogVisibleConfirm"
          >确 定</el-button>
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateCurrentUnit,
  AddUpdateOrganization,
  CurrentUnitSearch,
  DeleteOrganization,
  OrganizationSearch,
  PrentOrganization
  AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
import { SeaveSearchPartner } from '@/api/ErpSyncMes'
import ImportPicker from '@/components/ImportPicker'
import { validateCode } from '@/utils/global'
export default {
  name: 'Zzjg',
  name: 'WLDW',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    const validateName = (rule, value, callback) => {
    const validateMobile = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
        callback()
        // return callback(new Error('请输入电话号码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
        const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 长号
        const mobile2 = /^[0-9]{6}$/ // 短号
        if (mobile.test(value) || mobile2.test(value)) {
          callback()
          // return callback(new Error('电话号码不符合规则'))
        } else {
          return callback(new Error('电话号码不符合规则'))
          // callback()
        }
      }
    }
    return {
      isCompatible: false, // 是否兼容
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -247,7 +305,7 @@
        prop: 'lm_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 10 // 每页多少条
        rows: 20 // 每页多少条
      },
      UnitAttrArr: [
        { label: '外购供方', value: 'WG' },
@@ -274,16 +332,29 @@
      operation: '',
      dialogFormRules: {
        unitcode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        unitname: [
          { required: true, message: '请输入供方名称', trigger: ['blur', 'change'] }
        ],
        checkboxIsSelected: [
          { required: true, message: '请选择供方属性', trigger: ['blur', 'change'] }
        ],
        contact: [
          { required: false, validator: validateMobile, trigger: ['blur', 'change'] }
        ]
      }
      },
      title_value: '数据导入 / 往来单位',
      code: '4',
      shows: false

    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getCurrentUnitSearch()
      }
    }
  },
  created() {
@@ -314,6 +385,29 @@
      this.tableData = res.data
      this.total = res.count
    },
    // 同步往来单位
    async syncSeaveSearchPartner() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步往来单位，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
      const res = await SeaveSearchPartner()
      if (res.code === '200') {
        setTimeout(() => {
          this.getCurrentUnitSearch()
          loading.close()
          this.$message.success('同步成功！')
        }, 2000)
      } else {
        setTimeout(() => {
          loading.close()
          this.$message.error('同步失败！')
        }, 10000)
      }
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
@@ -341,7 +435,8 @@
    },
    // 复选框改变事件
    checkboxGroupChange(val) {
      console.log(val)
      this.dialogForm.checkboxIsSelected = val
      this.dialogForm.checkboxIsSelected = this.dialogForm.checkboxIsSelected.filter(item => item !== null)
    },
    // 新增按钮
    add(operation) {
@@ -353,25 +448,46 @@
      this.operation = operation
      this.dialogVisible = true

      this.dialogForm.id = row.id
      let mtype = null
      let btype = null
      let htype = null

      if (row.mtype === 'WG') {
        mtype = '外购供方'
      }
      if (row.btype === 'WX') {
        btype = '外协供方'
      }
      if (row.htype === 'KH') {
        htype = '客户'
      }

      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        this.dialogForm.checkboxIsSelected = [btype, htype, mtype]
        this.dialogForm.unitcode = row.code
        this.dialogForm.unitname = row.name
        this.dialogForm.person = row.conttacts
        this.dialogForm.contact = row.conttphone
        this.dialogForm.description = row.addr
      })
    },
    // 删除按钮
    async del(id) {
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        // DeleteOrganization({ orgid: id }).then(res => {
        //   if (res.code === '200') {
        //     this.$message.success('删除成功!')
        //     this.getCurrentUnitSearch()
        //   }
        // })
        DeleteCurrentUnit({ unitcode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getCurrentUnitSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
@@ -383,6 +499,7 @@
      this.dialogForm.person = ''
      this.dialogForm.contact = ''
      this.dialogForm.description = ''
      this.dialogForm.checkboxIsSelected = []
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -393,6 +510,7 @@
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.$store.state.app.buttonIsDisabled = true
          let mtypecode = null // 外购编码
          let btypecode = null // 外协编码
          let htypecode = null // 客户编码
@@ -417,16 +535,17 @@
            contact: this.dialogForm.contact,
            description: this.dialogForm.description,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
            // Operator: getCookie('admin')
          }
          console.log(data)

          AddUpdateCurrentUnit(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.dialogVisible = false
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.getCurrentUnitSearch()
              this.$store.state.app.buttonIsDisabled = false
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
              this.$store.state.app.buttonIsDisabled = false
            }
          })
        }
@@ -435,130 +554,131 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.tableHeight = this.mainHeight - 100
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 195
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.$refs.tableDataRef.doLayout()
      })
    },

    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    },

    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    }
  }
}
</script>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}

::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}

::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}

.footerButton {
  display: flex;
  justify-content: end;
}

::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-button--default:hover {
  color: #606266;
::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

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

::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}

::v-deep .el-input__inner {
  height: 30px;
  line-height:30px;

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  //float: right;
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}

::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}

.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
  justify-content: space-between;
}

.el-icon-share {
  color: $main_color;
  cursor: pointer;
::v-deep .el-table::before {
  height: 0;
}

.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
}

::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}
.tableFixed{
  ::v-deep .el-table__fixed-right{
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{
    height: 100% !important;
  }
}
</style>
<style>

::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
.el-table .custom-row {
  background: #f8f8fa;
}
</style>