From 4a5b42b6c3ca369a01b1d3c6fa50825ea4a64aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 7 Jun 2022 11:11:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-questions/components/stand-item.vue    | 14 +--
 .../personal/pages/my-questions/index.vue     | 12 +++
 .../standQA/components/questionItemInfo.vue   | 13 +--
 .../standQA/components/questions-item.vue     |  9 ++
 .../standQA/components/stand-item.vue         | 14 +--
 .../regulatoryRepository/standQA/index.vue    | 90 +++++++++++--------
 6 files changed, 96 insertions(+), 56 deletions(-)

diff --git a/src/pages/personal/pages/my-questions/components/stand-item.vue b/src/pages/personal/pages/my-questions/components/stand-item.vue
index 585498bb7..ada2d7335 100644
--- a/src/pages/personal/pages/my-questions/components/stand-item.vue
+++ b/src/pages/personal/pages/my-questions/components/stand-item.vue
@@ -1,7 +1,7 @@
 <!--标准的描述-->
 <template>
-  <div id="stand-item">
-    <div>
+  <div style="width: 100%;padding: 10px 0;">
+    <div id="stand-item">
       <div class="row">
         <div class="item">
           <span>{{stand.standardEncdoing}}</span>
@@ -9,7 +9,7 @@
       </div>
       <div class="row">
         <div class="item">
-          <span>{{stand.standardName}}</span>
+          <span :title="stand.standardEncdoing + stand.standardName">{{stand.standardName}}</span>
         </div>
       </div>
     </div>
