员工信息

src/views/oa/enterpriseAnnouncement.vue

@@ -67,6 +67,15 @@
           <span slot="releaseTimeSlot" slot-scope="text, record">
             <span v-if="record.isRelease == '0'">
              
+            </span>
+            <span v-else>
+            {{text}}
+            </span>
+          </span>
+         <!-- 发布人 -->
+          <span slot="updataBySlot" slot-scope="text, record">
+            <span v-if="record.isRelease == '0'">
+             
             </span>
             <span v-else>
             {{text}}
@@ -179,6 +188,11 @@ export default {
                     align: 'center'
                 },
                 {
+                    title: '发布人',
+                    dataIndex: 'updateBy',
+                    scopedSlots: { customRender: 'updataBySlot' },
+                    align: 'center'
+                }, {
                     title: '发布时间',
                     dataIndex: 'releaseTime',
                     scopedSlots: { customRender: 'releaseTimeSlot' },

src/views/system/UserList.vue

@@ -27,13 +27,13 @@
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="真实名字">
-                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
+                <j-input placeholder="请输入真实名字" v-model="queryParam.realname"></j-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
+                <j-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></j-input>
               </a-form-item>
             </a-col>
 

src/views/system/modules/UserModal.vue

@@ -151,10 +151,10 @@
           />
         </a-form-item>
 
-        <a-form-item label="公积金日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="公积金申报日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"
-            placeholder="请选择公积金日期"
+            placeholder="请选择公积金申报日期"
             v-decorator="['nfundTime', { initialValue: !model.nfundTime ? null : moment(model.nfundTime, dateFormat) }]"
           />
         </a-form-item>
@@ -208,9 +208,9 @@
           />
         </a-form-item>
         
-        <a-form-item label="对本企业要求" :labelCol="labelCol" :wrapperCol="wrapperCol">
+       <!-- <a-form-item label="对本企业要求" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入" v-decorator="['nrequirement', {}]" />
-        </a-form-item>
+        </a-form-item> -->
         
         <!-- <a-form-item label="希望待遇" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入希望待遇" v-decorator="['nhopeFor',{}]" />
@@ -230,7 +230,7 @@
         </a-form-item>
          <a-form-item label="所属公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag
-            v-decorator="['belongingCompany', {}]"
+            v-decorator="['belongingCompany', validatorRules.belongingCompany]"
             placeholder="请选择所属公司"
             :triggerChange="true"
             dictCode="affiliated-company"
@@ -430,6 +430,7 @@ export default {
                     ]
                 },
                 realname: { rules: [{ required: true, message: '请输入用户名称!' }] },
+                belongingCompany: { rules: [{ required: true, message: '请选择所属公司!' }] },
                 phone: { rules: [{ validator: this.validatePhone },{ required: true, message: '请输入手机号码!' }] },
                 email: {
                     rules: [
@@ -647,7 +648,7 @@ export default {
                         'nrelationshipFor',
                         'npersonnelType',
                         'nregisteredAddr',
-                        'ifOa'
+                        'ifOa','belongingCompany'
                     )
                 )
             })