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

src/pages/details/otherBussStandardDetails/index.vue

@@ -333,6 +333,7 @@
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
                 <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
+                <el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准问答</el-button>
               </div>
             </div>
           </div>
@@ -2949,6 +2950,17 @@ export default {
       this.relateDialog1 = true
       this.relateNowList1 = list
     },
+    //标准问答按钮
+    knowledgeSharing() {
+      this.$router.push({
+        path: '/standQA',
+        query:{
+          standId: this.$route.params.id,
+          standType: 'BUSINESS_STAND',
+          sourceType: 'details',
+        }
+      })
+    },
     // 更新LOG
     relateEvent () {
       this.$http.get('lawss/sarUpdLog/getLogList', {

src/pages/details/otherStandardDetails/index.vue

@@ -30,7 +30,7 @@
                 <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
                            :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
-                <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
+                            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
                 <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
               </div>
             </div>
@@ -2454,9 +2454,16 @@ export default {
     pageSizeChange1() {
       this.getKnowList()
     },
+    //标准问答按钮
     knowledgeSharing() {
-      this.knowledgeSharingDialog = true
+      this.$router.push({
-      this.getKnowList()
+        path: '/standQA',
+        query:{
+          standId: this.$route.params.id,
+          standType: this.sarStandardsInfoEO.standType,
+          sourceType: 'details',
+        }
+      })
     },
     // 获取知识点列表数据
     getKnowList() {

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

@@ -36,7 +36,6 @@ export default {
       immediate: true,
       deep: true,
       handler(val){
-        console.log(val);
       }
     }
   }

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

@@ -817,7 +817,7 @@
     </div>
     <span>相似历史问题：</span>
     <div  style="height: 200px; width: 80%; margin-left: 80px;">
-      <div v-for="item in historyList" :key="item.id" @click="historyJump(item.id)">
+      <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
           <span class="history-item">{{item.problemDescription}}</span>
           <span class="history-item">{{item.questionTime}}</span>
       </div>
@@ -1334,8 +1334,18 @@ export default {
       }
     }),
     //点击跳转问题详情
-    historyJump(id){
+    historyJump(item){
-      this.$router.push('/standQA')
+      this.$router.push({
+        path: '/standQA',
+        query:{
+          standId: item.standardId,
+          queId: item.id,
+          standType: item.classification,
+          sourceType: 'dialog',
+          standName: item.standardName,
+        }
+      })
+      this.dialogVisible = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -269,7 +269,7 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.processName = data.form ? data.form.processName : data.processName
-                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
+                        this.form.dyhz = data.dyhz || data.form.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -223,18 +223,16 @@
         <div class="content" v-show="active === '2'">
             <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
-        <ProcessFooter
+      <ProcessFooter
-                show-submit
+        show-submit
-                :submitLoading="isSubmit"
+        :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+        :saveLoading="saveLoading"
-                @submit="handleSubmit"
+        @submit="handleSubmit"
-                show-back
+        show-transfer
-                show-transfer
+        @transfer="handleTransfer"
-                @transfer="handleTransfer"
+        submitBTNText="同意"
-                @back="handleSubmitNo"
+      >
-                submitBTNText="同意"
+      </ProcessFooter>
-        >
-        </ProcessFooter>
       <phone-role
         role-title="转办处理人"
         :is-show-phone.sync="drawerModal"

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

@@ -83,6 +83,7 @@
                 @save="handleSave"
                 @submit="handleSubmit"
                 show-transfer
+                show-save
                 @transfer="handleTransfer"
         >
         </ProcessFooter>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1,6 +1,7 @@
 <!--标准法规库 - 标准法规国家地区清单 - 新增、编辑页-->
 <template>
   <div class="list-of-standards-and-regulations-details v-class">
+    <loading :loading="boxLoading">数据获取中</loading>
     <!--基础信息-->
     <div class="basic-information">
       <el-divider content-position="left">基础信息</el-divider>
@@ -822,6 +823,7 @@ export default {
         kccvppscn: ''
       },
       selectSearch: [],
+      boxLoading: true,
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -2364,6 +2366,11 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
+  mounted(){
+    setTimeout(() => {
+      this.boxLoading = false
+    }, 2000)
+  },
   created() {
     this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1,6 +1,7 @@
 <!--标准法规库 - 标准法规其他清单  - 新增、编辑页-->
 <template>
   <div class="list-of-standards-and-regulations-details v-class">
+    <loading :loading="boxLoading">数据获取中</loading>
     <!--基础信息-->
     <div class="basic-information">
       <el-divider content-position="left">基础信息</el-divider>
@@ -623,6 +624,7 @@ export default {
       textStatusMap: {},
       typeApplicableMap: {},
       selectSearch : [],
+      boxLoading: true,
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -2219,6 +2221,9 @@ export default {
         this.$refs['sarAccessForm'].resetFields()
       })
     }
+    setTimeout(() => {
+      this.boxLoading = false
+    }, 2000)
   },
   beforeRouteLeave(to, from, next) {
     next()

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1,6 +1,7 @@
 <!--标准法规库 - 标准法规其他清单  - 新增、编辑页-->
 <template>
   <div class="list-of-standards-and-regulations-details v-class">
+    <loading :loading="boxLoading">数据获取中</loading>
     <!--基础信息-->
     <div class="basic-information">
       <el-divider content-position="left">基础信息</el-divider>
@@ -668,6 +669,7 @@ export default {
     return {
       textStatusMap: {},
       selectSearch: [],
+      boxLoading: true,
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -2149,6 +2151,9 @@ export default {
         this.$refs['sarAccessForm'].resetFields()
       })
     }
+    setTimeout(() => {
+      this.boxLoading = false
+    }, 2000)
   },
   beforeRouteLeave(to, from, next) {
     next()

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -369,7 +369,6 @@
           <el-table-column
             prop="issueTime"
             label="发布日期"
-            sortable
             width="120"
           >
             <template slot-scope="scope">
@@ -387,7 +386,6 @@
           <el-table-column
             prop="putTime"
             label="实施日期"
-            sortable
             width="120"
           >
             <template slot-scope="scope">
@@ -404,7 +402,6 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            sortable
             prop="standStatusShow"
             label="文本状态"
             width="110"
@@ -687,7 +684,7 @@
                     </el-tooltip>
                   </template>
                   <template v-else-if="field.attrField === 'KCVPPSCNBUSS'">
-                    <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                    <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px"
                                   prop="KCVPPSCNBUSS" class="add-form-item">
                       <el-input
                         v-model="sarBussionessStandEO.KCVPPSCNBUSS" disabled
@@ -970,14 +967,12 @@
                 prop="issueTime"
                 label="发布日期"
                 width="180"
-                sortable
                 align="center">
               </el-table-column>
               <el-table-column
                 prop="putTime"
                 label="实施日期"
                 width="180"
-                sortable
                 align="center">
               </el-table-column>
               <!--              <el-table-column-->

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -250,7 +250,6 @@
             </el-table-column>
             <el-table-column
               prop="issueTime"
-              sortable="custom"
               width="120"
               label="发布日期">
               <template slot-scope="scope">
@@ -267,7 +266,6 @@
             </el-table-column>
             <el-table-column
               prop="SSRQ"
-              sortable="custom"
               width="120"
               label="实施日期">
               <template slot-scope="scope">
@@ -284,7 +282,6 @@
             </el-table-column>
             <el-table-column
               prop="XCXSSRQ"
-              sortable="custom"
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
@@ -301,7 +298,6 @@
             </el-table-column>
             <el-table-column
               prop="ZCCSSRQ"
-              sortable="custom"
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
@@ -1493,7 +1489,6 @@
               <el-table-column
                 prop="issueTime"
                 label="发布日期"
-                sortable
                 width="120"
                 align="center">
                 <template slot-scope="scope">
@@ -1503,7 +1498,6 @@
               <el-table-column
                 prop="XCXSSRQ"
                 label="实施日期"
-                sortable
                 width="120"
                 align="center">
                 <template slot-scope="scope">

src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue

@@ -48,6 +48,7 @@ export default {
       deep: true,
       handler(val) {
         this.answer = val
+        console.log(val);
       }
     }
   }

src/pages/regulatoryRepository/standQA/components/questions-item.vue

@@ -1,26 +1,28 @@
 <!--问题的描述-->
 <template>
-<div id="questions-item">
+  <div style="width: 100%;padding: 10px 0;">
-  <div>
+    <div id="questions-item">
-    <el-button class="dybtn"  size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
+    <div>
-  </div>
+      <el-button class="dybtn"  size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
-  <div>
+    </div>
-    <div class="row">
+    <div>
-      <div class="item">
+      <div class="row">
-        <div>提问：
+        <div class="item">
-         <span>{{question.problemDescription}}</span>
+          <div>提问：
+            <span>{{question.problemDescription}}</span>
+          </div>
         </div>
       </div>
-    </div>
+      <div class="row">
-    <div class="row">
+        <div class="item">
-      <div class="item">
+          <div>{{question.answerer}}
-        <div>{{answer.answerer}}
+            <span>{{question.questionTime}}</span>
-          <span>{{question.questionTime}}</span>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+  </div>
 </template>
 
 <script>
@@ -51,6 +53,7 @@ export default {
       immediate: true,
       deep: true,
       handler(val){
+        console.log(val);
       }
     }
   }
@@ -60,8 +63,7 @@ export default {
 <style lang="less" scoped>
 #questions-item{
   width: 100%;
-  min-width: 130px;
+  min-width: 200px;
-  padding:10px 0;
   .dybtn{
     float: right;
   }
@@ -70,6 +72,10 @@ export default {
   }
   .item {
     display: inline-block;
+    width: 200px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 }
 /deep/ .el-button--mini {

src/pages/regulatoryRepository/standQA/index.vue

@@ -313,7 +313,7 @@
     </div>
     <span>相似历史问题：</span>
     <div  style="height: 200px; width: 80%; margin-left: 80px;">
-      <div v-for="item in historyList" :key="item.id" @click="historyJump(item.id)">
+      <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
         <span class="history-item">{{item.problemDescription}}</span>
         <span class="history-item">{{item.questionTime}}</span>
       </div>
@@ -778,12 +778,40 @@ export default {
         problemDescription: '',  //关键词/问题描述
       },
       answerList: [],
+      answer: '',
       standList: [],
+      standIdList: [],
       questionsList: [],
     }
   },
   mounted(){
-    this.standSearch()
+    if(this.$route.query.queId){
+      this.questionSerach.standardName = this.$route.query.standName
+      this.questionSerach.classification = this.$route.query.standType
+      this.activeName = this.$route.query.standType
+      this.standSearch()
+    }else{
+      switch (this.$route.query.standType){
+        case 'INLAND':
+          this.standSearch2()
+          break
+        case 'FOREIGN':
+          this.activeName = 'FOREIGN'
+          this.questionSerach.classification = 'FOREIGN'
+          this.standSearch2()
+          break
+        case 'BUSINESS_STAND':
+          this.activeName = 'BUSINESS_STAND'
+          this.questionSerach.classification = 'BUSINESS_STAND'
+          this.standSearch2()
+          break
+        case 'OTHER':
+          this.activeName = 'OTHER'
+          this.questionSerach.classification = 'OTHER'
+          this.standSearch2()
+          break
+      }
+    }
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
       _this: this,
@@ -808,8 +836,18 @@ export default {
       }
     }),
     //点击跳转问题详情
-    historyJump(id){
+    historyJump(item){
-      this.$router.push('/standQA')
+      this.$router.push({
+        path: '/standQA',
+        query:{
+            standId: item.standardId,
+            queId: item.id,
+            sourceType: 'dialog',
+            standType: item.classification,
+            standName: item.standardName,
+        }
+      })
+      this.dialogVisible = false
     },
     // 点击查看
     handlePreview(item) {
@@ -1049,7 +1087,6 @@ export default {
          _this: this
        }, res => {
          this.questionsList = res.data
-         console.log(this.questionsList);
        })
     },
     //回答查询
@@ -1069,6 +1106,29 @@ export default {
         _this: this
       }, res =>{
         this.standList = res.data
+        if(this.$route.query.queId){
+          this.activestand = this.standList[0].standardId
+          this.queSearch()
+        }
+      }, e => {
+      })
+    },
+    standSearch2(){
+      let qId = this.$route.query.standId
+      let queNumber = 0
+      this.standList = []
+      this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
+        _this: this
+      }, res =>{
+        res.data.forEach(item => {
+          if(item.standardId === qId){
+            this.standList.push(item)
+            queNumber++
+          }
+        })
+        if(queNumber === 0){
+          this.standList = res.data
+        }
       }, e => {
 
       })

