Forráskód Böngészése

优化报告二次创建为更新状态

qinzhipeng_v 5 éve
szülő
commit
0b9ffd229c

+ 5 - 2
src/views/Platform/presentation/Acceptance.vue

@@ -248,7 +248,8 @@ export default {
       pftResult: '',
       pftResult: '',
       safeResult: '',
       safeResult: '',
       Tsk: [],
       Tsk: [],
-      moniterResult: ''
+      moniterResult: '',
+      accpId: ''
     }
     }
   },
   },
   created() {
   created() {
@@ -492,6 +493,7 @@ export default {
       this.ClientData.safeResult = this.safeResult
       this.ClientData.safeResult = this.safeResult
       this.ClientData.moniterResult = this.moniterResult
       this.ClientData.moniterResult = this.moniterResult
       this.ClientData.status = this.status
       this.ClientData.status = this.status
+      this.ClientData.id === undefined ? this.ClientData.id = this.accpId : ''
       this.ClientData.taskLateStatus = this.taskLateStatus
       this.ClientData.taskLateStatus = this.taskLateStatus
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { projectTestReport: this.ClientData, user: this.userData }
       this.objData = { projectTestReport: this.ClientData, user: this.userData }
@@ -504,11 +506,12 @@ export default {
         }
         }
       })
       })
     },
     },
-    parentHandleclick(e, task) {
+    parentHandleclick(e, task, id) {
       if (e === 1) {
       if (e === 1) {
         this.Tsk = task
         this.Tsk = task
         this.getCreateData(this.ClientData, this.tableData)
         this.getCreateData(this.ClientData, this.tableData)
       } else {
       } else {
+        this.accpId = id
         this.getQueryData(this.ClientData, this.tableData)
         this.getQueryData(this.ClientData, this.tableData)
       }
       }
     },
     },

+ 4 - 1
src/views/Platform/presentation/ClientAcceptance.vue

@@ -176,6 +176,7 @@ export default {
       editorElems: [],
       editorElems: [],
       bugNum: '',
       bugNum: '',
       Ts: [],
       Ts: [],
+      clienId: '',
       tableData: []
       tableData: []
     }
     }
   },
   },
@@ -319,11 +320,12 @@ export default {
         this.formatData()
         this.formatData()
       })
       })
     },
     },
-    parentHandleclick(e, task) {
+    parentHandleclick(e, task, id) {
       if (e === 1) {
       if (e === 1) {
         this.Ts = task
         this.Ts = task
         this.getCreateData(this.ClientData, this.tableData)
         this.getCreateData(this.ClientData, this.tableData)
       } else {
       } else {
+        this.clienId = id
         this.getQueryData(this.ClientData, this.tableData)
         this.getQueryData(this.ClientData, this.tableData)
       }
       }
     },
     },
@@ -368,6 +370,7 @@ export default {
       this.ClientData.sctResult = this.sctResult
       this.ClientData.sctResult = this.sctResult
       this.ClientData.acceptanceResult = this.acceptanceResult
       this.ClientData.acceptanceResult = this.acceptanceResult
       this.ClientData.status = this.status
       this.ClientData.status = this.status
+      this.ClientData.id === undefined ? this.ClientData.id = this.clienId : ''
       this.ClientData.taskLateStatus = this.taskLateStatus
       this.ClientData.taskLateStatus = this.taskLateStatus
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { projectTestReport: this.ClientData, user: this.userData }
       this.objData = { projectTestReport: this.ClientData, user: this.userData }

+ 5 - 4
src/views/Platform/presentation/DailyNewsAdded.vue

@@ -69,7 +69,8 @@ export default {
       numList: [],
       numList: [],
       bugName: [],
       bugName: [],
       statusMap: [],
       statusMap: [],
-      statusList: []
+      statusList: [],
+      dailys: ''
     }
     }
   },
   },
   created() {
   created() {
@@ -131,11 +132,12 @@ export default {
         })
         })
       }, 500)
       }, 500)
     },
     },
-    parentHandleclick(e, task) {
+    parentHandleclick(e, task, id) {
       if (e === 1) {
       if (e === 1) {
         this.ids = task
         this.ids = task
         this.getCreateData(this.fromCreateData)
         this.getCreateData(this.fromCreateData)
       } else {
       } else {
+        this.dailys = id
         this.getQueryData(this.fromCreateData)
         this.getQueryData(this.fromCreateData)
       }
       }
     },
     },
