From 93e462bfefd05963ab19b50c97faa04cdac04558 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 18 Jan 2022 11:44:03 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 30 ++++++++---------
 .../pages/creatProcess/bzjd/step1-6.vue       | 32 +++++++++----------
 .../pages/creatProcess/bzjd/step1.vue         | 30 ++++++++---------
 .../pages/creatProcess/bzjd/step2.vue         | 30 ++++++++---------
 .../pages/creatProcess/bzjd/step3.vue         | 16 +++++-----
 .../pages/creatProcess/bzjd/step4.vue         | 32 +++++++++----------
 .../pages/creatProcess/bzjd/step5.vue         | 32 +++++++++----------
 .../pages/creatProcess/bzjd/step6.vue         | 32 +++++++++----------
 .../pages/creatProcess/bzzqyj/step5.vue       | 17 +++++-----
 .../pages/creatProcess/bzzqyj/step6.vue       |  7 ++--
 .../pages/creatProcess/bzzqyj/step7.vue       |  6 +++-
 .../pages/creatProcess/bzzqyj/step8.vue       |  6 +++-
 .../pages/creatProcess/bzzqyj/step9.vue       |  6 +++-
 13 files changed, 145 insertions(+), 131 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index d9b1cc81f..70855c5e0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -132,21 +132,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        v-if="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -177,6 +162,21 @@
                         prop="zrUserName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        v-if="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="操作"
                         width="240"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index 7391b50e6..e40c868cf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -164,22 +164,6 @@
             <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
           </template>
         </el-table-column>
-        <el-table-column
-                v-if="!form.itemsNum1"
-                prop="technicalRequir"
-                width="200"
-                label="核心技术要求"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
-        <el-table-column
-                prop="changePoint"
-                width="150"
-                v-show="form.itemsNum1"
-                label="基于上一版本差异"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
         <el-table-column
                 v-show="sarType === 'FOREIGN' && form.itemsNum1"
                 prop="changePoint"
@@ -219,6 +203,22 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
+        <el-table-column
+                v-if="!form.itemsNum1"
+                prop="technicalRequir"
+                width="200"
+                label="核心技术要求"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="changePoint"
+                width="150"
+                v-show="form.itemsNum1"
+                label="基于上一版本差异"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
         <el-table-column
                 label="责任人"
                 width="170"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index ec1945309..9324e7561 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -139,21 +139,6 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
-        <el-table-column
-                prop="changePoint"
-                v-if="form.itemsNum1"
-                label="基于上一版本差异"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
-        <el-table-column
-                v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                prop="changePoint"
-                width="150"
-                label="相对于国行标差异点"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
         <el-table-column
                 prop="newData"
                 width="180"
@@ -178,6 +163,21 @@
             {{ scope.row.applyArctic.toString() }}
           </template>
         </el-table-column>
+        <el-table-column
+                prop="changePoint"
+                v-if="form.itemsNum1"
+                label="基于上一版本差异"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
+        <el-table-column
+                v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                prop="changePoint"
+                width="150"
+                label="相对于国行标差异点"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
         <el-table-column
           label="责任人"
           width="170"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 33229bbdd..a82367009 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -114,21 +114,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        v-if="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -153,6 +138,21 @@
                         {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        v-if="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="执行人"
                         width="170"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 37c218dd0..226719b76 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -113,14 +113,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -159,6 +151,14 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         :disabled="acceptShow"
                         prop="changePoint"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index a7527401d..4db3dde4d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -108,22 +108,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +146,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 6a1a4c682..701e5c74d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -108,22 +108,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +146,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 62555ab9f..670443c4e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -108,22 +108,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +146,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index e84a2c034..51142db10 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -449,13 +449,13 @@
       },
       saveUserInfo2 () {
         for( let a = 0; a < this.data.length; a++) {
-          if (a === this.itemId) {
-            this.data[a].chapterNumber = this.editForm.chapterNumber
-            this.data[a].chapterName = this.editForm.chapterName
-            this.data[a].oldText = this.editForm.oldText
-            this.data[a].newText = this.editForm.newText
-            this.data[a].reason = this.editForm.reason
-            this.data[a].cause = this.editForm.cause
+          if (this.data[a].id === this.itemId) {
+            // this.data[a].chapterNumber = this.editForm.chapterNumber
+            // this.data[a].chapterName = this.editForm.chapterName
+            // this.data[a].oldText = this.editForm.oldText
+            // this.data[a].newText = this.editForm.newText
+            // this.data[a].reason = this.editForm.reason
+            // this.data[a].cause = this.editForm.cause
             this.$set(this.data, a, this.editForm);
           }
         }
@@ -465,7 +465,7 @@
         this.modalshowflag2 = false
       },
       itemEdit (row, index) {
-        this.itemId = index
+        this.itemId = row.id
         this.modalshowflag2 = true
         this.editForm = {
           chapterNumber: row.chapterNumber,
@@ -597,7 +597,6 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText5 = data.commentText5 || ''
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index db4ee6551..97723e319 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -105,7 +105,7 @@
         </div>
         <el-table
                 ref="multipleTable"
-                :data="data"
+                :data="data2"
                 tooltip-effect="dark"
                 border
                 style="width: 100%; flex: auto;"
@@ -299,6 +299,7 @@
     name: "bzzqyjStep6",
     data() {
       return {
+        data2: [],
         commentText6: '',
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -435,6 +436,8 @@
           return "上报";
         } else if (row === "2") {
           return "处理后上报";
+        } else {
+          return "不上报";
         }
       },
       upload(row, title) {
@@ -526,7 +529,6 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText6 = data.commentText6 || ''
             this.form.fjList = data.fjList || data.form.fjList
             this.form.cid = data.cid || data.form.cid;
@@ -544,6 +546,7 @@
               }
             })
             this.json = data
+            this.data2 = newArr
             this.data = arr
           }).catch(e => {
           });
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 544bed354..e30146ceb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -284,6 +284,7 @@ export default {
   name: "bzzqyjStep7",
   data() {
     return {
+      data2: [],
       commentText7: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -437,6 +438,8 @@ export default {
         return '上报'
       } else if (row === '2') {
         return '处理后上报'
+      } else {
+        return '不上报'
       }
     },
     handleTabs(name) {
@@ -502,6 +505,7 @@ export default {
             }
           })
           this.json = data
+          this.data2 = newArr
           this.data = arr
         }).catch(e => {
         })
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 90dbad5a6..c87546e05 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
   name: "bzzqyjStep8",
   data() {
     return {
+      data2: [],
       commentText8: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
         return '上报'
       } else if (row === '2') {
         return '处理后上报'
+      } else {
+        return '不上报'
       }
     },
     handleTabs(name) {
@@ -505,6 +508,7 @@ export default {
             }
           })
           this.json = data
+          this.data2 = newArr
           this.data = arr
         }).catch(e => {
         })
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 61c52caf5..a851a20d5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
   name: "bzzqyjStep9",
   data() {
     return {
+      data2: [],
       commentText9: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
         return "上报";
       } else if (row === "2") {
         return "处理后上报";
+      } else {
+        return "不上报";
       }
     },
     handleTabs(name) {
@@ -506,6 +509,7 @@ export default {
           })
           this.json = data
           this.data = arr
+          this.data2 = newArr
         }).catch(e => {
         });
       });