Merge branch 'develop' into FOTON

public/static/pdf/web/viewer.html

@@ -233,19 +233,19 @@ See https://github.com/adobe-type-tools/cmap-resources
     <div id="outerContainer">
 
       <div id="sidebarContainer">
-        <div id="toolbarSidebar">
+<!--        <div id="toolbarSidebar">-->
-          <div class="splitToolbarButton toggled">
+<!--          <div class="splitToolbarButton toggled">-->
-            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
+<!--            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">-->
-               <span data-l10n-id="thumbs_label">Thumbnails</span>
+<!--               <span data-l10n-id="thumbs_label">Thumbnails</span>-->
-            </button>
+<!--            </button>-->
-            <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">
+<!--            <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">-->
-               <span data-l10n-id="document_outline_label">Document Outline</span>
+<!--               <span data-l10n-id="document_outline_label">Document Outline</span>-->
-            </button>
+<!--            </button>-->
-            <button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments">
+<!--            <button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments">-->
-               <span data-l10n-id="attachments_label">Attachments</span>
+<!--               <span data-l10n-id="attachments_label">Attachments</span>-->
-            </button>
+<!--            </button>-->
-          </div>
+<!--          </div>-->
-        </div>
+<!--        </div>-->
         <div id="sidebarContent">
           <div id="thumbnailView">
           </div>

src/pages/config/pages/mechanismManage/pages/committee.vue

@@ -63,8 +63,12 @@
             prop="committeeDirectorName"
             label="主任"
             align="center"
-          >
+          />
-          </el-table-column>
+          <el-table-column
+            prop="committeeDeputy"
+            label="副主任"
+            align="center"
+          />
           <el-table-column
             prop="committeeSecretaryName"
             align="center"
@@ -73,7 +77,7 @@
           <el-table-column
             prop="committor"
             align="center"
-            label="委员">
+            label="成员">
           </el-table-column>
         </el-table>
         <loading :loading="Loading">加载中...</loading>

src/pages/home2/components/searchGroup/index.vue

@@ -16,7 +16,6 @@
     </el-select>
     <div class="search-condition">
       <el-input
-        @keyup.native.enter="search"
         v-model="checkContent">
         type="text"
         placeholder="请输入关键词"

src/pages/personal/pages/my-questions/components/answerItem.vue

@@ -60,6 +60,8 @@
         :action="actionPath"
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
         name="file"
+        :limit="5"
+        :on-exceed="handleExceed"
         :file-list="fileList"
         ref="importFileAboutStand">
         <i class="el-icon-upload"></i>
