Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/check/oneTbale.vue

@@ -317,11 +317,13 @@ export default {
         approveNote: undefined,
         approveStatus: undefined,
         jcRank: undefined,
+        jcCause: undefined,
         iiiId: undefined,
         standardOne: undefined,
         standardTwo: undefined,
         limitOne: undefined,
         limitTwo: undefined,
+        limitThree: undefined,
         oneJcUser: undefined,
         oneJcDate: undefined,
         twoJcUser: undefined,
@@ -498,11 +500,13 @@ export default {
         approveNote: undefined,
         approveStatus: undefined,
         jcRank: undefined,
+        jcCause: undefined,
         iiiId: undefined,
         standardOne: undefined,
         standardTwo: undefined,
         limitOne: undefined,
         limitTwo: undefined,
+        limitThree: undefined,
         oneJcUser: undefined,
         oneJcDate: undefined,
         twoJcUser: undefined,
@@ -565,11 +569,13 @@ export default {
         approveNote: undefined,
         approveStatus: undefined,
         jcRank: undefined,
+        jcCause: undefined,
         iiiId: undefined,
         standardOne: undefined,
         standardTwo: undefined,
         limitOne: undefined,
         limitTwo: undefined,
+        limitThree: undefined,
         oneJcUser: undefined,
         oneJcDate: undefined,
         twoJcUser: undefined,

src/views/checkList.vue

@@ -841,6 +841,7 @@ export default {
         jcRank: '',
         jcFacadeCy: undefined,
         jcFacadeBl: undefined,
+        jcCause: '',
         jcResult: '1',
         remarks: '',
         approveStatus: '0'
@@ -860,6 +861,7 @@ export default {
         twoJcDate: undefined,
         limitOne: '',
         limitTwo: '',
+        limitThree: '',
         businessId: undefined,
         standardOne: undefined,
         standardTwo: undefined,
@@ -1240,6 +1242,7 @@ export default {
         this.inspectInfoList.jcRank = response.data.jcRank
         this.inspectInfoList.jcFacadeCy = response.data.jcFacadeCy
         this.inspectInfoList.jcFacadeBl = response.data.jcFacadeBl
+        this.inspectInfoList.jcCause = response.data.jcCause
         this.inspectInfoList.jcResult = response.data.jcResult
         this.inspectInfoList.remarks = response.data.remarks
         console.log(this.inspectInfoList)
@@ -1250,6 +1253,7 @@ export default {
         this.inspectJbAl2o3List.twoJcDate = response.data.twoJcDate
         this.inspectJbAl2o3List.limitOne = response.data.limitOne
         this.inspectJbAl2o3List.limitTwo = response.data.limitTwo
+        this.inspectJbAl2o3List.limitThree = response.data.limitThree
         this.inspectJbAl2o3List.businessId = response.data.businessId
         this.inspectJbAl2o3List.standardOne = response.data.standardOne
         this.inspectJbAl2o3List.standardTwo = response.data.standardTwo
@@ -1715,6 +1719,7 @@ export default {
         jcRank: '',
         jcFacadeCy: undefined,
         jcFacadeBl: undefined,
+        jcCause: '',
         jcResult: '1',
         remarks: '',
         approveStatus: '0'
@@ -1728,6 +1733,7 @@ export default {
         twoJcDate: undefined,
         limitOne: undefined,
         limitTwo: undefined,
+        limitThree: undefined,
         businessId: undefined,
         standardOne: undefined,
         standardTwo: undefined,