添加申请撤销功能，删除申请撤销包

guoshilong

2023-01-02 d72f14301480b146be606cb91455f8fe943309c7

添加申请撤销功能，删除申请撤销包

 src/api/applicationCancel/applicationCancel.js

File was deleted

 src/api/work/work.js

@@ -80,12 +80,10 @@
  })
}

export const withdrawTask = (userId) => {
export const withdrawTask = (row) => {
  return request({
    url: '/api/blade-flow/work/withdraw-task',
    method: 'post',
    params: {
      userId
    }
    data:row
  })
}

 src/config/website.js

@@ -2,7 +2,7 @@
 * 全局配置文件
 */
export default {
  title: "saber",
  // title: "saber",
  logo: "S",
  key: 'saber',//配置主键,目前用于存储
  indexTitle: '大件审批系统',

 src/const/applicationCancel/applicationCancel.js

File was deleted

 src/page/login/index.vue

@@ -36,17 +36,17 @@
        <div class="login-main">
          <h4 class="login-title">
            {{ $t('login.title') }}{{website.title}}
            <top-lang></top-lang>
<!--            <top-lang></top-lang>-->
          </h4>
          <userLogin v-if="activeName==='user'"></userLogin>
          <codeLogin v-else-if="activeName==='code'"></codeLogin>
          <thirdLogin v-else-if="activeName==='third'"></thirdLogin>
          <div class="login-menu">
            <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
            <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
            <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
            <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
          </div>
<!--          <div class="login-menu">-->
<!--            <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>-->
<!--            &lt;!&ndash;<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>&ndash;&gt;-->
<!--            <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
<!--            <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>-->
<!--          </div>-->
        </div>

      </div>

 src/page/login/userlogin.vue

@@ -5,15 +5,15 @@
           ref="loginForm"
           :model="loginForm"
           label-width="0">
    <el-form-item v-if="tenantMode" prop="tenantId">
      <el-input size="small"
                @keyup.enter.native="handleLogin"
                v-model="loginForm.tenantId"
                auto-complete="off"
                :placeholder="$t('login.tenantId')">
        <i slot="prefix" class="icon-quanxian"/>
      </el-input>
    </el-form-item>
<!--    <el-form-item v-if="tenantMode" prop="tenantId">-->
<!--      <el-input size="small"-->
<!--                @keyup.enter.native="handleLogin"-->
<!--                v-model="loginForm.tenantId"-->
<!--                auto-complete="off"-->
<!--                :placeholder="$t('login.tenantId')">-->
<!--        <i slot="prefix" class="icon-quanxian"/>-->
<!--      </el-input>-->
<!--    </el-form-item>-->
    <el-form-item prop="username">
      <el-input size="small"
                @keyup.enter.native="handleLogin"

 src/views/applicationCancel/applicationCancel.vue

File was deleted

 src/views/work/send.vue

@@ -23,6 +23,7 @@
        <el-button type="text"
                   size="small"
                   icon="el-icon-delete"
                   :disabled="scope.row.processIsFinished === 'finished' || scope.row.processIsFinished ==='withdraw'  "
                   @click.stop="handleCancel(scope.row)">撤 销
        </el-button>
        <el-button type="text"
@@ -38,7 +39,7 @@
      </template>
      <template slot-scope="{row}"
                slot="processIsFinished">
        <el-tag>{{row.processIsFinished==='finished' ? '已完成' : '未完成'}}</el-tag>
        <el-tag>{{row.processIsFinished==='finished' ? '已完成' : row.processIsFinished ==='withdraw'?'自行撤销':'未完成'}}</el-tag>
      </template>
    </avue-crud>
    <flow-design is-dialog :is-display.sync="flowBox" :process-instance-id="processInstanceId"></flow-design>
@@ -189,9 +190,14 @@
        });
      },
      handleCancel(row){
        console.log(row)
        withdrawTask(this.userInfo.user_id).then(res=>{
          this.$message(res.data.msg)
        withdrawTask(row).then(res=>{
          if (res.data.code == 200){
            this.$message.success(res.data.msg)
          }else {
            this.$message.error(res.data.msg)
          }

          this.onLoad(this.page,this.query)
        })
      }
    }