工作台我的已办不刷新

需求申请被驳回之后，点击修改，之前的附件名称被修改了，直接命名为附件，而非原附件名称
2022-12-13 11:36:05 +08:00 · 2022-12-13 11:36:05 +08:00 · 95252d1f49
parent 90f9f54528
commit 95252d1f49
10 changed files with 53 additions and 46 deletions
--- a/back/src/components/ren-process-detail/src/ren-process-detail.vue
+++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-04-11 16:30:04
 * @LastEditors: Light
- * @LastEditTime: 2022-10-26 11:05:07
+ * @LastEditTime: 2022-12-13 11:10:46
 * @Description: 告诉大家这是什么
 -->
 <template>
--- a/back/src/views/modules/activiti/my-join-task.vue
+++ b/back/src/views/modules/activiti/my-join-task.vue
@ -109,31 +109,31 @@
 </template>

 <script>
-import mixinViewModule from "@/mixins/view-module";
-import processModule from "@/mixins/process-module";
+import mixinViewModule from '@/mixins/view-module'
+import processModule from '@/mixins/process-module'
 export default {
  mixins: [mixinViewModule, processModule],
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: "/act/his/getMyHandledInstancePage",
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
-        deleteIsBatchKey: "deploymentId",
+        deleteIsBatchKey: 'deploymentId'
      },
      dataForm: {
-        processDefinitionId: "",
-      },
-    };
+        processDefinitionId: ''
+      }
+    }
  },
  components: {},
  methods: {
    showDetail (row) {
      if (!row.businessKey) {
-        return this.$message.error(this.$t("task.detailError"));
+        return this.$message.error(this.$t('task.detailError'))
+      }
+      this.getProcDefRouteSet(row, this.forwardDetail)
+    }
+  }
 }
-      this.getProcDefRouteSet(row, this.forwardDetail);
-    },
-  },
-};
 </script>
--- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
@ -115,7 +115,7 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
        deleteIsBatchKey: 'deploymentId'
--- a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
@ -115,7 +115,7 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
        deleteIsBatchKey: 'deploymentId'
--- a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
+++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
@ -115,7 +115,7 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
        deleteIsBatchKey: 'deploymentId'
--- a/back/src/views/modules/hasToDoTasks/CommentModeration.vue
+++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue
@ -115,7 +115,7 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
        deleteIsBatchKey: 'deploymentId'
--- a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
+++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
@ -116,7 +116,7 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/act/his/getMyHandledInstancePage',
+        getDataListURL: '/act/his/getMyHandledInstancePage?ended=1',
        getDataListIsPage: true,
        deleteIsBatch: true,
        deleteIsBatchKey: 'deploymentId'
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@ -90,7 +90,7 @@ export default {
  created () {
    bus.$off('workInit')
    bus.$on('workInit', () => {
-      console.log("刷新工作台===================")
+      console.log('刷新工作台===================')
      this.getToDo()
      this.getHasToDo()
    })
@ -140,7 +140,7 @@ export default {
      //   page: 1
      // }
      this.loadingHasToDo = true
-      this.$http.get('/act/his/getMyHandledInstancePage?page=1&limit=5').then(res => {
+      this.$http.get('/act/his/getMyHandledInstancePage?ended=1?page=1&limit=5').then(res => {
        this.loadingHasToDo = false
        this.hasToDodoData.list = res.data.data.list || []
        this.hasToDodoData.num = res.data.data.total || 0
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@ -220,13 +220,13 @@
                联系方式
              </div>
              <div class="button" @click="showDetail(item)">查看详情</div>
-              <!-- <div
+              <div
                class="button"
                @click="showAdd(item)"
-                v-if="item.backToFirst"
+                v-if="typeName !== '能力申请' && item.backToFirst"
              >
                修改
-              </div> -->
+              </div>
              <svg
                t="1652233950228"
                class="icon"
@ -535,14 +535,11 @@
      name: yunForm.busineesName,
    }
    total.value = 5
-      getZwyBusinessList(params).then(
-        (res) => {
-       
+    getZwyBusinessList(params).then((res) => {
      cloudList.data = res.data.data.list
      num.value = []
      total.value = res.data.data.total
-        }
-      )
+    })
  }
  //查询政务云状态
  const getCloudResource = () => {
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@ -255,7 +255,6 @@
  import { useRouter } from 'vue-router'

  export default {
-    name: '',
    props: {},
    components: {
      HomeHeader,
@ -296,7 +295,7 @@
            fileList.value = [
              {
                uid: res.data.data.id,
-                name: '附件',
+                name: res.data.data.enclosureName || '附件',
                staus: 'done',
              },
            ]
@ -339,6 +338,7 @@
      }
      const handleRemove = () => {
        formName.enclosure = ''
+        formName.enclosureName = ''
      }
      const handleChange = (info) => {
        if (info.file.status !== 'uploading') {
@ -346,12 +346,15 @@
        }
        if (info.file.status === 'removed') {
          formName.enclosure = ''
+          formName.enclosureName = ''
        }
        if (info.file.status === 'done') {
          message.success(`${info.file.name} 文件上传成功`)
          formName.enclosure = info.file.response.data
+          formName.enclosureName = info.file.name
        } else if (info.file.status === 'error') {
          formName.enclosure = ''
+          formName.enclosureName = ''
          fileList.value = []
          message.error(`${info.file.name} 文件上传失败`)
        }
@ -368,21 +371,20 @@
        // copy传参
        let _postData = JSON.parse(JSON.stringify(formName))
        _postData.detailsField = detailsField
-
        if (id.value) {
          updateDemandForm(_postData).then((upres) => {
            if (upres.data.code == 0) {
              relaunch({ data: _postData, taskId: taskId.value }).then(
                (res) => {
                  console.log('驳回================>', res)
-                  if (res.data.code == 0) {
-                    message.success('重新发起流程成功！')
-                    window.setTimeout(() => {
-                      window.close()
-                    }, 1000)
-                  } else {
-                    message.error('重新发起流程失败！')
-                  }
+                  // if (res.data.code == 0) {
+                  //   message.success('重新发起流程成功！')
+                  //   window.setTimeout(() => {
+                  //     window.close()
+                  //   }, 1000)
+                  // } else {
+                  //   message.error('重新发起流程失败！')
+                  // }
                }
              )
            } else {
@ -396,8 +398,16 @@
            console.log(detString, _postData.detailsField, 'detString')
            demandApply(_postData).then((res) => {
              applySuccess.value = false
-              message.success('操作成功！')
+              // message.success('操作成功！')
              console.log('能力申请================>', res)
+              if (res.data.code == 0) {
+                message.success('操作成功！')
+                window.setTimeout(() => {
+                  window.close()
+                }, 1000)
+              } else {
+                message.error('操作失败')
+              }
            })
          })
        }