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

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

@@ -136,7 +136,7 @@ export default {
         this.$message.warning(res.message)
         fileList.pop()
       }
-      this.importModalshowflagtemp = false
+      // this.importModalshowflagtemp = false
     },
     //文件上传前
     beforeUpload(file){
@@ -192,6 +192,7 @@ export default {
         }, res => {
           if(res.respCode === '200'){
             this.$emit('emitInsState',true)
+            this.$message.success('归档成功')
           }
         }, e => {
         })

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

@@ -12,7 +12,9 @@
       <div class="row">
         <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
-            <span style="color: #409EFF">{{answer.appendixName}}</span>
+            <div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
+              <span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name  }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -42,16 +44,33 @@ export default {
       checked: '',
       answererNowUserId: this.$store.getters.userInfo.userId,
       answererNowUserName: this.$store.getters.userInfo.userName,
+      fileList:[],
     }
   },
   methods:{
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     //点击预览
-    clickButtonTo() {
+    clickButtonTo(attId) {
-      const attId = this.answer.appendixId
+      // 过滤
+      if(attId.indexOf("ATT_FILE") !== -1){
         this.$preview(attId)
+      }
     },
     answerChang(){}
   },
+  mounted () {
+    this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
+  },
   watch:{
     answer: {
       immediate: true,
@@ -65,6 +84,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 #answer-item{
   width: 100%;
   min-width: 130px;

src/pages/phone/domesticDetails.vue

@@ -1,6 +1,6 @@
 <!--国内标准法规详情页-->
 <template>
-  <div class="other-standard-details v-class" :style="'width:' + (500) + 'px;'+'height:' + (screenHeight) + 'px'">
+  <div class="other-standard-details v-class" :style="'height:' + (screenHeight) + 'px'">
     <!--title 标题-->
     <div class="details-header">
       <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
@@ -14,16 +14,9 @@
     <div class="details-content" style="position: relative">
       <div class="details-content-modular basic-information">
       </div>
-      <div
+      <div class="details-content-modular clearfix" v-for="(item, index) in dynamicFormField" :key="index" v-if="item.isShowImp === '0'">
-        class="details-content-modular clearfix"
-        v-for="(item, index) in dynamicFormField"
-        :key="index"
-        v-if="item.isShowImp === '0'"
-      >
         <el-collapse v-model="activeNames" @change="handleChange">
-          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information" style="border-top:none;position: absolute;right: 36px;"> </div>
-               style="border-top:none;position: absolute;right: 36px;">
-          </div>
           <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <div class="modular-header" v-if="item.label === '基础信息'">
@@ -78,6 +71,8 @@
                             </div>
                           </div>
                         </template>
+                      </p>
+                    </template>
                     <template v-else-if="child.value === null">-</template>
                     <!--修订本-->
                     <template v-for="(child, childIndex) in item.child5">
@@ -104,8 +99,7 @@
                     <template v-for="(child, childIndex) in item.child4">
                       <p class="files-title">
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0"
+                        <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)">
-                                  v-for="(file, fileIndex) in child4Func(child.value)">
                           <span>
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -142,39 +136,25 @@
                         <template v-if="child.value === null">-</template>
                       </p>
                     </template>
-                    </p>
-
-
-
-
-
-
                     <p class="half">
-                      <label style=" margin-right: 150px;"
+                      <label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
-                             title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                      >文本状态</label>
                       <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                     </p>
-                    <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
+                    <p class="half">
-                        sarStandardsInfoEO.issueTime || '-'
+                      <label style=" margin-right: 150px;">发布日期</label>
-                      }}</span></p>
+                      <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
-                    <!--                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-                    <!--                          standMap[sarStandardsInfoEO.standNature] || '-'-->
-                    <!--                        }}</span></p>-->
-                    <!--<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
-                      style=" margin-right: 150px;">标准体系</label><span>{{
-                        sarStandardsInfoEO.standSystem || '-'
-                      }}</span>
-                    </p>-->
-                    <p class="half"><label
-                      style=" margin-right: 150px;">标准体系</label><span>{{
-                        sarStandardsInfoEO.standSystem || '-'
-                      }}</span>
                     </p>
                     <p class="half">
