Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/modules/IncidentTicketModal.vue

@@ -285,14 +285,19 @@
           </a-col>
           <a-col :span="6">
             <a-form-model-item label="U8开票日期" prop="invoicingDate" >
-                <a-date-picker :disabled="true"
+                <a-date-picker 
                   placeholder="请选择"
-                  format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD"
                   style="width: 100%"
                   v-model="formState.invoicingDate"
                 />
             </a-form-model-item>
           </a-col>    
+          <a-col :span="6">
+            <a-form-model-item label="最后修改日期">
+              {{updateDateString}}
+            </a-form-model-item>
+          </a-col>    
           </a-row>
          </a-form-model>
           <!-- <j-editable-table
@@ -368,6 +373,7 @@
         accessory2:[],
         accessory:[],
         factorySignature:[],
+        updateDateString:'',
         // 森_工厂质量事故单-子表
         incidentTicketChildrenTable: {
           loading: false,
@@ -485,7 +491,7 @@
               accessory2Z.push(item.url)
              })
              this.accessory2 = accessory2Z
-
+             this.updateDateString = moment(this.formState.updateTime).format('YYYY-MM-DD HH:mm:ss')
 
              this.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
              var accessoryZ=[]
@@ -544,6 +550,7 @@
             this.formState.Noticer =(noticeList!==''&&noticeList)?noticeList.toString():''
             this.formState.createTime = (res.result[0].createTime!==''&&res.result[0].createTime)? moment(res.result[0].createTime).format('YYYY-MM-DD HH:mm:ss'):''
             console.log(this.formState.Noticer)
+           
             this.$forceUpdate()
           }else{
             this.formState.Noticer = ''
@@ -591,7 +598,13 @@
                 obj.createTime = ''
                 obj.incidentTicketChildrenList =  this.incidentTicketChildrenTable.dataSource
                 // console.log(this.formState.invoicingDate);
-                obj.invoicingDate = moment(this.formState.invoicingDate).format('YYYY-MM-DD HH:mm:ss');
+                if(this.formState.invoicingDate != null && this.formState.invoicingDate !=''){
+                  // obj.invoicingDate = moment(this.formState.invoicingDate).format('YYYY-MM-DD HH:mm:ss');
+                  obj.invoicingDate = moment(this.formState.invoicingDate).format('YYYY-MM-DD') +" 00:00:01";
+                }else{
+                  obj.invoicingDate = ''
+                }
+                
                 // console.log(obj.invoicingDate);
                 // obj.invoicingDate = moment(this.formState.invoicingDate).add (0.5,'days')
                     putAction('/oa/incidentTicket/edit', obj).then((res) => {

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -272,7 +272,7 @@
                 />
             </a-form-model-item>
           </a-col>
-
+          
           <a-col :span="6" >
             <a-form-model-item label="填报人" prop="informant">
               <a-input v-model="formState.informant"   placeholder="请输入" readOnly ></a-input>
@@ -283,7 +283,11 @@
               <a-input v-model="formState.department"   placeholder="请输入" readOnly></a-input>
             </a-form-model-item>
           </a-col>
-          
+          <a-col :span="6">
+            <a-form-model-item label="最后修改日期">
+              {{updateDateString}}
+            </a-form-model-item>
+          </a-col>    
           </a-row>
         </a-form-model>
 
@@ -465,6 +469,7 @@
         accessory2:[],
         accessory:[],
         factorySignature:[],
+        updateDateString:'',
         columns: [
           { title: '姓名', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'realname' },
           { title: '账号', align: 'center', width: '20%', dataIndex: 'username' },
@@ -751,9 +756,8 @@
           if(res.success){
             var zhuId = '' //主表id
              this.formState=res.result //详情
-             this.formState=res.result //详情
-            this.formState.invoicingDate = (this.formState.invoicingDate!==''&& this.formState.invoicingDate) ?moment(this.formState.invoicingDate):''
-             
+            // this.formState.invoicingDate = (this.formState.invoicingDate!==''&& this.formState.invoicingDate) ?moment(this.formState.invoicingDate):''
+             this.formState.invoicingDate = moment(this.formState.invoicingDate)
              this.formState.accidentData =  moment( this.formState.accidentData).format('YYYY-MM-DD');
              this.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
              var accessory2Z =[]
@@ -761,7 +765,8 @@
               accessory2Z.push(item.url)
              })
              this.accessory2 = accessory2Z
-
+             this.updateDateString = moment(this.formState.updateTime).format('YYYY-MM-DD HH:mm:ss')
+             
              this.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
              var accessoryZ=[]