@@ -40,14 +40,18 @@ export default {
 
 <style lang="less" scoped>
 #stand-item{
-  width: 100%;
   min-width: 130px;
-  padding:10px 0;
+  max-width: 200px;
+
   .row {
     line-height: 1.5;
   }
   .item {
     display: inline-block;
+    width: 200px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 }
 </style>
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 6ab4f5065..33d5fc532 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -1341,6 +1341,7 @@ export default {
     },
     addList() {
       this.handleSelectForm.dataSource = this.standType
+      this.handleSelectForm.standType = this.standType
       this.searchLawBtn()
       this.standModel = true;
     },
@@ -1541,6 +1542,16 @@ export default {
     },
     //提问按钮
     queBtn(){
+      this.questionForm = {
+        pubQue :  '',//公共问题
+        classification: 'INLAND', //标准类型
+        problemDescription: '', //问题
+        questioner: this.$store.getters.userInfo.userId, //提问人
+        standardEncdoing: '',  //标准编号
+        standardName: '',   //标准名称
+        standardId:'',   //标准id
+        fileList: '',
+      }
       this.dialogVisible = true
     },
     handleClose(){
@@ -1676,6 +1687,7 @@ export default {
                 _this: this
               }, res => {
                 console.log(res);
+                this.dialogVisible = false
               }, e => {
 
               })
diff --git a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
index 4ce7073a7..cce1dd688 100644
--- a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
+++ b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
@@ -11,8 +11,8 @@
       </div>
       <div class="row">
         <div class="item">
-          <div>附件：
-            <span style="color: #409EFF">{{answer.annex}}</span>
+          <div style="cursor: pointer;">附件：
+            <span style="color: #409EFF">{{answer.appendixName}}</span>
           </div>
         </div>
       </div>
@@ -23,13 +23,7 @@
           </div>
         </div>
       </div>
-<!--      <div>-->
-<!--        <el-checkbox v-model="checked">归档</el-checkbox>-->
-<!--      </div>-->
     </div>
-<!--    <div class="footer-box">-->
-
-<!--    </div>-->
   </div>
 </template>
 
@@ -39,9 +33,10 @@ export default {
   props:['answer'],
   data(){
     return{
-      checked: true,
     }
   },
+  methods:{
+  },
   watch:{
     answer: {
       immediate: true,
diff --git a/src/pages/regulatoryRepository/standQA/components/questions-item.vue b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
index 660898090..026fe0193 100644
--- a/src/pages/regulatoryRepository/standQA/components/questions-item.vue
+++ b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
@@ -1,6 +1,9 @@
 <!--问题的描述-->
 <template>
 <div id="questions-item">
+  <div>
+    <el-button class="dybtn"  size="mini" type="primary">订阅</el-button>
+  </div>
   <div>
     <div class="row">
       <div class="item">
@@ -47,6 +50,9 @@ export default {
   width: 100%;
   min-width: 130px;
   padding:10px 0;
+  .dybtn{
+    float: right;
+  }
   .row {
     line-height: 1.8;
   }
@@ -54,4 +60,7 @@ export default {
     display: inline-block;
   }
 }
+/deep/ .el-button--mini {
+  padding: 5px;
+}
 </style>
diff --git a/src/pages/regulatoryRepository/standQA/components/stand-item.vue b/src/pages/regulatoryRepository/standQA/components/stand-item.vue
index 585498bb7..ada2d7335 100644
--- a/src/pages/regulatoryRepository/standQA/components/stand-item.vue
+++ b/src/pages/regulatoryRepository/standQA/components/stand-item.vue
@@ -1,7 +1,7 @@
 <!--标准的描述-->
 <template>
-  <div id="stand-item">
-    <div>
+  <div style="width: 100%;padding: 10px 0;">
+    <div id="stand-item">
       <div class="row">
         <div class="item">
           <span>{{stand.standardEncdoing}}</span>
@@ -9,7 +9,7 @@
       </div>
       <div class="row">
         <div class="item">
-          <span>{{stand.standardName}}</span>
+          <span :title="stand.standardEncdoing + stand.standardName">{{stand.standardName}}</span>
         </div>
       </div>
     </div>
@@ -40,14 +40,18 @@ export default {
 
 <style lang="less" scoped>
 #stand-item{
-  width: 100%;
   min-width: 130px;
-  padding:10px 0;
+  max-width: 200px;
+
   .row {
     line-height: 1.5;
   }
   .item {
     display: inline-block;
+    width: 200px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 }
 </style>
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 5b9c4f4c1..9185984f7 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -19,7 +19,7 @@
          <el-button size="mini"  @click="delSearch">清空</el-button>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini" type="primary" @click="queBtn" v-if="this.activeName !=='myQue'">提问</el-button>
+         <el-button size="mini" type="primary" @click="queBtn">提问</el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -277,15 +277,17 @@
             <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
             <el-radio  label="OTHER">公共</el-radio>
           </el-radio-group>
-          <el-button size="mini" v-if="standType !== 'OTHER'" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
-          <el-select v-if="standType === 'OTHER'" v-model="questionForm.publicType" filterable clearable placeholder="请选择公共" style="margin-left: 30px;appearance: none">
-            <el-option
-                    v-for="(item, index) in DYGGWT"
-                    :key="index"
-                    :value="item.value"
-                    :label="item.label"
-            ></el-option>
-          </el-select>
+          <div style="display: inline-block; margin-left: 20px"  v-if="standType === 'OTHER'">
+            <el-select v-model="questionForm.pubQue" placeholder="请选择公共问题">
+              <el-option
+                v-for="item in pubOptions"
+                :key="item.label"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
+          </div>
+          <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
         </el-form-item>
         <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
           <el-input v-model="questionForm.problemDescription"></el-input>
@@ -706,6 +708,7 @@ export default {
   },
   data(){
     return{
+      pubOptions: [], //公共问题
       handleSelectForm: {
         standName: '', //标准名称
         numberName: '', //政策名称
@@ -735,7 +738,7 @@ export default {
       // 上传地址
       actionPath: 'api/att/attFile/uploadNew',
       fileList: [], //上传文件的列表
-      activeName: 'myQue',
+      activeName: 'INLAND',
       activeType: 'INLAND',
       activestand: '',
       activeQue: '',
@@ -744,7 +747,6 @@ export default {
       questionForm:{
         classification: 'INLAND', //标准类型
         problemDescription: '', //问题
-        questioner: this.$store.getters.userInfo.userId, //提问人
         standardEncdoing: '',  //标准编号
         standardName: '',   //标准名称
         standardId:'',   //标准id
@@ -760,7 +762,6 @@ export default {
         classification: 'INLAND',
         standardName: '',  //标准名称
         standardEncdoing: '', //标准编号
-        questioner: this.$store.getters.userInfo.userId,   //提问人
         problemDescription: '',  //关键词/问题描述
       },
       answerList: [],
@@ -777,7 +778,7 @@ export default {
     }, res => {
       this.setMap(res.data.WBZTCLASS);// 文本状态
       this.textState = res.data.WBZTCLASS // 文本状态
-      this.DYGGWT = res.data.DYGGWT // 问答公共问题
+      this.pubOptions = res.data.DYGGWT  //问答公共问题
     }, e => {
     });
   },
@@ -819,6 +820,7 @@ export default {
     },
     addList() {
       this.handleSelectForm.dataSource = this.standType
+      this.handleSelectForm.standType = this.standType
       this.searchLawBtn()
       this.standModel = true;
     },
@@ -951,11 +953,10 @@ export default {
       this.questionForm.classification = this.standType
     },
     handleClick(){
-      console.log(this.activeName);
       this.ansSearch()
     },
     sourceClick(){
-      this.questionSerach.classification = this.activeType
+      this.questionSerach.classification = this.activeName
       this.questionSerach.standardEncdoing = ''
       this.standSearch()
     },
@@ -975,6 +976,15 @@ export default {
     },
     //提问按钮
     queBtn(){
+      this.questionForm = {
+          pubQue :  '',//公共问题
+          classification: 'INLAND', //标准类型
+          problemDescription: '', //问题
+          standardEncdoing: '',  //标准编号
+          standardName: '',   //标准名称
+          standardId:'',   //标准id
+          fileList: '',
+      }
       this.dialogVisible = true
     },
     handleClose(){
@@ -1006,7 +1016,7 @@ export default {
 
       })
     },
-    //查询标准
+    //查询提问标准
     standSearch(){
       this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
         _this: this
@@ -1082,27 +1092,33 @@ export default {
       // this.questionForm.fileInfo = list
     },
     //提交问题
-    queSubmit(){
-      if(this.questionForm.standardId){
-        this.questionForm.fileList = this.fileList
-        this.$refs['queForm'].validate((valid) => {
-          if(valid){
-            this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
-              {
-                _this: this
-              }, res => {
-                console.log(res);
-              }, e => {
+      queSubmit(){
+        if(this.standType === 'OTHER'){
+          this.questionForm.standardId = this.questionForm.pubQue
+          this.questionForm.standardName = this.questionForm.pubQue
+          this.questionForm.standardEncdoing = this.questionForm.pubQue
+        }
+        if(this.questionForm.standardId){
+          this.questionForm.fileList = this.fileList
+          this.$refs['queForm'].validate((valid) => {
+            if(valid){
+              this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
+                {
+                  _this: this
+                }, res => {
+                  console.log(res);
+                  this.dialogVisible = false
+                }, e => {
 
-              })
-          }else{
-            return this.$message.warning('请输入问题')
-          }
-        })
-      }else{
-        this.$message.warning('请选择至少一条标准')
-      }
-    },
+                })
+            }else{
+              return this.$message.warning('请输入问题')
+            }
+          })
+        }else{
+          this.$message.warning('请选择至少一条标准')
+        }
+      },
   },
 };
 </script>

From b963899daeac9b5b99ab5c84d3d20db25a69e18e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 7 Jun 2022 11:32:37 +0800
Subject: [PATCH 2/3] feat: There is no way the, bug 52907 52906

---
 .../components/EnterpriseStandardDatabase.vue       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index c61b5cab7..efa335a82 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -583,6 +583,7 @@
                       clearable
                       :title="sarBussionessStandEO[field.attrField]"
                       v-model="sarBussionessStandEO[field.attrField]"
+                      @blur="filterData(sarBussionessStandEO[field.attrField])"
                       :disabled="formdisableflag" placeholder="选择起草部门">
                     </el-input>
                     <el-button
@@ -2453,6 +2454,16 @@ export default {
     }
   },
   methods: {
+    filterData(data){
+      let result = ''
+      let str1 = data.substring(0,1);
+      if(str1 === ','){
+        result = data.substring(1,data.length)
+        this.sarBussionessStandEO['QCDW'] = result
+      }else {
+        this.sarBussionessStandEO['QCDW'] = data
+      }
+    },
     async getTreeAsync(){
 
       let tsResource = await this.selectMenuList()
@@ -5155,7 +5166,7 @@ export default {
     'sarBussionessStandEO.QCDW'(val) {
       let arr = val.split(',')
       arr.forEach((item, index) => {
-        if (item === undefined || item === 'undefined') {
+        if (item === undefined || item === 'undefined' || item === '') {
           arr.splice(index, 1)
         }
       })

From 42cf3629369e3f6554754d93ee87654663721d6a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 7 Jun 2022 11:44:43 +0800
Subject: [PATCH 3/3] feat: There is no way the, bug 52907 52906

---
 .../components/EnterpriseStandardDatabase.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index efa335a82..ba862b932 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2455,14 +2455,17 @@ export default {
   },
   methods: {
     filterData(data){
-      let result = ''
-      let str1 = data.substring(0,1);
-      if(str1 === ','){
-        result = data.substring(1,data.length)
-        this.sarBussionessStandEO['QCDW'] = result
-      }else {
-        this.sarBussionessStandEO['QCDW'] = data
-      }
+        if(data.indexOf(",") !== -1){
+            let permission = data.split(",");
+            const list = permission.filter ( item => item !== '');
+            let nameNew=Array.from(list).join(',')
+            if(nameNew.length > 0){
+                nameNew = nameNew.replace("undefined","").replace(",,",",")
+            }
+            this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)
+        }else {
+            this.sarBussionessStandEO['QCDW'] = data
+        }
     },
     async getTreeAsync(){