合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!49

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

@@ -44,7 +44,8 @@ export default {
     },
     getDetail(){
       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
-        id: this.attId
+        id: this.attId,
+        userId: this.$store.getters.userInfo.userId
       },{
         _this: this
       }, res => {

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

@@ -1724,7 +1724,8 @@ export default {
        this.dataLoading = true
        sessionStorage.setItem('queId', this.activeQue)
        this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
-         id: this.activeQue
+         id: this.activeQue,
+         userId: this.$store.getters.userInfo.userId
        },{
          _this: this
        }, res => {

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

@@ -662,6 +662,18 @@
             <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
         </div>
     </el-dialog>
+    <!--意见提示-->
+    <el-dialog
+        title="提示"
+        :visible.sync="opinionDialogVisible"
+        top="30vh"
+        width="400px">
+      <span>当前征询意见暂无，请确认是否提交</span>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="opinionDialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="opinionClick">确 定</el-button>
+    </span>
+    </el-dialog>
     <Role-tree
             is-title="选择责任部门对接人"
             :is-visible.sync="modalShowRoleFlag"
@@ -1393,6 +1405,7 @@
                 syrzOptions:[],//适用认证下拉框
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
+                opinionDialogVisible: false
             }
         },
         watch:{
@@ -2902,41 +2915,47 @@
                         if (valid) {
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
-                                    this.isSubmit = true
+                                  if(this.form.modelData.length === 0){
-                                    this.saveLoading = true
+                                    this.opinionDialogVisible = true
-
+                                  }else{
-                                    this.summary=this.summaryList.map(item => item.id).join(",")
+                                    this.commentTextHandle();
-                                    this.summaryName=this.summaryList.map(item => item.name).join(",")
+                                  }
-
+                                    // this.isSubmit = true
-                                    this.form.commentText = this.formTongGuo.commentText
+                                    // this.saveLoading = true
-                                    // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    //
-                                    // 会签意见存储
+                                    // this.summary=this.summaryList.map(item => item.id).join(",")
-                                    const json = JSON.stringify(this.form);
+                                    // this.summaryName=this.summaryList.map(item => item.name).join(",")
-                                    this.$http.post('lawss/activiti/completeTask', {
+                                    //
-                                        taskIds: this.taskIds,
+                                    // this.form.commentText = this.formTongGuo.commentText
-                                        userId : this.userId,
+                                    //
-                                        json: json
+                                    // // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                    }, {
+                                    // // 会签意见存储
-                                        _this: this
+                                    // const json = JSON.stringify(this.form);
-                                    }, res => {
+                                    // this.$http.post('lawss/activiti/completeTask', {
-                                        if (res.success) {
+                                    //     taskIds: this.taskIds,
-                                            this.$message.success(res.message)
+                                    //     userId : this.userId,
-                                            // 流程提交之后，应该流转至待办任务页面
+                                    //     json: json
-                                            this.isSubmit = false
+                                    // }, {
-                                            this.saveLoading = false
+                                    //     _this: this
-                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                    // }, res => {
-                                            // if(this.formTongGuo.approvalOpinion === '1'){
+                                    //     if (res.success) {
-                                            //     this.$message.warning("驳回成功")
+                                    //         this.$message.success(res.message)
-                                            //     this.isSubmit = false
+                                    //         // 流程提交之后，应该流转至待办任务页面
-                                            //     // 流程提交之后，应该流转至待办任务页面
+                                    //         this.isSubmit = false
-                                            //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                    //         this.saveLoading = false
-                                            // }else{
+                                    //         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            //     this.processCreateLaws(json)
+                                    //         // if(this.formTongGuo.approvalOpinion === '1'){
-                                            // }
+                                    //         //     this.$message.warning("驳回成功")
-                                        }else {
+                                    //         //     this.isSubmit = false
-                                            this.$message.success(res.message)
+                                    //         //     // 流程提交之后，应该流转至待办任务页面
-                                        }
+                                    //         //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                    })
+                                    //         // }else{
+                                    //         //     this.processCreateLaws(json)
+                                    //         // }
+                                    //     }else {
+                                    //         this.$message.success(res.message)
+                                    //     }
+                                    // })
                                 }else {
                                   this.$message.warning('请确认是否填写完整')
                                 }
@@ -2946,6 +2965,39 @@
                         }
                 })
             },
+            opinionClick(){
+              this.opinionDialogVisible = false
+              this.commentTextHandle();
+            },
+            commentTextHandle(){
+              this.isSubmit = true
+              this.saveLoading = true
+
+              this.summary=this.summaryList.map(item => item.id).join(",")
+              this.summaryName=this.summaryList.map(item => item.name).join(",")
+
+              this.form.commentText = this.formTongGuo.commentText
+
+              // 会签意见存储
+              const json = JSON.stringify(this.form);
+              this.$http.post('lawss/activiti/completeTask', {
+                taskIds: this.taskIds,
+                userId : this.userId,
+                json: json
+              }, {
+                _this: this
+              }, res => {
+                if (res.success) {
+                  this.$message.success(res.message)
+                  // 流程提交之后，应该流转至待办任务页面
+                  this.isSubmit = false
+                  this.saveLoading = false
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                }else {
+                  this.$message.success(res.message)
+                }
+              })
+            },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
                     _this: this

src/pages/regulatoryRepository/standQA/index.vue

@@ -691,7 +691,8 @@ export default {
       console.log('row = ', row)
       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
         id: row.id,
-        state: 'yes'
+        state: 'yes',
+        userId: this.$store.getters.userInfo.userId
       },{
         _this: this
       }, res => {

src/pages/regulatoryRepository/standQA/index2.vue

@@ -1037,7 +1037,8 @@ export default {
       sessionStorage.setItem('queId', this.activeQue)
        this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
          id: this.activeQue,
-         state: 'yes'
+         state: 'yes',
+         userId: this.$store.getters.userInfo.userId
        },{
          _this: this
        }, res => {