@@ -100,6 +102,9 @@ export default {
    }
   },
   methods:{
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
     //提交
     handleSubmit(){
       this.$refs['form'].validate((valid) => {
@@ -192,7 +197,6 @@ export default {
         }, res => {
           if(res.respCode === '200'){
             this.$emit('emitInsState',true)
-            this.$message.success('归档成功')
           }
         }, e => {
         })

src/pages/personal/pages/my-questions/components/questionItemInfo.vue

@@ -26,7 +26,7 @@
         </div>
       </div>
       <div style="float: right; margin-top: 20px">
-        <el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
+        <el-checkbox v-if="answer.checkedShow && archiveVerify()" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
       </div>
     </div>
 <!--    <div class="footer-box">-->
@@ -38,16 +38,30 @@
 <script>
 export default {
   name: "questionItemInfo",
-  props:['answer'],
+  props: {
+    answer: {
+      type: Object,
+      required: false
+    },
+    questionerForm: {
+      type: Object,
+      required: false
+    },
+  },
   data(){
     return{
       checked: '',
+      institutionId: this.$store.getters.userInfo.institutionId,
       answererNowUserId: this.$store.getters.userInfo.userId,
       answererNowUserName: this.$store.getters.userInfo.userName,
       fileList:[],
     }
   },
   methods:{
+    archiveVerify(){
+      return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName
+              && this.institutionId === '30001273');
+    },
     assemble(ids,names){
       let list= [];
       if(ids && ids !== '' && names && names !== ''){

src/pages/personal/pages/my-questions/index.vue

@@ -328,7 +328,9 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item" :dataLoading="dataLoading"></question-item-info>
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :questionerForm="question"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -389,7 +391,9 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :questionerForm="question"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -450,7 +454,9 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :questionerForm="question"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -512,7 +518,9 @@
                                   <div class="clearfix">
                                     <div class="answer-box" >
                                       <question-item-info
+                                      :key="qiiKey"
                                       :answer="item"
+                                      :questionerForm="question"
                                       ></question-item-info>
                                     </div>
                                   </div>
@@ -1246,6 +1254,8 @@ export default {
   data(){
     return{
       aiKey:1,
+      qiiKey:1,
+      institutionId: this.$store.getters.userInfo.institutionId,
       dataLoading: true,
       roleFlag: false,
       nodeList: [],
@@ -1314,6 +1324,7 @@ export default {
     }
   },
   mounted(){
+    console.log(this.$store.getters.userInfo)
     this.standSearch()
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -1632,6 +1643,7 @@ export default {
        }, res => {
          if(this.activeName === 'myAns'){
             if(res.data.length){
+
               res.data.forEach(item => {
                 item.checkedShow = true
                 if(item.state && item.state === 'yes'){
@@ -1645,6 +1657,7 @@ export default {
          }else{
            this.answerList = res.data
          }
+         this.qiiKey++
          this.dataLoading = false
        }, e => {
        })
@@ -1652,6 +1665,8 @@ export default {
     //提问按钮
     queBtn(){
       this.fileList = []
+      // 清空提问
+      this.standType = "INLAND"
       this.questionForm = {
         pubQue :  '',//公共问题
         classification: 'INLAND', //标准类型

src/pages/phone/domesticDetails.vue

@@ -1409,6 +1409,7 @@
   import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect";
   import {getBusStandFileByAttId} from 'api/process'
   import {dicTypeData} from "api/unqualProcess";
+  import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
 
 
   export default {
@@ -2639,138 +2640,26 @@
         if (fileSuffix !== undefined && fileSuffix !== null) {
           fileSuffix = fileSuffix.toUpperCase()
         }
-        // 判断上传文件格式
+        if(fileSuffix !== 'pdg' && fileSuffix !== 'PDG'){
-        if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
+          this.getBusStandFileByAttId(attId)
-          this.downloadFile(attId)
+                  .then(res => {
-          return true
+                    if (res) {
-        }
+                      const editFileInfo = res
-        // 缺少文件
-        if (this.$route.query.pageType === 'INLAND_STAND') {
-          if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
-            if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-              this.getBusStandFileByAttId(attId)
-                .then(res => {
-                  if (res) {
-                    const editFileInfo = res
-                    if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
-                      window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
-                    } else {
                       const nowTime = new Date().getTime()
-                      window.open(onlyOfficeUrl + '/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
+                      if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
-                    }
+                        window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-                  }
+                      }else {
-                }).catch(e => {
+                        const nowTime = new Date().getTime()
-                console.log(e)
+                        // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                this.$message.warning('文件不存在,预览失败')
+                        window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              })
-            } else {
-              this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-                attId: attId
-              }, {
-                _this: this
-              }, res => {
-                if (res.data) {
-                  let fileObj = {}
-                  fileObj.fileId = res.data.attId
-                  fileObj.fileName = oldFileName
-                  let fileList = []
-                  let repeatData = 0
-                  if (sessionStorage.getItem('fileInfo')) {
-                    fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                    if (fileList != null && fileList.length > 0) {
-                      for (let i = 0; i < fileList.length; i++) {
-                        if (fileList[i].fileId === res.data.attId) {
-                          repeatData = 1
-                          break
-                        }
-                      }
-                      if (repeatData === 0) {
-                        fileList.push(fileObj)
-                        fileList = JSON.stringify(fileList)
-                        sessionStorage.setItem('fileInfo', fileList)
-                      }
-                    }
-                  } else {
-                    fileList.push(fileObj)
-                    fileList = JSON.stringify(fileList)
-                    sessionStorage.setItem('fileInfo', fileList)
-                  }
-                  window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-                } else {
-                  this.$message.error('文档未转换成功或本地读取不到该文档')
-                }
-              }, e => {
-                this.$message.error('文档未转换成功或本地读取不到该文档')
-              })
-            }
-          } else {
-            this.$message.error('没有在线预览文档权限！')
-          }
-        } else {
-          // 国外在线预览权限
-          if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
-            // if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
 
-            this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-              attId: attId
-            }, {
-              _this: this
-            }, res => {
-              if (res.data) {
-                let fileObj = {}
-                fileObj.fileId = res.data.attId
-                fileObj.fileName = oldFileName
-                let fileList = []
-                let repeatData = 0
-                if (sessionStorage.getItem('fileInfo')) {
-                  fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                  if (fileList != null && fileList.length > 0) {
-                    for (let i = 0; i < fileList.length; i++) {
-                      if (fileList[i].fileId === res.data.attId) {
-                        repeatData = 1
-                        break
                       }
                     }
-                    if (repeatData === 0) {
+                  }).catch(e => {
-                      fileList.push(fileObj)
+            this.$message.warning('文件不存在,预览失败')
-                      fileList = JSON.stringify(fileList)
-                      sessionStorage.setItem('fileInfo', fileList)
-                    }
-                  }
-                } else {
-                  fileList.push(fileObj)
-                  fileList = JSON.stringify(fileList)
-                  sessionStorage.setItem('fileInfo', fileList)
-                }
-                window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-              } else {
-                this.$message.error('文档未转换成功或本地读取不到该文档')
-              }
-            }, e => {
-              this.$message.error('文档未转换成功或本地读取不到该文档')
-            })
-          } else {
-            this.$message.error('没有在线预览文档权限！')
-          }
-        }
-        if(this.$route.query.pageType === 'INLAND_STAND'){
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standName
-          }, {
-            _this: this
-          }, res => {
-          })
-        }else{
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standEnName
-          }, {
-            _this: this
-          }, res => {
           })
+        }else {
+          this.$message.warning('PDG文件,不支持手机端预览')
         }
       },
       showItemsModel(attField) {

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -146,7 +146,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
-                  <el-radio-group v-model="form.signFlag">
+                  <el-radio-group v-model="form.signFlag" disabled>
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -207,7 +207,7 @@
     import axios from "axios";
 
     export default {
-        name: "phoneBzdyStep6",
+        name: "phoneBzzqyjStep6",
        data() {
         return {
           data2: [],

src/pages/processCenter/pages/phone/bzzqyj/step7.vue

@@ -189,7 +189,7 @@
     import axios from "axios";
 
     export default {
-        name: "phoneBzdyStep7",
+        name: "phoneBzzqyjStep7",
         data() {
             return {
                 itermsConditionsFlag: false,

src/pages/processCenter/pages/phone/bzzqyj/step8.vue

@@ -190,7 +190,7 @@
     import axios from "axios";
 
     export default {
-        name: "phoneBzdyStep8",
+        name: "phoneBzzqyjStep8",
         data() {
             return {
                 itermsConditionsFlag: false,

src/pages/processCenter/pages/phone/bzzqyj/step9.vue

@@ -190,7 +190,7 @@
     import axios from "axios";
 
     export default {
-        name: "phoneBzdyStep9",
+        name: "phoneBzzqyjStep9",
         data() {
             return {
                 itermsConditionsFlag: false,

src/pages/regulatoryRepository/standQA/index.vue

@@ -1040,6 +1040,7 @@ export default {
     //提问按钮
     queBtn(){
       this.fileList = []
+      this.standType = "INLAND"
       this.questionForm = {
           pubQue :  '',//公共问题
           classification: 'INLAND', //标准类型
@@ -1278,12 +1279,12 @@ export default {
   .question-box{
 
   }
-  .question-tabs {
+  .question-box {
     height: 100%;
     border-top: none;
     border-bottom: none;
     /deep/.el-tabs__nav {
-      height: calc(~'100% - 50px');
+      height: 100%;
       overflow: auto;
     }
     /deep/ &.el-tabs--border-card .el-tabs__item{