commit

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -348,6 +348,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -369,15 +370,12 @@ export default {
         this.listForm.breakdownList = [];
         for (let i = 0; i < item.pepdtos.length; i++) {
           for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
+            console.log(item.pepdtos[i].xCXSSRQ === null);
             if(item.pepdtos[i].xCXSSRQ === null){
-              this.listForm.breakdownList.xCXSSRQ =  ""
-            } else {
-              this.listForm.breakdownList.xCXSSRQ =  item.pepdtos[i].xCXSSRQ
+              item.pepdtos[i].xCXSSRQ = ''
             }
-            if(item.pepdtos[i].zCCSSRQ  === null){
-              this.listForm.breakdownList.zCCSSRQ =  ""
-            } else {
-              this.listForm.breakdownList.zCCSSRQ =  item.pepdtos[i].zCCSSRQ
+            if(item.pepdtos[i].zCCSSRQ === null){
+              item.pepdtos[i].zCCSSRQ = ''
             }
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -396,6 +394,8 @@ export default {
               qualityEngineerName: item.pepdtos[i].qualityEngineerName,
               standNumber: item.pepdtos[i].standNumber,
               standName: item.pepdtos[i].standName,
+              xCXSSRQ  :  item.pepdtos[i].XCXSSRQ,
+              zCCSSRQ : item.pepdtos[i].ZCCSSRQ,
             });
           }
         }

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -347,6 +347,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import Moment from 'moment';
 import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
@@ -434,12 +435,24 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //将时间戳转换为日期格式
+    getLocalTime(item) {
+      return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
+    },
+
+// 时间戳（毫秒）转化为标准时间格式
+    getFullTime(item) {
+      const stamp = new Date(item);
+      const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
+       return item = time
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -454,20 +467,22 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if(item.form === undefined){
-          if (item.fenFlag === undefined ) {
+        if (item.form === undefined) {
+          if (item.fenFlag === undefined) {
             item.step3DTOS.forEach(item => {
-              item.implementerId = this.$store.getters.userInfo.userId
-              item.implementer = this.$store.getters.userInfo.userName
-            })
+              item.implementerId = this.$store.getters.userInfo.userId;
+              item.implementer = this.$store.getters.userInfo.userName;
+            });
             this.dataList = item.step3DTOS;
+
           } else {
             this.dataList = item.dataList;
             this.dataList.forEach(item => {
-              item.implementerId = this.$store.getters.userInfo.userId
-              item.implementer = this.$store.getters.userInfo.userName
-            })
+              item.implementerId = this.$store.getters.userInfo.userId;
+              item.implementer = this.$store.getters.userInfo.userName;
+            });
           }
+          // this.getLocalTime()
           this.listForm.prcNum = this.prcNum;
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
@@ -480,8 +495,8 @@ export default {
           this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
           this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
         } else {
-          this.listForm = item.form
-          this.dataList = item.form.dataList
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -495,9 +510,9 @@ export default {
       this.listForm.dataList = this.dataList;
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "5");
-      _formData.append('taskIds', this.taskIds)
+      _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
-        form:this.listForm,
+        form: this.listForm,
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
@@ -516,7 +531,7 @@ export default {
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
-      this.isSubmit = true
+      this.isSubmit = true;
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -528,7 +543,7 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
-        this.isSubmit = false
+        this.isSubmit = false;
       }, e => {
 
       });