Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -1,168 +1,178 @@
-<template>
-    <div class="ZQYJAddFileDetails">
-        <div class="left">
-            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
-                    width="100%" height="100%"
-                    frameborder="0" scrolling="no" ref="iframeDom"
-            ></iframe>
-        </div>
-        <div class="rightDiv">
-            <div class="height">
-                新增意见
-            </div>
-            <div class="search-area">
-                <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
-                    <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
-                        <el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
-                            <el-option
-                                    v-for="(item,index) in options"
-                                    :key="index"
-                                    :label="item.itemsNum"
-                                    :value="item.itemsNum"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
-                        <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
-                    </el-form-item>
-                    <el-form-item label="修改前" label-width="" class="add-form-item">
-                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
-                    </el-form-item>
-                    <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
-                        <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
-                    </el-form-item>
-                    <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
-                        <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
-                    </el-form-item>
-                    <!--                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
-                    <!--                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
-                    <!--                    </el-form-item>-->
-                </el-form>
-            </div>
-            <div class="demo-drawer-footer">
-                <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
-                    提交
-                </el-button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "ZQYJAddFileDetails",
-        data () {
-            return {
-                options: [],
-                opinionContent: { // 抽屉数据
-                    partCode: '',
-                    oldText: '',
-                    newText: '',
-                    reason: '',
-                    chapterName: '',
-                    // cause: '',
-                },
-                opinionContentRules: {
-                    partCode: [
-                        {required: true, message: '请输入章节编号', trigger: 'blur'},
-                    ],
-                    oldText: [
-                        {required: true, message: '请输入修改前内容', trigger: 'blur'}
-                    ],
-                    newText: [
-                        {required: true, message: '请输入修改后内容', trigger: 'blur'}
-                    ],
-                    reason: [
-                        {required: true, message: '请输入修改理由', trigger: 'blur'}
-                    ],
-                },
-                isSubmit: false,
-            }
-        },
-        methods: {
-            saveUserInfo () {
-                this.$refs['formAdd'].validate((valid) => {
-                    if (valid) {
-                        var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-                        var form = {
-                            id: id,
-                            oldText: this.opinionContent.oldText,
-                            newText: this.opinionContent.newText,
-                            reason: this.opinionContent.reason,
-                            chapterNumber: this.opinionContent.partCode,
-                            chapterName: this.opinionContent.chapterName,
-                        }
-                        this.$store.commit('SET_REFRESH_FLAG', true)
-                        localStorage.setItem('bzzqyjForm', JSON.stringify(form))
-                        localStorage.setItem('freshClueNum', new Date().getTime())
-                        this.opinionContent.partCode = ''
-                        this.opinionContent.reason = ''
-                        this.opinionContent.oldText = ''
-                        this.opinionContent.newText = ''
-                        this.opinionContent.chapterName = ''
-                    }
-                })
-            },
-            optionsChange (data) {
-                for  (let a = 0; a < this.options.length; a++) {
-                    if (data === this.options[a].itemsNum) {
-                        this.opinionContent.oldText = this.options[a].termsConditions
-                        this.opinionContent.chapterName = this.options[a].itemsName
-                    }
-                }
-            },
-        },
-        mounted() {
-            this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
-                standId: this.$route.query.standId,
-                fileType: this.$route.query.fileType,
-                pageSize: 9999,
-                page: 1
-            }, {}, res => {
-                if (res.ok) {
-                    this.options = res.data.list
-                }
-            }, e => {
-            })
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-    @import '~@/assets/styles/mixins';
-    @import '~@/assets/styles/style';
-    .ZQYJAddFileDetails {
-        height: 100%;
-        display: flex;
-        .left {
-            width: 60%;
-            height: 100%;
-        }
-        .rightDiv {
-            background: #fff;
-            width: 40%;
-            height: 100%;
-            .height {
-                margin-bottom: 0;
-                padding: 10px 20px;
-                font-size: 18px;
-                font-weight: bold;
-                color: #333333;
-                border-bottom: 1px solid #e5e5e5;
-            }
-            .search-area {
-                height: calc(~'100% - 90px');
-                overflow: auto;
-            }
-            .demo-drawer-footer {
-                width: 100%;
-                padding: 0 20px;
-                height: 50px;
-                line-height: 50px;
-                border-top: 1px solid #e8e8e8;
-                text-align: right;
-                background: #fff;
-                z-index: 999;
-            }
-        }
-    }
-</style>
+<template>
+    <div class="ZQYJAddFileDetails">
+        <div class="left">
+            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
+                    width="100%" height="100%"
+                    frameborder="0" scrolling="no" ref="iframeDom"
+            ></iframe>
+        </div>
+        <div class="rightDiv">
+            <div class="height">
+                新增意见
+            </div>
+            <div class="search-area">
+                <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                    <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
+                        <el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
+                            <el-option
+                                    v-for="(item,index) in options"
+                                    :key="index"
+                                    :label="item.itemsNum"
+                                    :value="item.itemsNum"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改前" label-width="" class="add-form-item">
+                        <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
+                    </el-form-item>
+                    <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+                        <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
+                    </el-form-item>
+                    <!--                    <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
+                    <!--                        <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
+                    <!--                    </el-form-item>-->
+                </el-form>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+                    提交
+                </el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "ZQYJAddFileDetails",
+        data () {
+            return {
+                options: [],
+                opinionContent: { // 抽屉数据
+                    partCode: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
+                    chapterName: '',
+                    // cause: '',
+                },
+                opinionContentRules: {
+                    partCode: [
+                        {required: true, message: '请输入章节编号', trigger: 'blur'},
+                    ],
+                    oldText: [
+                        {required: true, message: '请输入修改前内容', trigger: 'blur'}
+                    ],
+                    newText: [
+                        {required: true, message: '请输入修改后内容', trigger: 'blur'}
+                    ],
+                    reason: [
+                        {required: true, message: '请输入修改理由', trigger: 'blur'}
+                    ],
+                },
+                isSubmit: false,
+            }
+        },
+        methods: {
+            saveUserInfo () {
+                this.$refs['formAdd'].validate((valid) => {
+                    if (valid) {
+                        var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                        var form = {
+                            id: id,
+                            oldText: this.opinionContent.oldText,
+                            newText: this.opinionContent.newText,
+                            reason: this.opinionContent.reason,
+                            chapterNumber: this.opinionContent.partCode,
+                            chapterName: this.opinionContent.chapterName,
+                        }
+                        this.$store.commit('SET_REFRESH_FLAG', true)
+                        localStorage.setItem('bzzqyjForm', JSON.stringify(form))
+                        localStorage.setItem('freshClueNum', new Date().getTime())
+                        this.opinionContent.partCode = ''
+                        this.opinionContent.reason = ''
+                        this.opinionContent.oldText = ''
+                        this.opinionContent.newText = ''
+                        this.opinionContent.chapterName = ''
+                    }
+                })
+            },
+            optionsChange (data) {
+                for  (let a = 0; a < this.options.length; a++) {
+                    if (data === this.options[a].itemsNum) {
+                        this.opinionContent.oldText = this.options[a].termsConditions
+                        this.opinionContent.chapterName = this.options[a].itemsName
+                    }
+                }
+            },
+        },
+        mounted() {
+            this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+                standId: this.$route.query.standId,
+                fileType: this.$route.query.fileType,
+                pageSize: 9999,
+                page: 1
+            }, {}, res => {
+                if (res.ok) {
+                  let arr1 = res.data.list
+                  for (let i=0;i<arr1.length;i++) {
+                    for (let j = i + 1; j < arr1.length; j++) {
+                      if (arr1[i].itemsNum === arr1[j].itemsNum) {
+                          arr1.splice(j,1)
+                         // delete arr1[i]
+                        j--
+                      }
+                    }
+                  }
+                  this.options = arr1
+                }
+            }, e => {
+            })
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/mixins';
+    @import '~@/assets/styles/style';
+    .ZQYJAddFileDetails {
+        height: 100%;
+        display: flex;
+        .left {
+            width: 60%;
+            height: 100%;
+        }
+        .rightDiv {
+            background: #fff;
+            width: 40%;
+            height: 100%;
+            .height {
+                margin-bottom: 0;
+                padding: 10px 20px;
+                font-size: 18px;
+                font-weight: bold;
+                color: #333333;
+                border-bottom: 1px solid #e5e5e5;
+            }
+            .search-area {
+                height: calc(~'100% - 90px');
+                overflow: auto;
+            }
+            .demo-drawer-footer {
+                width: 100%;
+                padding: 0 20px;
+                height: 50px;
+                line-height: 50px;
+                border-top: 1px solid #e8e8e8;
+                text-align: right;
+                background: #fff;
+                z-index: 999;
+            }
+        }
+    }
+</style>

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue

