From 36091d86113c7f4b2cc7c20d62647f23745425ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Jun 2022 13:36:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E7=AD=94=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 12 ++++
 .../details/otherStandardDetails/index.vue    | 13 +++-
 .../components/questions-item.vue             |  1 -
 .../personal/pages/my-questions/index.vue     | 16 ++++-
 .../standQA/components/questionItemInfo.vue   |  1 +
 .../standQA/components/questions-item.vue     | 40 ++++++-----
 .../regulatoryRepository/standQA/index.vue    | 70 +++++++++++++++++--
 7 files changed, 124 insertions(+), 29 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index cd58896bc..dd53790ec 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/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', {
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 7d92ae364..cefcccc97 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/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.getKnowList()
+      this.$router.push({
+        path: '/standQA',
+        query:{
+          standId: this.$route.params.id,
+          standType: this.sarStandardsInfoEO.standType,
+          sourceType: 'details',
+        }
+      })
     },
     // 获取知识点列表数据
     getKnowList() {
diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue
index b7c409f56..a4f3fb635 100644
--- a/src/pages/personal/pages/my-questions/components/questions-item.vue
+++ b/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);
       }
     }
   }
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 81ea17608..b2bddf81f 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/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){
-      this.$router.push('/standQA')
+    historyJump(item){
+      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) {
diff --git a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
index 00b0653e1..6e40ad4fb 100644
--- a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
+++ b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
@@ -48,6 +48,7 @@ export default {
       deep: true,
       handler(val) {
         this.answer = val
+        console.log(val);
       }
     }
   }
diff --git a/src/pages/regulatoryRepository/standQA/components/questions-item.vue b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
index 82d5f6d9e..4964aa64b 100644
--- a/src/pages/regulatoryRepository/standQA/components/questions-item.vue
+++ b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
@@ -1,26 +1,28 @@
 <!--问题的描述-->
 <template>
-<div id="questions-item">
-  <div>
-    <el-button class="dybtn"  size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
-  </div>
-  <div>
-    <div class="row">
-      <div class="item">
-        <div>提问：
-         <span>{{question.problemDescription}}</span>
+  <div style="width: 100%;padding: 10px 0;">
+    <div id="questions-item">
+    <div>
+      <el-button class="dybtn"  size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
+    </div>
+    <div>
+      <div class="row">
+        <div class="item">
+          <div>提问：
+            <span>{{question.problemDescription}}</span>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="row">
-      <div class="item">
-        <div>{{answer.answerer}}
-          <span>{{question.questionTime}}</span>
+      <div class="row">
+        <div class="item">
+          <div>{{question.answerer}}
+            <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;
-  padding:10px 0;
+  min-width: 200px;
   .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 {
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 8cc76e9ab..3a2c1f72e 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/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){
-      this.$router.push('/standQA')
+    historyJump(item){
+      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 => {
 
       })

From f5b0be52da1a9e929cd25a66d93f40c6d71b8d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Jun 2022 14:22:35 +0800
Subject: [PATCH 2/4] commit

---
 src/pages/processCenter/pages/phone/bzdy/step4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue
index 3d1bad651..abab08d92 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step4.vue
+++ b/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

From 79fcf9bf94bef673d12ab34ef5bf943c5241243b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Jun 2022 15:20:41 +0800
Subject: [PATCH 3/4] commit

---
 src/pages/processCenter/pages/phone/bzzqyj/step2.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
index e4837618b..30769626e 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
@@ -83,6 +83,7 @@
                 @save="handleSave"
                 @submit="handleSubmit"
                 show-transfer
+                show-save
                 @transfer="handleTransfer"
         >
         </ProcessFooter>

From 022105e889df43251936ca5987cd6d94ef899452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 10 Jun 2022 15:29:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?52864=20=E3=80=90WELINK=E3=80=91=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=89=B9?=
 =?UTF-8?q?=E5=87=86=E8=8A=82=E7=82=B9=EF=BC=9A=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=BA=94=E4=B8=8EPC=E7=AB=AF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/phone/bzjd/step6.vue  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue
index 4cb7d0bf2..cd74c85f2 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step6.vue
+++ b/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
-                show-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @submit="handleSubmit"
-                show-back
-                show-transfer
-                @transfer="handleTransfer"
-                @back="handleSubmitNo"
-                submitBTNText="同意"
-        >
-        </ProcessFooter>
+      <ProcessFooter
+        show-submit
+        :submitLoading="isSubmit"
+        :saveLoading="saveLoading"
+        @submit="handleSubmit"
+        show-transfer
+        @transfer="handleTransfer"
+        submitBTNText="同意"
+      >
+      </ProcessFooter>
       <phone-role
         role-title="转办处理人"
         :is-show-phone.sync="drawerModal"