Merge branch 'fix_foton_20240430'

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step1.vue

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -245,6 +245,7 @@
 
               <div style="width: 20%;">
                 <el-button
+                  v-if="historyVersionUploadButton"
                   type="primary"
                   class="common-button-primary"
                   size="mini"
@@ -904,6 +905,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 是否展示 过程稿件 历史版本的上传文件按钮
+    historyVersionUploadButton: {
+      type: Boolean,
+      default: true
+    }
   },
   data () {
     return {

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -181,7 +181,7 @@
                       </div>
                     </div>
                     <div style="width: 20%;">
-                      <el-button
+<!--                      <el-button
                         :disabled="disabledXX"
                         type="primary"
                         class="common-button-primary"
@@ -190,7 +190,7 @@
                         @click="fileUpload('LSBBBUSS')"
                       >
                         <i class="el-icon-upload" />
-                      </el-button>
+                      </el-button>-->
                     </div>
                   </div>
                 </el-form-item>
@@ -832,7 +832,7 @@
                         :disabled="disabledXX"
                         readonly="readonly"
                         placeholder="选择研究总院主管副院长"
-                          @click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
+                        @click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
                       />
                     </div>
                   </el-form-item>
@@ -1083,15 +1083,6 @@
       :nodeList="nodeList"
       @checkedRole="checkedRole"
     />
-
-    <!--选择研究总院主管副院长-->
-    <Role-tree
-        v-if="!disabledXX"
-        :is-title="drawerTitle"
-        :is-visible.sync="modalShowFlagZHR"
-        :nodeList="nodeList"
-        @checkedRole="checkedRoleZHR"
-    />
     <!-- 选择标准的弹框 -->
     <el-drawer
       v-if="!disabledXX"
@@ -1768,7 +1759,6 @@ export default {
       modalShowFlag: false, // drawer开关
       showreceive: false,
       modalShowRoleFlag: false, // drawer开关
-      modalShowFlagZHR: false, // drawer开关
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
@@ -2315,20 +2305,6 @@ export default {
       const res = new Map();
       return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
     },
-    checkedRoleZHR (data) {
-      let idList = ''
-      let nameList = ''
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ','
-          idList += ','
-        }
-        idList += item.id
-        nameList += item.name
-      })
-      this.roleForm.zhrUserId = idList
-      this.roleForm.zhrUserName = nameList
-    },
     checkedRole (data) {
       if (this.type === 0) {
         this.roleForm.deptUserId = data[0].id
@@ -2794,13 +2770,6 @@ export default {
       this.drawerTitle = title
       this.modalShowFlag = true
     },
-    choiceZHR (type, title, id) {
-      this.nodeList = []
-      this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
-      this.userType = type
-      this.drawerTitle = title
-      this.modalShowFlagZHR = true
-    },
     choiceZRRS (row, type, index) {
       this.type = type
       if (type === 1) {

src/pages/processCenter/pages/creatProcess/qbrk/step1.vue

@@ -265,7 +265,7 @@
                       </div>
                     </div>
                     <div style="width: 20%;">
-                      <el-button
+<!--                      <el-button
                         :disabled="disabledXX"
                         type="primary"
                         class="common-button-primary"
@@ -274,7 +274,7 @@
                         @click="fileUpload('LSBBBUSS')"
                       >
                         <i class="el-icon-upload" />
-                      </el-button>
+                      </el-button>-->
                     </div>
                   </div>
                 </el-form-item>
@@ -995,7 +995,7 @@
                         :disabled="disabledXX"
                         readonly="readonly"
                         placeholder="选择研究总院主管副院长"
-                          @click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
+                        @click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
                       />
                     </div>
                   </el-form-item>
@@ -1247,15 +1247,6 @@
       :nodeList="nodeList"
       @checkedRole="checkedRole"
     />
-
-    <!--选择研究总院主管副院长-->
-    <Role-tree
-        v-if="!disabledXX"
-        :is-title="drawerTitle"
-        :is-visible.sync="modalShowFlagZHR"
-        :nodeList="nodeList"
-        @checkedRole="checkedRoleZHR"
-    />
     <!--        <el-drawer v-if="!disabledXX" -->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -2009,7 +2000,6 @@ export default {
       key3: 4,
       treeData: [], // 人员数据
       modalShowFlag: false, // drawer开关
-      modalShowFlagZHR: false, // drawer开关
       modalShowRoleFlag: false, // drawer开关
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
@@ -2570,20 +2560,6 @@ export default {
       const res = new Map();
       return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
     },
-    checkedRoleZHR (data) {
-      let idList = ''
-      let nameList = ''
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ','
-          idList += ','
-        }
-        idList += item.id
-        nameList += item.name
-      })
-      this.roleForm.zhrUserId = idList
-      this.roleForm.zhrUserName = nameList
-    },
     checkedRole (data) {
       if (this.type === 0) {
         this.roleForm.deptUserId = data[0].id
@@ -3148,13 +3124,6 @@ export default {
       this.drawerTitle = title
       this.modalShowFlag = true
     },
-    choiceZHR (type, title, id) {
-      this.nodeList = []
-      this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
-      this.userType = type
-      this.drawerTitle = title
-      this.modalShowFlagZHR = true
-    },
     choiceZRRS (row, type, index) {
       this.type = type
       if (type === 1) {

src/pages/processCenter/pages/creatProcess/qbrk/step12.vue

@@ -20,6 +20,7 @@
       >
         <div style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :formSub="form"
             :FBGBUSSFileListSub="FBGBUSSFileList"

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -20,6 +20,7 @@
       >
         <div style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :form="form"
             :isTrue="true"

src/pages/processCenter/pages/creatProcess/qbrk/step3.vue

@@ -20,6 +20,7 @@
       >
         <div style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :formSub="form"
             :isTrue="true"

src/pages/processCenter/pages/creatProcess/qbrk/step6.vue

@@ -150,6 +150,7 @@
         </div>
         <div v-show="active === '2'" style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :isTrue="true"
             :formSub="form"

src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue

@@ -148,6 +148,7 @@
         </div>
         <div v-show="active === '2'" style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :formSub="form"
             :is-true="true"

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -20,6 +20,7 @@
       >
         <div style="flex: auto;overflow: auto">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :formSub="form"
             :isTrue="true"

src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue

@@ -150,6 +150,7 @@
         </div>
         <div v-show="active === '2'" style="flex: auto;">
           <formEditList
+            :historyVersionUploadButton="false"
             :key="formKey"
             :formSub="form"
             :is-true="true"

src/pages/processCenter/pages/phone/qbrk-product/step10.vue

@@ -1920,7 +1920,7 @@ export default {
           this.saveLoading = true
           this.form.commentText = this.formTongGuo.commentText
           this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-          const json = JSON.stringify(this.form);
+          const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
             userId : this.userId,

src/pages/processCenter/pages/phone/qbrk-product/step12.vue

@@ -1920,7 +1920,7 @@ export default {
           this.saveLoading = true
           this.form.commentText = this.formTongGuo.commentText
           this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-          const json = JSON.stringify(this.form);
+          const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
             userId : this.userId,

src/pages/processCenter/pages/phone/qbrk-product/step4.vue

@@ -1918,7 +1918,7 @@ export default {
           this.saveLoading = true
           this.form.commentText = this.formTongGuo.commentText
           this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-          const json = JSON.stringify(this.form);
+          const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
             userId : this.userId,

src/pages/processCenter/pages/phone/qbrk-product/step7.vue

@@ -2014,7 +2014,7 @@ export default {
               this.saveLoading = true
               this.form.commentText = this.formTongGuo.commentText
               this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-              const json = JSON.stringify(this.form);
+              const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
               this.$http.post('lawss/activiti/completeTask', {
                 taskIds: this.taskIds,
                 userId : this.userId,

src/pages/processCenter/pages/phone/qbrk-product/step8.vue

@@ -1920,7 +1920,7 @@ export default {
           this.saveLoading = true
           this.form.commentText = this.formTongGuo.commentText
           this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-          const json = JSON.stringify(this.form);
+          const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
             userId : this.userId,

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -950,7 +950,7 @@ export default {
         if (this.saveExportType === "apart") {
           if (this.selectedList != null && this.selectedList != "") {
             const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
-              "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+              "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName + "&id=" + this.pageId;
             window.open(exportURL);
             this.$message.success("导出信息成功");
           }