From ab3182ae513f1eba4377551e972cb3500f837aee Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 10 Dec 2021 09:37:28 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzjd/step3.vue         | 23 ++++++++++---------
 .../pages/creatProcess/bzjd/step4.vue         |  2 +-
 .../pages/creatProcess/bzjd/step5.vue         |  2 +-
 .../pages/creatProcess/bzjd/step6.vue         |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 603982bb9..5c214377c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -392,23 +392,15 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
-<!--                        <el-date-picker-->
-<!--                                v-model="plForm.newData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择新车型实施日期">-->
-<!--                        </el-date-picker>-->
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="plForm"
                                 v-model="plForm.newData"
                         ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
-<!--                        <el-date-picker-->
-<!--                                v-model="plForm.onlineData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择在产车实施日期">-->
-<!--                        </el-date-picker>-->
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="plForm"
                                 v-model="plForm.onlineData"
                         ></custom-date-pick-group>
@@ -470,12 +462,14 @@
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="editForm"
                                 v-model="editForm.newData"
                         ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="editForm"
                                 v-model="editForm.onlineData"
                         ></custom-date-pick-group>
@@ -842,7 +836,7 @@
                             itemList = data.itemList
                         }
                         itemList.forEach(item => {
-                            item.unitDeptName = this.$store.getters.userInfo.orgName
+                            item.unitDeptName = this.$store.getters.userInfo.institutionName
                             item.onlineData = item.onlineData || ''
                             item.newData = item.newData || ''
                             item.complianceState = item.complianceState || ''
@@ -853,6 +847,8 @@
                             item.itemsTitle = item.itermsConditions
                             item.applyArctic = item.applyArctic || []
                         })
+
+
                         this.itemList = itemList
                         this.loading = false
                     }).catch(e => {
@@ -884,6 +880,11 @@
                 padding: 0 20px 0;
             }
         }
+        .myDataPick {
+            /deep/.el-form-item__content {
+                margin-left: 0px !important;
+            }
+        }
         .fileClass {
             cursor: pointer;
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index a2a4410af..2163d6e9d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -170,7 +170,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index ea0f944be..143354727 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -170,7 +170,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 20668edd6..9154689b2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -171,7 +171,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"