commit

src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html

@@ -188,7 +188,7 @@ layout("/layouts/platform.html"){
     <el-row type="flex" justify="end" class="mt20">
       <el-button type="primary" plain @click="onSave">保存</el-button>
       <el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
-      <el-button type="primary" @click="onFinishTask" v-else>提交1</el-button>
+      <el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
     </el-row>
   </el-card>
 </div>
@@ -289,8 +289,7 @@ layout("/layouts/platform.html"){
               type: "warning"
             }).then(() => {
               this.$axios.post('/platform/condolence/apply/submit', {
-                data: JSON.stringify(this.formData),
-                taskId: GetQueryString("taskId")
+                data: JSON.stringify(this.formData)
               }).then(res => {
                 if (res.code === 0) {
                   this.$message.success(res.msg)
@@ -307,11 +306,9 @@ layout("/layouts/platform.html"){
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.$axios.post('/flow/common/executeTask', {
-            data: JSON.stringify({
-              processTaskId: GetQueryString("taskId"),
-              submitType: 5
-            })
+          this.$axios.post('/platform/condolence/apply/submitAgain', {
+            data: JSON.stringify(this.formData),
+            taskId: GetQueryString("taskId")
           }).then(res => {
             if (res.code === 0) {
               this.$message.success(res.msg)

src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html

@@ -62,10 +62,7 @@ layout("/layouts/platform.html"){
                         <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
                         <el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
-                        <el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
-                            删除
-                        </el-button>
-                        <el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
                             删除
                         </el-button>
                     </template>

src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html

@@ -74,9 +74,12 @@ layout("/layouts/platform.html"){
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" width="100">
+                <el-table-column label="操作" fixed="right" width="180">
                     <template slot-scope="{row}">
                         <el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
+                        <el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
+                            删除
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -116,6 +119,20 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            onDelete(id) {
+                this.$confirm("您确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/condolence/mine/delete", { id }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
+            },
             onExport() {
                 this.$downLoad(loc() + '/onExport', this.pageForm)
             },