Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventor...

张诺

6 天以前 e5a70efeaa9fd96ce1242e5d582c8237319fade4

 src/views/personnelManagement/employeeRecord/components/BasicInfoSection.vue

@@ -124,10 +124,10 @@
            clearable
            style="width: 100%"
          >
            <el-option label="未婚" value="single" />
            <el-option label="已婚" value="married" />
            <el-option label="离异" value="divorced" />
            <el-option label="丧偶" value="widowed" />
            <el-option label="未婚" value="未婚" />
            <el-option label="已婚" value="已婚" />
            <el-option label="离异" value="离异" />
            <el-option label="丧偶" value="丧偶" />
          </el-select>
        </el-form-item>
      </el-col>
@@ -150,6 +150,30 @@
              :disabled="item.status == 1"
            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="10">
        <el-form-item label="员工通讯地址" prop="contactAddress">
          <el-input
            v-model="form.contactAddress"
            type="text"
            placeholder="请输入"
            clearable
            maxlength="100"
            show-word-limit
          />
        </el-form-item>
      </el-col>
      <el-col v-if="operationType === 'add'" :span="10">
        <el-form-item label="默认初始化密码" prop="defaultPassword">
          <el-input
            v-model="form.defaultPassword"
            type="text"
            placeholder="请输入"
            clearable
            maxlength="50"
            show-word-limit
          />
        </el-form-item>
      </el-col>
    </el-row>
@@ -178,4 +202,3 @@
  margin-right: 4px;
}
</style>