src/pages/searchCenter/pages/standardSearch.vue

@@ -509,10 +509,31 @@
                 const list = items.filter ( item => !item.type || item.type === this.selectIndex);
                 return list
             },
-            checkItems (item) {
+           async checkItems (item) {
-                this.itermsConditionsFlag = true
+                let detilsData = await this.searchSarBykeyByDetils(item)
-                this.itermsConditionsTitle1 = item.textContent
+                if (detilsData.ok && detilsData.data) {
-                this.itermsConditionsTitle2 = item.textItems
+                    this.itermsConditionsFlag = true
+                    this.itermsConditionsTitle1 = detilsData.data.textContent.replace(/null/g, '- -')
+                    this.itermsConditionsTitle2 = detilsData.data.textItems
+                } else {
+                }
+            },
+
+            searchSarBykeyByDetils(item) {
+                return new Promise((resolve, reject) => {
+                    const allList = {}
+                    allList.selectIndex = 'fulltextserch'
+                    allList.selectValue = this.keywords
+                    allList.standId = item.id
+                    this.$http.post('search/searchCenter/searchSarBykeyByDetils', allList, {
+                        _this: this,
+                        loading: 'resultLoading'
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    }, e => {
+                    })
+                })
             },
             itermsConditionsClose () {
                 this.itermsConditionsFlag = false