Merge remote-tracking branch 'origin/master'

lyh

2025-05-28 e14ed882d12df3b48e59390eba364442cdff70bd

 src/views/system/modules/UserModal.vue

@@ -97,9 +97,10 @@
          />
        </a-form-model-item>

        <!--<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
        <!--<j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>-->
        <!--</a-form-model-item>-->
        <a-form-model-item label="岗位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!--          <j-select-position placeholder="请选择岗位" :multiple="false" v-model="model.post"/>-->
          <j-dict-select-tag placeholder="请选择岗位" dict-code="sys_position, name, code" v-model="model.post" />
        </a-form-model-item>

        <a-form-model-item
          label="角色分配"
@@ -379,6 +380,7 @@
      disableSubmit: false,
      dateFormat: 'YYYY-MM-DD',
      validatorRules: {
        workNo:[{ required: true, message: '请输入工号!' }],
        username: [{ required: true, message: '请输入用户账号!' },
          { validator: this.validateUsername }],
        password: [