Commit e36ba559 authored by zhangjianqian's avatar zhangjianqian

企业上传,政府只看上传。

parent 68628511
package com.zehong.web.controller.oldpipesystem; package com.zehong.web.controller.oldpipesystem;
import java.util.List; import java.util.List;
import com.zehong.common.core.domain.model.LoginUser;
import com.zehong.common.utils.ServletUtils;
import com.zehong.framework.web.service.TokenService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -33,12 +37,19 @@ public class TPipeOldPlanProcessController extends BaseController ...@@ -33,12 +37,19 @@ public class TPipeOldPlanProcessController extends BaseController
@Autowired @Autowired
private ITPipeOldPlanProcessService tPipeOldPlanProcessService; private ITPipeOldPlanProcessService tPipeOldPlanProcessService;
@Autowired
private TokenService tokenService;
/** /**
* 查询老旧管网-改造计划和进度列表 * 查询老旧管网-改造计划和进度列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPipeOldPlanProcess tPipeOldPlanProcess) public TableDataInfo list(TPipeOldPlanProcess tPipeOldPlanProcess)
{ {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
tPipeOldPlanProcess.setfUploadType("1");
}
startPage(); startPage();
List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.selectTPipeOldPlanProcessList(tPipeOldPlanProcess); List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
return getDataTable(list); return getDataTable(list);
......
...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
size="mini" size="mini"
type="text" type="text"
@click="handleReport(scope.row)" @click="handleReport(scope.row)"
v-if="user.roleId==1||user.roleId==5"
>上传</el-button> >上传</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -598,12 +599,18 @@ export default { ...@@ -598,12 +599,18 @@ export default {
this.$refs.detail.getDetailInfo(row.fOldPlanProcessId); this.$refs.detail.getDetailInfo(row.fOldPlanProcessId);
}, },
handleReport(row){ handleReport(row){
console.log("-----------------------------"+row.fOldPlanProcessId)
this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", { this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return delProcess(fOldPlanProcessIds); updateProcess({fOldPlanProcessId:row.fOldPlanProcessId,fUploadType:1}).then(response => {
this.msgSuccess("上传成功");
this.open = false;
this.getList();
});
return ;
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.msgSuccess("上传成功"); this.msgSuccess("上传成功");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment