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

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

@@ -40,7 +40,7 @@ export default {
   },
   methods:{
     back() {
-      this.$router.push({path: "/questions"});
+      this.$router.go(-1)
     },
     getDetail(){
       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{

src/pages/phone/domesticDetails.vue

@@ -74,6 +74,46 @@
                       </p>
                     </template>
                     <template v-else-if="child.value === null">-</template>
+                    <!--发布稿（必读）-->
+                    <template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0">
+                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                        <label style="float: left">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0" >
+                          <div style="position: relative;margin-left: 214px; line-height: 32px">
+                            <div v-for="(file, fileIndex) in child6Func(child.value)" style="display: flex;">
+                              <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
+                                <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
+                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                   :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                                <i title="下载" @click="downloadFile(file.id)" class="icon-download"
+                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
+                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                              </span>
+                              <!--多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
+                                <span style="display: flex; align-items: center;">
+                                  <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                     :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"
+                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                  />
+                                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
+                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                  />
+                                </span>
+                              </div>
+                            </div>
+                            <el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单
+                            </el-button>
+                          </div>
+                        </template>
+                        <template v-else-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <template v-else-if="child.value === null">-</template>
                     <!--修订本-->
                     <template v-for="(child, childIndex) in item.child5">
                       <p class="files-title">
@@ -300,7 +340,7 @@
               <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
                 <!--                增补件（必读）和勘误件不放在过程稿件里了-->
                 <div
-                  v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
+                  v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' "
                   :key="child.id"
                   :class="'modular-item half'"
                 >
@@ -1805,6 +1845,14 @@
         }
         return child5
       },
+      child6Func(child6) {
+        const list = []
+        if (child6 && child6.length > 1) {
+          list.push(child6[0])
+          return list
+        }
+        return child6
+      },
       handleChange(val) {
       },
       handleChange1(val) {
@@ -3355,6 +3403,14 @@
               location['child5'] = childList
 
             }
+            //修订本
+            if (!list[0].child) {
+              location['child6'] = []
+            } else {
+              const childList = list[0].child.filter(item => item.attrField === 'FBGYWBD');
+              location['child6'] = childList
+
+            }
           }
           // 动态属性字段-SYRZ 单独添加至基础信息
           const list2 = displayLocation.filter(item => item.label === '适用范围');

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

@@ -166,6 +166,14 @@
                 - -
               </div>
             </el-form-item>
+            <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+              <div v-if="fbgywbdFileMap.length>0" v-for="(value,index)  in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
+                <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+              </div>
+              <div v-else>
+                - -
+              </div>
+            </el-form-item>
             <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
               <div v-if="zbjbdFileMap.length>0" v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                 <span style="" @click="downloadFile('zbjbd',value.id)" :title="value.name">{{ value.name  }}</span>
@@ -455,6 +463,7 @@ export default {
       textStatusMap: {}, // 文本状态id与name对应
       xgdFileMap: [],
       fbgbjbdFileMap: [],
+      fbgywbdFileMap: [],
       bpgFileMap: [],
       ssgFileMap: [],
       zqyjgFileMap: [],
@@ -531,6 +540,7 @@ export default {
         // 文本信息
         ca: '', // 草案
         fbgbjbd: '', // 发布稿
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -541,6 +551,7 @@ export default {
         kwj: '', // 勘误件
         caName: '', // 草案
         fbgbjbdName: '', // 发布稿
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -5472,7 +5472,8 @@ export default {
           loading: 'isSubmit'
         }, res => {
           if (res.ok) {
-            this.configStandFlag = false
+            this.cancelConfigStand()
+            // this.configStandFlag = false
             // this.$message({
             //   showClose: true,
             //   message: '配置标准成功!',

src/pages/regulatoryRepository/standQA/index.vue

@@ -720,15 +720,21 @@ export default {
     //点击跳转问题详情
     historyJump(item){
       this.$router.push({
-        path: '/standQA',
-        query:{
-            standId: item.standardId,
-            queId: item.id,
-            sourceType: 'dialog',
-            standType: item.classification,
-            standName: item.standardName,
+        path: "/questionDetail",
+        query: {
+          id: item.id
         }
-      })
+      });
+      // this.$router.push({
+      //   path: '/standQA',
+      //   query:{
+      //       standId: item.standardId,
+      //       queId: item.id,
+      //       sourceType: 'dialog',
+      //       standType: item.classification,
+      //       standName: item.standardName,
+      //   }
+      // })
       this.dialogVisible = false
     },
     // 点击查看