1.制造模型：工艺路线(新增、删除、预览)功能开发 2.制造模型：工序定义(查询) 功能开发 3.系统设置：编码规则(查询)功能开发4.修改实施部提出...

loulijun2021

2022-06-29 95af123562c0a05ae8955d53fcdcd4c8b310ced8

 src/views/jcsz/yhqd.vue

@@ -20,14 +20,16 @@
              <el-cascader
                ref="cascader"
                filterable
                popper-class="elCascader"
                :options="StuOrgArr"
                :props="defaultProps"
                @change="cascaderChange"
              />
            </el-form-item>
            <el-form-item label="工资类型" style=" display: flex;">
              <el-select v-model="form.wagetype" filterable style="width: 200px" placeholder="请选择">
              <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
                <el-option

                  v-for="item in wagetypeArr"
                  :key="item.value"
                  :label="item.label"
@@ -36,7 +38,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
              <el-select v-model="form.Enable" filterable style="width: 200px" placeholder="请选择">
              <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in EnableArr"
                  :key="item.value"
@@ -63,6 +65,7 @@
          :data="tableData"
          border
          stripe
          :height="tableHeight"
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
@@ -175,9 +178,10 @@

    <!--    用户清单新增、修改-->
    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :title="operation==='add'?'新增':'修改'"
      :visible.sync="dialogVisible"
      width="50%"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
@@ -195,6 +199,7 @@
        <el-form-item label="在职状态" prop="Enable">
          <el-select
            v-model="dialogForm.Enable"
            :popper-append-to-body="false"
            filterable
            style="width: 220px"
            placeholder="请选择"
@@ -207,34 +212,35 @@
            />
          </el-select>
        </el-form-item>
        <div style="display: flex">
          <el-form-item label="所属组织" prop="StuOrg" style="display: flex">
            <el-cascader
              ref="dialogCascader"
              key="cascaderKey"
              filterable
              :options="StuOrgArr"
              :props="defaultProps"
              style="width: 220px;"
              @change="dialogCascaderChange"
        <el-form-item label="所属组织" prop="StuOrg" style="display: flex;float: left">
          <el-cascader
            ref="dialogCascader"
            key="cascaderKey"
            filterable
            popper-class="elCascader"
            :options="StuOrgArr"
            :props="defaultProps"
            style="width: 220px;"
            @change="dialogCascaderChange"
          />
        </el-form-item>
        <el-form-item label="工资类型" prop="wagetype">
          <el-select
            v-model="dialogForm.wagetype"
            :popper-append-to-body="false"
            filterable
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in wagetypeArr"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-form-item>
          <el-form-item label="工资类型" prop="wagetype">
            <el-select
              v-model="dialogForm.wagetype"
              filterable
              style="width: 220px"
              placeholder="请选择"
            >
              <el-option
                v-for="item in wagetypeArr"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </div>
          </el-select>
        </el-form-item>

        <el-form-item label="联系方式">
          <el-input v-model="dialogForm.Mobile" style="width: 220px" />
        </el-form-item>
@@ -256,6 +262,7 @@
      :visible.sync="dialogVisibleRoles"
      width="50%"
      top="15vh"
      :close-on-click-modal="false"
      class="dialogVisibleRoles"
      @closed="handleCloseRoles"
      @close="handleCloseRoles"
@@ -389,8 +396,8 @@
        wagetype: ''
      },
      wagetypeArr: [
        { value: '1', label: '计件制' },
        { value: '2', label: '计时制' }
        { value: '2', label: '计件制' },
        { value: '1', label: '计时制' }
      ],
      operation: '',
      dialogFormRules: {
@@ -581,7 +588,7 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
      })
    },
@@ -739,12 +746,12 @@
            this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
              if (it.Code === checkedFatherCode) {
                console.log(it.Code, 9)
                console.log(this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 7)
                this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
              }
            })
            this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
              if (i === checkedFatherCode) {
                console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
                this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
              }
            })
          }
@@ -779,7 +786,7 @@
        } else { // 当父类由半叶变为全叶时
          this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
            if (i1.Code === checkedFatherCode) { // i1没找对
              console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
              this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
              temp.forEach(it => {
                this.dialogFormRoles.roleTreeSelectedArr.push({
                  Code: it.code,
@@ -842,12 +849,12 @@
            console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
            this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
              if (i === it.code) {
                console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 6664)
                this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
              }
            })
            this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
              if (i.Code === it.code) {
                console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
                this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1)
              }
            })
          }
@@ -877,11 +884,15 @@
  height: 30px;
  display: flex;
  align-items: center;
  border: 1px solid $main_color;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}
::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info{
::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
@@ -935,7 +946,7 @@

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

::v-deep .el-table .caret-wrapper {
@@ -1050,12 +1061,55 @@
  }
}

.body ::v-deep .el-divider{
.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}
::v-deep .el-form-item{

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select .el-input__inner:focus{
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected{
  color: $main_color;
}

::v-deep  .el-input__inner:focus {
  border-color: #42b983 !important;
}

//::v-deep   .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
//  border-color: #42b983 !important;
//}
</style>
<style lang="scss">
.elCascader {
  //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
  //  color: #42b983 ;
  //}
  .el-cascader-node.is-selectable.in-checked-path {
    color: #42b983;
  }

  .el-radio__input.is-checked .el-radio__inner {
    background-color: #42b983;
    border-color: #42b983;
  }
  .el-radio__input.is-checked .el-radio__inner:hover {
    border-color: #42b983;
  }
  .el-input__inner{
    border-color: #42b983 !important;
  }

}
</style>