质量事故单

src/views/oa/modules/IncidentTicketModal.vue

@@ -284,10 +284,10 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="6">
-            <a-form-model-item label="U8开票日期" prop="invoicingDate">
-                <a-date-picker
+            <a-form-model-item label="U8开票日期" prop="invoicingDate" >
+                <a-date-picker :disabled="true"
                   placeholder="请选择"
-                  format="YYYY-MM-DD"
+                  format="YYYY-MM-DD HH:mm:ss"
                   style="width: 100%"
                   v-model="formState.invoicingDate"
                 />
@@ -471,11 +471,11 @@
           if(res.success){
             var zhuId = '' //主表id
              this.formState=res.result //详情
-             if(this.formState.invoicingDate=='' || !this.formState.invoicingDate){
-              this.formState.invoicingDate = moment(new Date())
-             }else{
+             // if(this.formState.invoicingDate=='' || this.formState.invoicingDate ==null){
+             //  this.formState.invoicingDate = moment(new Date())
+             // }else{
               this.formState.invoicingDate = moment(this.formState.invoicingDate)
-             }
+             // }
              
              this.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
              var accessory2Z =[]
@@ -589,7 +589,7 @@
                 obj.createTime = ''
                 obj.incidentTicketChildrenList =  this.incidentTicketChildrenTable.dataSource
                 // console.log(this.formState.invoicingDate);
-                obj.invoicingDate = moment(this.formState.invoicingDate).format('YYYY-MM-DD');
+                obj.invoicingDate = moment(this.formState.invoicingDate).format('YYYY-MM-DD HH:mm:ss');
                 // console.log(obj.invoicingDate);
                 // obj.invoicingDate = moment(this.formState.invoicingDate).add (0.5,'days')
                     putAction('/oa/incidentTicket/edit', obj).then((res) => {

src/views/system/UserList.vue

@@ -15,7 +15,7 @@
             <a-col :md="6" :sm="8">
               <a-form-item label="部门">
                 <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
-                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
+                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' or org_code='TWH' order by org_code"/>
               </a-form-item>
             </a-col>
 
@@ -278,11 +278,17 @@
             width: 100,
             dataIndex: 'birthday'
           },     
+          // {
+          //   title: '状态',
+          //   align: "center",
+          //   width: 80,
+          //   dataIndex: 'status_dictText'
+          // },
           {
-            title: '状态',
+            title: '雇佣状态',
             align: "center",
             width: 80,
-            dataIndex: 'status_dictText'
+            dataIndex: 'syHireType'
           },
           {
             title: '用户账号',