@@ -549,9 +549,15 @@ export default {
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
-            this.$confirm(res.data, "提示", {
+            const arr = res.data.split('；')
+            let newDatas = [],h = this.$createElement;
+            for (const i in arr) {
+              newDatas.push(h('p', null, arr[i]))
+            }
+            this.$confirm(h('div', null, newDatas), "提示", {
               confirmButtonText: "确认",
               confirmButtonClass: "common-button-primary",
+              dangerouslyUseHTMLString: true,
               cancelButtonText: "取消",
               type: "warning"
             }).then(() => {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -341,7 +341,7 @@
               </template>
             </el-table-column>
             <el-table-column fixed="right"
-                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
+                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
                              label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
@@ -370,13 +370,11 @@
                   <div @click.stop style="display: inline-block">
                     <!--                                            <i class="iconfont">&#xe61e;</i>-->
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-if="scope.row.collectBtn"
                                @click="handleCommand([scope.row, '收藏'])"
                     >
                     </el-button>
                     <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-else
                                @click="handleCommand([scope.row, '取消收藏'])"
                     >

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -333,7 +333,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
+            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
 <!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
 <!--                     @command="handleCommand"-->

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -89,8 +89,11 @@
       <el-table
               :data="standinfoList"
               height="100%"
+              tooltip-effect="dark"
+              header-cell-class-name="zTable_style"
               border
-              style="width: 100%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
               :default-sort = "{prop: 'partCode', order: 'ascending'}"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
@@ -608,6 +611,9 @@
   @import '~@/assets/styles/style';
 
   .consultationDetails {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     height: 100%;
     display: flex;
     flex-direction: column;