-                      <label style=" margin-right: 11em;">是否纳入认证清单</label><span>{{
+                      <label style=" margin-right: 150px;">标准体系</label>
-                        sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
+                      <span>
-                      }}</span>
+                        {{ sarStandardsInfoEO.standSystem || '-' }}
+                      </span>
+                    </p>
+                    <p class="half">
+                      <label style=" margin-right: 11em;">是否纳入认证清单</label>
+                      <span>
+                        {{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
+                      </span>
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
@@ -182,9 +162,8 @@
                         <span>{{ child.value || '-' }}</span>
                       </p>
                     </template>
-                    <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
+                  </div>
-                    <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
+                </div>
-                    <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
               </template>
               <div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
                 <div class="wrap" @click="handleToggleShowAll(item)">
@@ -192,24 +171,11 @@
                   <img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
                 </div>
               </div>
-            </div>
+              <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
-      </div>
-</template>
-<template
-  v-for="(child, childIndex) in item.half"
-  v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
->
                 <!--     modular-item half       代替标准编号-->
-  <div
+                <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' ">
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-    v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
-  >
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <span
+                  <span class="modular-content-p-val" :title="child.value || '-'">
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
       <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
         <!--相关流程-->
         <template v-if="child.attrField === 'XGLC' && child.value">
@@ -245,17 +211,9 @@
     </span>
                 </div>
                 <!--            其他项-->
-  <div
+                <div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
-    v-else
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-  >
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <span
+                  <span v-if="child.attrField === 'FGWHR'" class="modular-content-p-val clearfix" :title="child.value || '-'">
-      v-if="child.attrField === 'FGWHR'"
-      class="modular-content-p-val clearfix"
-      :title="child.value || '-'"
-    >
       <template v-if="child.value">
         {{ child.value }}
         <put-question-button
@@ -268,50 +226,31 @@
         {{ '-' }}
       </template>
     </span>
-    <span
+                  <span v-else-if="child.attrType === 'DATE_PICKER'" class="modular-content-p-val">
-      v-else-if="child.attrType === 'DATE_PICKER'"
-      class="modular-content-p-val"
-    >
       {{ child.value ? child.value : '-' }}
     </span>
-    <span
+                  <span v-else-if="child.attrType !== 'FILE'" class="modular-content-p-val" :title="child.value || '-'">
-      v-else-if="child.attrType !== 'FILE'"
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
       {{ child.value || '-' }}
     </span>
                   <div v-else class="modular-content-p-flies">
-      <p
+                    <p class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
                       <!--发布稿、增补件单独设置下载权限-->
                       <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
-          <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">
-              file.oldFileName
+                          {{ file.oldFileName }}
-            }}</a>
+                        </a>
                       </template>
                       <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
-              file.oldFileName
+                          {{file.oldFileName}}
-            }}</a>
+                        </a>
-          <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                     </p>
                   </div>
                 </div>
-
               </template>
-<template
+              <template v-for="(child, childIndex) in item.child" v-if="child.isShowImp === '0' && item.label === '关联信息'">
-  v-for="(child, childIndex) in item.child"
+                <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
-  v-if="child.isShowImp === '0' && item.label === '关联信息'"
->
-  <div
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-  >
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
                   <!--相关流程-->
                   <template v-if="child.attrField === 'XGLC' && child.value">
@@ -322,9 +261,7 @@
         </span>
                     </p>
                   </template>
-    <template
+                  <template v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'">
-      v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
-    >
                     <p class="modular-content-p-val" v-if="child.value">
         <span v-for="(item, index) in child.value.split(',')" :key="index">
           <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
@@ -333,49 +270,34 @@
                     </p>
                     <span class="modular-content-p-val" v-else>-</span>
                   </template>
-    <span
+                  <span v-else-if="child.attrField === 'SVPPS'" class="modular-content-p-val" :title="child.tips || '-'">
-      v-else-if="child.attrField === 'SVPPS'"
-      class="modular-content-p-val"
-      :title="child.tips || '-'"
-    >
       {{ !child.value || child.value === 'null' ? '-' : child.value }}
     </span>
-    <span
+                  <span v-else-if="child.attrType !== 'FILE'" class="modular-content-p-val" :title="child.value || '-'">
-      v-else-if="child.attrType !== 'FILE'"
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
       {{ child.value || '-' }}
                     <!--                    被代替标准号-->
     </span>
                   <div v-else class="modular-content-p-flies">
-      <p
+                    <p class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
                       <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
                       <!--发布稿、增补件单独设置下载权限-->
                       <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
                   || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
-              file.oldFileName
+                          {{file.oldFileName}}
-            }}</a>
+                        </a>
                       </template>
                       <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
-              file.oldFileName
+                          {{file.oldFileName}}
-            }}</a>
+                        </a>
                       </template>
                     </p>
                   </div>
                 </div>
               </template>
-<template
+              <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
-  v-for="(child, childIndex) in item.one"
-  v-if="child.isShowImp === '0' && item.label == '过程稿件'"
->
                 <!--                增补件（必读）和勘误件不放在过程稿件里了-->
                 <div
                   v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
@@ -486,6 +408,8 @@
         </el-collapse>
       </div>
     </div>
+  </div>
+</template>
 <!--查看分解单-->
 <el-drawer
   title="查看分解单"
@@ -1475,8 +1399,6 @@
     <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
   </div>
 </el-dialog>
-</div>
-</template>
 <script>
   import PutQuestionButton from '@/components/PutQuestionButton'
   import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'

src/pages/regulatoryRepository/standQA/index.vue

@@ -1084,8 +1084,9 @@ export default {
     },
     //问题查询
     queSearch(){
-       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+       this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
          standardId: this.activestand,
+         classification: this.activeName,
        },{
          _this: this
        }, res => {

src/sysConfig/index.js

@@ -8,8 +8,8 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-const devIp = '39.98.140.126'
+const devIp = '192.168.0.109'
-const devInterfacePORT = '4201'
+const devInterfacePORT = '9999'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证