@@ -154,8 +156,6 @@ export default {
             if (res.code === 200) {
             if (res.code === 200) {
               this.$message.success(res.msg)
               this.$message.success(res.msg)
               this.$emit('daily', res.data)
               this.$emit('daily', res.data)
-            } else {
-              this.$message.error(res.msg)
             }
             }
           })
           })
         } else {
         } else {
@@ -168,6 +168,7 @@ export default {
     getQueryData(ele) {
     getQueryData(ele) {
       this.fromCreateData = ele
       this.fromCreateData = ele
       this.fromCreateData.testExplain = this.editor.editor.innerHTML
       this.fromCreateData.testExplain = this.editor.editor.innerHTML
+      this.fromCreateData.id === undefined ? this.fromCreateData.id = this.dailys : ''
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { dailyTestReport: this.fromCreateData, user: this.userData }
       this.objData = { dailyTestReport: this.fromCreateData, user: this.userData }
       dailyReportUpdate(this.objData).then(res => {
       dailyReportUpdate(this.objData).then(res => {

+ 5 - 2
src/views/Platform/presentation/PresentReport.vue

@@ -151,7 +151,8 @@ export default {
       projectIdCode: '',
       projectIdCode: '',
       ids: [],
       ids: [],
       configIn: '',
       configIn: '',
-      dependent: ''
+      dependent: '',
+      clien: ''
     }
     }
   },
   },
   created() {
   created() {
@@ -216,6 +217,7 @@ export default {
     getQueryData(ele) {
     getQueryData(ele) {
       this.dataChange = ele
       this.dataChange = ele
       this.dataChange.lateStatus = this.lateStatus
       this.dataChange.lateStatus = this.lateStatus
+      this.dataChange.id === undefined ? this.dataChange.id = this.clien : ''
       typeof (this.DetailsOfProposal) === 'string' ? this.dataChange.joinTest = this.DetailsOfProposal : ''
       typeof (this.DetailsOfProposal) === 'string' ? this.dataChange.joinTest = this.DetailsOfProposal : ''
       this.userData = { ename: this.userInformation, name: this.userNames }
       this.userData = { ename: this.userInformation, name: this.userNames }
       this.objData = { launchTestInfo: this.dataChange, user: this.userData }
       this.objData = { launchTestInfo: this.dataChange, user: this.userData }
@@ -228,11 +230,12 @@ export default {
         }
         }
       })
       })
     },
     },
-    parentHandleclick(e, task) { // 判断新建还是编辑
+    parentHandleclick(e, task, id) { // 判断新建还是编辑
       if (e === 1) {
       if (e === 1) {
         this.ids = task
         this.ids = task
         this.getCreateData(this.dataChange)
         this.getCreateData(this.dataChange)
       } else {
       } else {
+        this.clien = id
         this.getQueryData(this.dataChange)
         this.getQueryData(this.dataChange)
       }
       }
     },
     },

+ 6 - 3
src/views/Platform/presentation/Templates/ClientReport.vue

@@ -92,7 +92,8 @@ export default {
       active: 1,
       active: 1,
       client_task: [],
       client_task: [],
       src: clientF,
       src: clientF,
-      src1: clientK
+      src1: clientK,
+      keys: ''
     }
     }
   },
   },
   methods: {
   methods: {
@@ -165,15 +166,16 @@ export default {
     },
     },
     created_out() {
     created_out() {
       if (this.radio === '1') {
       if (this.radio === '1') {
-        this.$refs.ClientAcceptance.parentHandleclick(this.newNum, this.client_task)
+        this.$refs.ClientAcceptance.parentHandleclick(this.newNum, this.client_task, this.keys)
       }
       }
       if (this.radio === '2') {
       if (this.radio === '2') {
-        this.$refs.Acceptance.parentHandleclick(this.newNum, this.client_task)
+        this.$refs.Acceptance.parentHandleclick(this.newNum, this.client_task, this.keys)
       }
       }
     },
     },
     QuasiReport(e) {
     QuasiReport(e) {
       console.log(e, 'zhunchu')
       console.log(e, 'zhunchu')
       this.report = e
       this.report = e
+      this.keys = e.id
       this.active = 3
       this.active = 3
       this.showThree = true
       this.showThree = true
       this.showTow = false
       this.showTow = false
@@ -183,6 +185,7 @@ export default {
       this.showThree = false
       this.showThree = false
       this.showTow = true
       this.showTow = true
       this.active = 2
       this.active = 2
+      this.newNum = 2
       if (this.clienData.type === 1) {
       if (this.clienData.type === 1) {
         this.radio = '1'
         this.radio = '1'
         this.$nextTick(() => {
         this.$nextTick(() => {

+ 5 - 3
src/views/Platform/presentation/Templates/DailyReport.vue

@@ -78,7 +78,8 @@ export default {
       newIndex: '',
       newIndex: '',
       active: 1,
       active: 1,
       daily_task: [],
       daily_task: [],
-      src: daily
+      src: daily,
+      dailys: ''
     }
     }
   },
   },
   destroyed() {
   destroyed() {
@@ -99,7 +100,6 @@ export default {
           break
           break
         case 2:
         case 2:
           this.dailyNewData = newData
           this.dailyNewData = newData
-          console.log(newData, 'dss')
           this.newIndex = 2
           this.newIndex = 2
           this.showOne = false
           this.showOne = false
           this.showTow = true
           this.showTow = true
@@ -136,17 +136,19 @@ export default {
       this.showTow = false
       this.showTow = false
     },
     },
     created_out() {
     created_out() {
-      this.$refs.DailyReport.parentHandleclick(this.newIndex, this.daily_task)
+      this.$refs.DailyReport.parentHandleclick(this.newIndex, this.daily_task, this.dailys)
     },
     },
     gou_out() {
     gou_out() {
       this.dailyNewData = this.preview
       this.dailyNewData = this.preview
       this.active = 2
       this.active = 2
+      this.newIndex = 2
       this.showOne = false
       this.showOne = false
       this.showTow = true
       this.showTow = true
       this.showThree = false
       this.showThree = false
     },
     },
     daily(e) {
     daily(e) {
       this.preview = e
       this.preview = e
+      this.dailys = e.id
       this.showOne = false
       this.showOne = false
       this.showTow = false
       this.showTow = false
       this.showThree = true
       this.showThree = true

+ 7 - 3
src/views/Platform/presentation/Templates/TestReport.vue

@@ -95,7 +95,8 @@ export default {
       preview: '',
       preview: '',
       src: testF,
       src: testF,
       src1: testK,
       src1: testK,
-      dialogVisible1: false
+      dialogVisible1: false,
+      clien: ''
     }
     }
   },
   },
   methods: {
   methods: {
@@ -158,6 +159,7 @@ export default {
       this.showThree = false
       this.showThree = false
       this.showTow = true
       this.showTow = true
       this.active = 2
       this.active = 2
+      this.newNum = 2
       if (this.clienData.type === 1) {
       if (this.clienData.type === 1) {
         this.radio = '1'
         this.radio = '1'
         this.Present1 = true
         this.Present1 = true
@@ -171,10 +173,10 @@ export default {
     },
     },
     created_out() {
     created_out() {
       if (this.radio === '2') { // 服务端
       if (this.radio === '2') { // 服务端
-        this.$refs.presentationRef.parentHandleclick(this.newNum, this.present_task)
+        this.$refs.presentationRef.parentHandleclick(this.newNum, this.present_task, this.clien)
       }
       }
       if (this.radio === '1') { // 客户端
       if (this.radio === '1') { // 客户端
-        this.$refs.Present.parentHandleclick(this.newNum, this.present_task)
+        this.$refs.Present.parentHandleclick(this.newNum, this.present_task, this.clien)
       }
       }
     },
     },
     NextStep() {
     NextStep() {
@@ -210,6 +212,8 @@ export default {
       this.showTow = false
       this.showTow = false
     },
     },
     fatherMethod(e) {
     fatherMethod(e) {
+      console.log(e, '新建返回')
+      this.clien = e.id
       this.preview = e
       this.preview = e
       this.showThree = true
       this.showThree = true
       this.showTow = false
       this.showTow = false

+ 3 - 1
src/views/Platform/presentation/presentationReport.vue

@@ -209,6 +209,7 @@ export default {
       typeof (this.editorContent) === 'string' ? this.fromDev.joinTest = this.editorContent : ''
       typeof (this.editorContent) === 'string' ? this.fromDev.joinTest = this.editorContent : ''
       typeof (this.DetailsOfProposal) === 'string' ? this.fromDev.moduleInfo = this.DetailsOfProposal : ''
       typeof (this.DetailsOfProposal) === 'string' ? this.fromDev.moduleInfo = this.DetailsOfProposal : ''
       this.fromDev.lateStatus = this.lateStatus
       this.fromDev.lateStatus = this.lateStatus
+      this.fromDev.id === undefined ? this.fromDev.id = this.clien : ''
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { launchTestInfo: this.fromDev, user: this.userData }
       this.objData = { launchTestInfo: this.fromDev, user: this.userData }
       launchTestUpdate(this.objData).then(res => {
       launchTestUpdate(this.objData).then(res => {
@@ -220,11 +221,12 @@ export default {
         }
         }
       })
       })
     },
     },
-    parentHandleclick(e, task) { // 判断创建还是编辑
+    parentHandleclick(e, task, id) { // 判断创建还是编辑
       if (e === 1) {
       if (e === 1) {
         this.ids = task
         this.ids = task
         this.getCreateData(this.fromDev)
         this.getCreateData(this.fromDev)
       } else {
       } else {
+        this.clien = id
         this.getQueryData(this.fromDev)
         this.getQueryData(this.fromDev)
       }
       }
     },
     },