From 14d24538f97b965b7778acb8f3b80449e795f633 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 9 Aug 2021 16:10:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E5=BA=93=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index cbbff74d1..d44b0a32d 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -641,7 +641,7 @@
                 </el-form-item>
                 <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                               prop="standState" label-width="150px" class="add-form-item">
-                  <template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
+                  <template slot="label">文本状态</template>
                   <el-select v-model="sarStandardsInfoEO.textStatus"
                              placeholder="请选择文本状态"
                              clearable>

From d763d3718cd4a1c9058e4f294e88d39d1018433d Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 9 Aug 2021 16:46:11 +0800
Subject: [PATCH 2/2] commit

---
 .../processCenter/pages/creatProcess/bzjd/step1-1.vue    | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step2.vue      | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step3.vue      | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step4.vue      | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step5.vue      | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step6.vue      | 9 +++++++++
 6 files changed, 54 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 719b13749..a59cea2ed 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -358,6 +358,15 @@
                 @checkedRole="saveUserInfo"
                 :nodeList="nodeList"
         ></Role-tree>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 9838e9e60..c89b69426 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -218,6 +218,15 @@
                 :nodeList="nodeList2"
         ></Role-tree>
         <loading :loading="loading">加载中...</loading>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index e5d7f7e21..e953869f4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -360,6 +360,15 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
             </div>
         </el-drawer>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index f646d40d7..6b90b2415 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -265,6 +265,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 2b6f9324c..834bc18af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -264,6 +264,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 414ab7eb8..67a6dabe4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -263,6 +263,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>