合并分支 'dev_20230216' 到 'master'

Dev 20230216

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

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

@@ -165,19 +165,27 @@ export default {
               _this: this
             }, res => {
               if(this.list.length === 0){
-                this.deleteReplyToenNotice()
+                this.$http.get('lawss/activiti/selectWenDan', {
-                    .then(res => {
+                  taskId: this.$route.query.taskIds,
-                      this.$http.post("lawss/activiti/completeTask", {
+                }, {
-                        json: JSON.stringify(this.form),
+                  _this: this
-                        taskId: this.$route.query.taskIds,
+                }, res => {
-                        userId: this.$store.getters.userInfo.userId
+                  this.form = Object.assign(this.form,res)
-                      }, {}, res => {
+                  this.deleteReplyToenNotice()
+                      .then(res => {
+                        this.$http.post("lawss/activiti/completeTask", {
+                          json: JSON.stringify(this.form),
+                          taskId: this.$route.query.taskIds,
+                          userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
 
-                      });
+                        });
-                      this.form.reply = ''
+                        this.form.reply = ''
-                      this.fileList = []
+                        this.fileList = []
-                      this.$emit('emitInsState',true)
+                        this.$emit('emitInsState',true)
-                    }).catch(e => console.log(e))
+                      }).catch(e => console.log(e))
+                }, e => {
+                })
               }else{
                 this.$http.post("lawss/activiti/completeTask", {
                   json: JSON.stringify(this.form),

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

@@ -26,7 +26,8 @@
         </div>
       </div>
       <div style="float: right; margin-top: 20px">
-        <el-checkbox v-if="answer.checkedShow && archiveVerify()" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
+        <!--<el-checkbox v-if="answer.checkedShow && archiveVerify()" @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>-->
+        <el-checkbox @change="answerChang" :disabled="answer.state && answer.state === 'yes'"  v-model="answer.checked">归档</el-checkbox>
       </div>
     </div>
 <!--    <div class="footer-box">-->
@@ -87,7 +88,9 @@ export default {
         this.$preview(attId)
       }
     },
-    answerChang(){}
+    answerChang(val){
+      this.$emit('answerCheckedChange',this.answer)
+    }
   },
   mounted () {
   },

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

@@ -24,7 +24,8 @@
           <question-item-info :key="qiiKey"
                               :answer="item"
                               :fileList="fileListSetFunc(item)"
-                              :questionerForm="form"></question-item-info>
+                              :questionerForm="form"
+                              @answerCheckedChange="answerCheckedChange"></question-item-info>
         </div>
       </div>
     </template>
@@ -77,6 +78,16 @@ export default {
     this.getData()
   },
   methods:{
+    answerCheckedChange(answer){
+      this.answerList = this.answerList.filter(item=>{
+        if(item.askId === answer.id){
+          return answer
+        }else{
+          return item
+        }
+      })
+      this.aiKey++
+    },
     getData(){
       let taskId = this.$route.query.taskIds
       this.$http.get('lawss/activiti/selectAskId',{
@@ -92,21 +103,26 @@ export default {
                 {
                   _this: this
                 }, res => {
-                  this.form=res.data[0]
+                  if(res.data.length === 0){
+                    this.dataLoading = false
+                  }else{
+                    this.form=res.data[0]
 
-                  if(res.data[1].length){
+                    if(res.data[1].length){
-                    res.data[1].forEach(item => {
+                      res.data[1].forEach(item => {
-                      item.checkedShow = true
+                        item.checkedShow = true
-                      if(item.state && item.state === 'yes'){
+                        if(item.state && item.state === 'yes'){
-                        item.checked = true
+                          item.checked = true
-                      }else {
+                        }else {
-                        item.checked = false
+                          item.checked = false
-                      }
+                        }
-                    })
+                      })
+                    }
+
+                    this.answerList = res.data[1]
+                    this.aiKey++
+                    this.dataLoading = false
                   }
-
-                  this.answerList = res.data[1]
-                  this.dataLoading = false
                 }, e => {
                 })
           }, e => {

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -2229,7 +2229,7 @@ export default {
           break
         case '27':
             this.$router.push({
-              name: 'MyQuestions',
+              name: 'MyQuestions2',
               query:{
                 taskIds: row.taskIds,
                 prcId: row.prcId,