1

src/views/activiti/form/demoForm2.vue

@@ -682,9 +682,13 @@ export default {
                                   
                            }else if(item[1].label =='deptName'){
                                var that = this 
-                               setTimeout(function(){
-                                  that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.deptName})  
-                               },200)
+                               
+                               if(that.btndisabled == false){
+                                 
+                                 setTimeout(function(){
+                                    that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.deptName})  
+                                 },200)
+                               }
                               
                            }else if(item[1].label =='user'){
                                // this.$store.getters.userInfo

src/views/oa/IncidentTicketList.vue

@@ -83,6 +83,15 @@
               </a-form-item>
               
             </a-col>
+            <a-col :xl="8" :lg="7" :md="8" :sm="24">
+              <a-form-item label="日期">
+                <a-range-picker 
+                                format="YYYY-MM-DD"
+                                :placeholder="['开始时间', '结束时间']"
+                                @change="onBirthdayChange" />
+              </a-form-item>
+              
+            </a-col>
             
             
             
@@ -340,6 +349,13 @@ import moment from 'moment'
             scopedSlots: { customRender: 'state' },
             width:120
           },
+          {
+            title:'扣款状态',
+            align:"center",
+            dataIndex: 'deductionStatus',
+            fixed:"right",
+            width:120
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -393,6 +409,12 @@ import moment from 'moment'
       }
     },
     methods: { 
+      
+      onBirthdayChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.queryParam.accidentData_begin=dateString[0];
+        this.queryParam.accidentData_end=dateString[1];
+      },
       handleExportXls4(fileName){
           
           var param = Object.assign({}, this.queryParam, null);

src/views/system/modules/UserModal.vue

@@ -85,8 +85,8 @@
           />
         </a-form-item>
        
-        <a-form-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', validatorRules.nidNo]"  @blur="changeNidNo"/>
+        <a-form-item label="证件号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入证件号码" v-decorator="['nidNo', validatorRules.nidNo]"  @blur="changeNidNo"/>
         </a-form-item>
 
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -349,9 +349,9 @@
         <a-form-model-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-model="fileName" ></j-upload>
         </a-form-model-item>
-        <a-form-item label="工资领取人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- <a-form-item label="工资领取人" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-select-user-by-dep v-decorator="['salaryUser', validatorRules.salaryUser]"  :multi="false"></j-select-user-by-dep>
-        </a-form-item>
+        </a-form-item> -->
 
          <a-form-item label="工作简历" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">
           <a-input type="textarea" placeholder="请输入" v-decorator="['nresume', {}]" />