mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：删除会审功能

dev_1.0.2
jiangpeng 2026-07-14 17:43:01 +08:00
parent 934b2990f1
commit 4d911c93ae
2 changed files with 3 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
oms_web/oms_vue/src/views/project/info/index.vue
View File

@ -98,12 +98,6 @@
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="是否会审" prop="jointTrial">
<el-select v-model="queryParams.jointTrial" placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable size="small" @keyup.enter.native="handleQuery"/>
</el-form-item>
@ -229,12 +223,6 @@
<el-checkbox v-model="scope.row.collect" true-label="1" false-label="0" @change="handleCollectChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="会审" align="center" prop="jointTrial" width="50" fixed="right">
<template slot-scope="scope">
<el-checkbox v-if="!canUpdateJoinTrial" :value="scope.row.jointTrial === '1'" @change="()=>{ $modal.msgError('无权限修改');return false;}" />
<el-checkbox v-else v-model="scope.row.jointTrial" true-label="1" false-label="0" @change="handleJoinTrialChange(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope">
<el-button
@ -248,7 +236,7 @@
size="mini"
type="text"
icon="el-icon-refresh"
@click="openOrder(scope.row.id, scope.row.canGenerate, scope.row.jointTrial)"
@click="openOrder(scope.row.id, scope.row.canGenerate)"
:disabled="!scope.row.canGenerate "
v-hasPermi="['sip:project:add']"
>生成订单</el-button>
@ -259,13 +247,6 @@
@click="handleDelete(scope.row)"
v-hasPermi="['sip:project:remove']"
>删除</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleExportSingle(scope.row)"-->
<!-- v-show="scope.row.jointTrial==='1'"-->
<!-- >技术方案终审下载</el-button>-->
</template>
</el-table-column>
</el-table>
@ -285,7 +266,6 @@
<project-form
:visible.sync="projectFormVisible"
:project-id="selectedProjectId"
:canUpdateJoinTrial="canUpdateJoinTrial"
@success="handleFormSuccess"
/>
@ -295,11 +275,10 @@
</template>
<script>
import {listProject, delProject, exportProject, addCollect, exportSingle, editJoinTrial} from "@/api/project/info";
import {listProject, delProject, exportProject, addCollect} from "@/api/project/info";
import ProjectDetailDrawer from "./ProjectDetailDrawer.vue";
import ProjectForm from "./ProjectForm.vue";
import OrderDetail from "../order/OrderDetail.vue";
import store from "@/store";
export default {
name: "Project",
@ -313,7 +292,6 @@ export default {
return {
// 遮罩层
loading: true,
canUpdateJoinTrial: false,
// 选中数组
ids: [],
// 选中项目ID
@ -353,7 +331,6 @@ export default {
industryType: null,
industryTypeList: null,
agentName: null,
jointTrial: null,
collect: null,
projectGraspDegree: null,
projectStage: [],
@ -373,11 +350,6 @@ export default {
},
created() {
this.getList();
const permissions = store.getters && store.getters.permissions
const all_permission = "*:*:*"
this.canUpdateJoinTrial = permissions.some(permission => {
return all_permission === permission || "sip:project:jointTrial"===permission
})
},
watch: {
dateRange(val) {
@ -497,10 +469,6 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
handleExportSingle(row){
window.location.href=process.env.VUE_APP_BASE_API +`/sip/project/vue/joinTrial/export/${row.id}`
// exportSingle(row.id)
},
/** 导出按钮操作 */
handleExport() {
const queryParams = {
@ -539,11 +507,7 @@ export default {
}
},
/** 生成订单 */
openOrder(id, canGenerate,jointTrial) {
if (jointTrial!=='1') {
this.$modal.alertWarning("请联系产品经理和售后团队进行会审后再生成订单");
return;
}
openOrder(id, canGenerate) {
if (!canGenerate) {
this.$modal.alertWarning("该项目已存在订单");
return;
@ -568,45 +532,6 @@ export default {
this.$modal.msgSuccess("操作成功");
})
},
/** 项目会审状态修改 */
handleJoinTrialChange(row) {
if (!row.canGenerate){
row.jointTrial='1'
this.$modal.msgError("该项目已存在订单,无法取消会审");
return;
}
if (row.jointTrial === '0'){
if (!row.canGenerate){
this.$modal.alertWarning("该项目已存在订单,无法取消会审");
return;
}
this.$modal.confirm('是否确认取消会审？').then(function() {
let params={
"id":row.id,
"partnerCode":row.partnerCode,
"jointTrial":row.jointTrial
}
editJoinTrial(params).then(response => {
this.$modal.msgSuccess("取消成功");
})
}).catch((err)=>{
row.jointTrial = row.jointTrial === '1' ? '0' : '1';
})
}else{
let params={
"id":row.id,
"partnerCode":row.partnerCode,
"jointTrial":row.jointTrial
}
editJoinTrial(params).then(response => {
this.$modal.msgSuccess("操作成功");
}).catch(() => {
row.jointTrial = row.jointTrial === '1' ? '0' : '1';
});
}
},
}
};
</script>

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -327,10 +327,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
if (projectOrderInfo.getProjectId() == null) {
throw new ServiceException("请选择项目");
}
ProjectInfo projectInfo = projectInfoMapper.selectProjectInfoById(projectOrderInfo.getProjectId());
if (projectInfo == null|| !"1".equals(projectInfo.getJointTrial())){
throw new ServiceException("请进行项目会审");
}
List<ProjectOrderInfo> projectOrderInfos = this.selectProjectOrderInfoByProjectId(Collections.singletonList(projectOrderInfo.getProjectId()));
if (CollUtil.isNotEmpty(projectOrderInfos)) {
throw new ServiceException("该项目存在订单流转，无法添加");