1.连接自动打印,2.修改bug

loulijun2021

2022-07-15 869f6c069e86c2ff90393c1441854a6f05989481

 src/views/jcsz/yhqd.vue

@@ -23,12 +23,19 @@
                popper-class="elCascader"
                :options="StuOrgArr"
                :props="defaultProps"
                @focus="getUserOrganization"
                @change="cascaderChange"
              />
              <!--              @focus="getUserOrganization"-->

            </el-form-item>
            <el-form-item label="工资类型" style=" display: flex;">
              <el-select v-model="form.wagetype" :popper-append-to-body="false" 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"
@@ -38,7 +45,13 @@
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
              <el-select v-model="form.Enable" :popper-append-to-body="false" 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"
@@ -58,7 +71,7 @@
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -626,7 +639,7 @@
  },
  created() {
    this.getUserSearch()
    // this.getUserOrganization()
    this.getUserOrganization()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
@@ -645,7 +658,7 @@
      this.StuOrgArr = clearAllChildren(res)
    },
    // 获取所属组织对话框
    async  getUserOrganization2() {
    async getUserOrganization2() {
      const { data: res } = await UserOrganization()
      this.StuOrgArr2 = clearAllChildren(res)
    },
@@ -688,7 +701,7 @@
      this.dialogForm.StuOrg = val[val.length - 1]
    },
    // 获取下拉生产班组
    async  getMesOrderStepReportSelectUserGroup() {
    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      this.usergroupArr = res
    },
@@ -926,7 +939,8 @@
                  if (i.Code === checkedFatherCode) {
                    this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
                      if (i1 === a[0]) {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 当子code与现在的code相同时执行
                        // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 当子code与现在的code相同时执行
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
                      } else {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //当子code与现在的code不相同时执行
                      }
@@ -1113,7 +1127,7 @@
      this.getUserGroupSearch()
    },
    // 获取生产班组列表
    async  getUserGroupSearch() {
    async getUserGroupSearch() {
      const res = await UserGroupSearch(this.formWorking)
      this.workingTableData = res.data
      this.workingTableDataLength = res.count
@@ -1146,7 +1160,7 @@
      })
    },
    // 保存
    async  saveWorking(row) {
    async saveWorking(row) {
      if (row.group_code.trim().length < 1) {
        return this.$message.info('班组编码不能为空！')
      }
@@ -1194,6 +1208,7 @@
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}
@@ -1236,7 +1251,7 @@
  padding: 20px 100px !important;
}

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

@@ -1385,15 +1400,15 @@
  border-color: $main_color;
}

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

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

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

@@ -1414,10 +1429,12 @@
    background-color: #42b983;
    border-color: #42b983;
  }

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

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