Merge remote-tracking branch 'origin/master'

xing

2023-02-26 ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0

 src/views/userManage/orgManage.vue

@@ -20,19 +20,13 @@
          </el-tree>
        </div>
      </div>
      <div style="width: 80%;
        width: 80%;
        height: 100%;
        border-radius: 5px;
        padding: 1%;
        overflow: auto;">
        <div style="display:flex;justify-content:space-between;align-items: center">
          <el-breadcrumb separator="/">
      <div class="right_menu subpage_Div">
        <div style="display:flex;justify-content:right;align-items: center;padding-bottom: 14px">
          <el-breadcrumb separator="/" style="display: none">
            <el-breadcrumb-item :to="{ path: '/' }">{{
            $t('dataManage.dictionaryManageObj.particulars')
          }}</el-breadcrumb-item>
          </el-breadcrumb>

          <div>
            <el-button
              v-if="menuStatus.insert"
@@ -76,11 +70,10 @@
            >{{$t('operatManage.menuSetObj.moveDown')}}</el-button>
          </div>
        </div>
        <div class="dividing-line" style="margin-top: 20px"></div>
        <div class="dividing-line"></div>
        <div class="form_box">
<!--          <el-divider class="eldivider" />-->
          <el-form
            style="margin-top: 25px;  position: relative;"
          <el-form label-width="130px"
            :model="itemdetail"
            ref="itemdetail"
            :rules="rules"
@@ -206,21 +199,20 @@
                style="max-width: 400px;"
              ></el-input>
            </el-form-item>
            <div
              class="btnBox"
              v-if="menuStatus.update"
            >
              <el-button
                type="primary"
                size="small"
                @click="updDep('itemdetail')"
              >{{ $t('common.submit') }}</el-button>
              <el-button
                size="small"
                @click="reset('itemdetail')"
              >{{
                $t('common.cancel')
              }}</el-button>
            <div v-if="menuStatus.update">
              <el-form-item>
                <el-button
                    type="primary"
                    size="small"
                    @click="updDep('itemdetail')"
                >{{ $t('common.submit') }}</el-button>
                <el-button
                    size="small"
                    @click="reset('itemdetail')"
                >{{
                    $t('common.cancel')
                  }}</el-button>
              </el-form-item>
            </div>
          </el-form>
        </div>
@@ -229,7 +221,6 @@
    </div>

    <el-dialog

      :title="$t('common.append')"
      :visible.sync="dialogFormVisible"
    >
@@ -893,27 +884,31 @@
  }
  .left_Tree {
    width: 15%;
    height: 91%;

    //height: 94%;
    height: 100%;
    border-radius: 5px;
    padding: 1%;
    overflow-y: auto;
    border-right: 1px solid  #dcdfe6;
  }
  .right_menu {
    width: 80%;
    height: 91%;

    //height: 91%;
    height: 98%;
    border-radius: 5px;
    padding: 1%;
    overflow: auto;

    .el-input {
      width: 400px;
    .form_box {
      box-sizing: border-box;
      padding-top: 22px;
      width: 100%;
      .el-input {
        width: 400px;
      }
    }
  }
}
.btnBox{
  margin-left: 150px;
  //position: absolute;
  //bottom: 0;
  //right: 0;