Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

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>
 

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>
 

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>

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>
 

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>

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>

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>