Skip to content

Administrator / project_progress

Go to a project
Commit 413ecf68 by liangzhen
Options

暂存

1 parent 0f2bc8da
Inline Side-by-side
Showing with 63 additions and 50 deletions
src/views/compliance/addConfigure.vue
...@@ -530,7 +530,7 @@ export default { ...@@ -530,7 +530,7 @@ export default {
this.$refs['multipleTableZJ'].toggleRowSelection(row) this.$refs['multipleTableZJ'].toggleRowSelection(row)
this.addZJList = this.$refs.multipleTableZJ.selection this.addZJList = this.$refs.multipleTableZJ.selection
} else { } else {
this.$message.warning('项目编码或合同编码为空') this.$message.error('项目编码或合同编码为空')
} }
}, },
saveXZ() { saveXZ() {
...@@ -539,11 +539,11 @@ export default { ...@@ -539,11 +539,11 @@ export default {
return false; return false;
} else { } else {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
this.$message("请选择稽核规则"); this.$message.error("请选择稽核规则");
return; return;
} }
if (this.addtableDataXM.length < 1) { if (this.addtableDataXM.length < 1) {
this.$message("请选择待稽核项目"); this.$message.error("请选择待稽核项目");
return; return;
} }
...@@ -575,10 +575,13 @@ export default { ...@@ -575,10 +575,13 @@ export default {
console.log(params, "222"); console.log(params, "222");
addauditTasks(params).then((res) => { addauditTasks(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message("保存成功"); this.$message({
message: '保存成功',
type: 'success'
});
this.$router.go(-1) this.$router.go(-1)
} else { } else {
this.$message("保存失败"); this.$message.error("保存失败");
} }
...@@ -593,7 +596,7 @@ export default { ...@@ -593,7 +596,7 @@ export default {
saveZJ() { saveZJ() {
console.log(this.addZJListXM,this.addtableDataXM,'选择了') console.log(this.addZJListXM,this.addtableDataXM,'选择了')
if (this.addZJListXM.length < 1) { if (this.addZJListXM.length < 1) {
this.$message("请选择项目"); this.$message.error("请选择项目");
return; return;
} }
this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM]; this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM];
...@@ -619,7 +622,7 @@ export default { ...@@ -619,7 +622,7 @@ export default {
//规则选择 //规则选择
saveGZ() { saveGZ() {
if (this.addZJList.length < 1) { if (this.addZJList.length < 1) {
this.$message("请选择规则"); this.$message.error("请选择规则");
return; return;
} }
......
src/views/compliance/checkRules.vue
...@@ -497,6 +497,11 @@ export default { ...@@ -497,6 +497,11 @@ export default {
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
console.log(params,'222222') console.log(params,'222222')
if(!params.questionId){
this.$message.error("请编制检查规则");
return;
}
// return
addruleFormulation(params).then((res) => { addruleFormulation(params).then((res) => {
this.dialogAdd = false; this.dialogAdd = false;
this.resetForm(); this.resetForm();
...@@ -581,7 +586,7 @@ export default { ...@@ -581,7 +586,7 @@ export default {
//详情 //详情
async detailsForm() { async detailsForm() {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
this.dialog = true; this.dialog = true;
......
src/views/compliance/taskConfigure.vue
...@@ -955,7 +955,7 @@ export default { ...@@ -955,7 +955,7 @@ export default {
this.currentPageBJGZ = 1; this.currentPageBJGZ = 1;
this.pageSizeBJGZ = 5; this.pageSizeBJGZ = 5;
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
this.ruleFormdialogXQ = this.checkedList[0]; this.ruleFormdialogXQ = this.checkedList[0];
...@@ -1001,15 +1001,6 @@ export default { ...@@ -1001,15 +1001,6 @@ export default {
} }
return ""; return "";
}, },
// handleRowClickSelf(row, column, event) {
// console.log(row,'2222')
// if (row.contractNumber && row.projectCode) {
// this.$refs['multipleTableZJ'].toggleRowSelection(row)
// this.addZJList = this.$refs.multipleTableZJ.selection
// } else {
// this.$message.warning('项目编码或合同编码为空')
// }
// },
async handleClick() { async handleClick() {
if (this.activeName == "second") { if (this.activeName == "second") {
let params = { let params = {
...@@ -1092,11 +1083,11 @@ export default { ...@@ -1092,11 +1083,11 @@ export default {
//运行 //运行
async working() { async working() {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) { if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能运行未执行的任务"); this.$message.error("只能运行未执行的任务");
return; return;
} }
// let params = { // let params = {
...@@ -1105,10 +1096,14 @@ export default { ...@@ -1105,10 +1096,14 @@ export default {
// }; // };
let res = await qidongTasks(this.checkedList[0]); let res = await qidongTasks(this.checkedList[0]);
if (res.code == 200) { if (res.code == 200) {
this.$message("运行成功"); // this.$message("运行成功");
this.$message({
message: '运行成功',
type: 'success'
});
this.resetForm() this.resetForm()
} else { } else {
this.$message("运行失败"); this.$message.error("运行失败");
} }
}, },
//选择规则 //选择规则
...@@ -1137,7 +1132,7 @@ export default { ...@@ -1137,7 +1132,7 @@ export default {
//规则选择 //规则选择
saveGZ() { saveGZ() {
if (this.addZJList.length < 1) { if (this.addZJList.length < 1) {
this.$message("请选择规则"); this.$message.error("请选择规则");
return; return;
} }
// this.addtableData = [...this.addtableData, ...this.addZJList]; // this.addtableData = [...this.addtableData, ...this.addZJList];
...@@ -1251,7 +1246,7 @@ export default { ...@@ -1251,7 +1246,7 @@ export default {
//编辑 //编辑
edit() { edit() {
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) { if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能编辑未执行的任务"); this.$message.error("只能编辑未执行的任务");
return; return;
} }
this.currentPageBJXM = 1; this.currentPageBJXM = 1;
...@@ -1261,7 +1256,7 @@ export default { ...@@ -1261,7 +1256,7 @@ export default {
this.oldid = ""; this.oldid = "";
this.showDate = false; this.showDate = false;
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
this.ruleFormdialogBJ = this.checkedList[0]; this.ruleFormdialogBJ = this.checkedList[0];
...@@ -1308,11 +1303,11 @@ export default { ...@@ -1308,11 +1303,11 @@ export default {
//删除 //删除
async deletes() { async deletes() {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) { if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能删除未执行的任务"); this.$message.error("只能删除未执行的任务");
return; return;
} }
this.$confirm("此操作将删除该批次, 是否继续?", "提示", { this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
...@@ -1377,7 +1372,7 @@ export default { ...@@ -1377,7 +1372,7 @@ export default {
//选择项目 //选择项目
saveZJ() { saveZJ() {
if (this.addZJListXM.length < 1) { if (this.addZJListXM.length < 1) {
this.$message("请选择项目"); this.$message.error("请选择项目");
return; return;
} }
this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM]; this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM];
...@@ -1439,11 +1434,11 @@ export default { ...@@ -1439,11 +1434,11 @@ export default {
return false; return false;
} else { } else {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
this.$message("请选择稽核规则"); this.$message.error("请选择稽核规则");
return; return;
} }
if (this.addtableDataXM.length < 1) { if (this.addtableDataXM.length < 1) {
this.$message("请选择待稽核项目"); this.$message.error("请选择待稽核项目");
return; return;
} }
...@@ -1469,9 +1464,13 @@ export default { ...@@ -1469,9 +1464,13 @@ export default {
console.log(params, "222"); console.log(params, "222");
addauditTasks(params).then((res) => { addauditTasks(params).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message("保存成功"); this.$message({
message: '保存成功',
type: 'success'
});
} else { } else {
this.$message("保存失败"); this.$message.error("保存失败");
} }
this.dialogAdd = false; this.dialogAdd = false;
this.resetForm(); this.resetForm();
...@@ -1491,11 +1490,11 @@ export default { ...@@ -1491,11 +1490,11 @@ export default {
return false; return false;
} else { } else {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
this.$message("请选择稽核规则"); this.$message.error("请选择稽核规则");
return; return;
} }
if (this.addtableDataXM.length < 1) { if (this.addtableDataXM.length < 1) {
this.$message("请选择待稽核项目"); this.$message.error("请选择待稽核项目");
return; return;
} }
......
src/views/projectCheck/checkResault.vue
...@@ -287,7 +287,7 @@ export default { ...@@ -287,7 +287,7 @@ export default {
this.checkedList[0]=info this.checkedList[0]=info
}else{ }else{
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
} }
......
src/views/projectCheck/confirmResault.vue
...@@ -389,7 +389,7 @@ export default { ...@@ -389,7 +389,7 @@ export default {
//详情 //详情
async detailsForm(type) { async detailsForm(type) {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择一条项目进行查看"); this.$message.error("请选择一条项目进行查看");
return; return;
} }
let params = { let params = {
...@@ -411,7 +411,7 @@ export default { ...@@ -411,7 +411,7 @@ export default {
this.dialog = true; this.dialog = true;
} else { } else {
if (this.checkedList[0].confirmStatusText == "已下发") { if (this.checkedList[0].confirmStatusText == "已下发") {
this.$message("已完成下发"); this.$message.error("已完成下发");
return; return;
} }
this.dialogXF = true; this.dialogXF = true;
...@@ -476,7 +476,7 @@ export default { ...@@ -476,7 +476,7 @@ export default {
//结果下发 //结果下发
async resaultXF() { async resaultXF() {
if (this.checkedList.length < 1) { if (this.checkedList.length < 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
this.$confirm("是否确认下发?", "提示", { this.$confirm("是否确认下发?", "提示", {
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
.then(async () => { .then(async () => {
this.checkedList.forEach(item=>{ this.checkedList.forEach(item=>{
if(item.confirmStatusText == "已下发") { if(item.confirmStatusText == "已下发") {
this.$message("请选择未下发的项目"); this.$message.error("请选择未下发的项目");
throw new Error("主动跳出循环"); throw new Error("主动跳出循环");
} }
......
src/views/projectCheck/problemRectify.vue
...@@ -397,7 +397,7 @@ export default { ...@@ -397,7 +397,7 @@ export default {
ruleFormdialogXQ: {}, ruleFormdialogXQ: {},
currentPageXQ: "", currentPageXQ: "",
pageSizeXQ: "", pageSizeXQ: "",
confirmdisabled: false, confirmdisabled: true,
}; };
}, },
mounted() { mounted() {
...@@ -465,9 +465,12 @@ export default { ...@@ -465,9 +465,12 @@ export default {
async zgqdauditTasks(){ async zgqdauditTasks(){
let res = await zgqdauditTasks(this.checkedList[0]); let res = await zgqdauditTasks(this.checkedList[0]);
if(res.code==200){ if(res.code==200){
this.$message('整改完成') this.$message({
message: '整改确认完成',
type: 'success'
});
}else{ }else{
this.$message('整改失败') this.$message.error('整改确认失败')
} }
this.resetForm()() this.resetForm()()
...@@ -476,7 +479,7 @@ export default { ...@@ -476,7 +479,7 @@ export default {
async detailsForm(info) { async detailsForm(info) {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
......
src/views/projectCheck/verificationRectify.vue
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
currentPageXQ: "", currentPageXQ: "",
pageSizeXQ: "", pageSizeXQ: "",
confirmdisabled: false, confirmdisabled: false,
inspectdisabled: false, inspectdisabled: true,
}; };
}, },
mounted() { mounted() {
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
async detailsForm(info) { async detailsForm(info) {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
...@@ -568,7 +568,7 @@ this.dialog = true; ...@@ -568,7 +568,7 @@ this.dialog = true;
async resaultXF() { async resaultXF() {
this.XQtableData.forEach(item=>{ this.XQtableData.forEach(item=>{
if(!item.zgfhStatus){ if(!item.zgfhStatus){
this.$message("有未选择的问题整改复核"); this.$message.error("有未选择的问题整改复核");
throw new Error("主动跳出循环"); throw new Error("主动跳出循环");
} }
return return
...@@ -582,7 +582,7 @@ this.dialog = true; ...@@ -582,7 +582,7 @@ this.dialog = true;
//问题下发 //问题下发
async questionXF() { async questionXF() {
if (this.checkedList.length < 1) { if (this.checkedList.length < 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
this.$confirm("是否确认下发?", "提示", { this.$confirm("是否确认下发?", "提示", {
...@@ -594,7 +594,7 @@ this.dialog = true; ...@@ -594,7 +594,7 @@ this.dialog = true;
.then(async () => { .then(async () => {
this.checkedList.forEach(item=>{ this.checkedList.forEach(item=>{
if(item.confirmStatusText == "已下发") { if(item.confirmStatusText == "已下发") {
this.$message("请选择未下发的项目"); this.$message.error("请选择未下发的项目");
throw new Error("主动跳出循环"); throw new Error("主动跳出循环");
} }
...@@ -611,7 +611,10 @@ this.dialog = true; ...@@ -611,7 +611,10 @@ this.dialog = true;
// }; // };
let res = await wtxfResults(this.checkedList[0]); let res = await wtxfResults(this.checkedList[0]);
if (res.code == 200) { if (res.code == 200) {
this.$message("下发成功"); this.$message({
message: '下发成功',
type: 'success'
});
this.dialogXF = false; this.dialogXF = false;
this.resetForm(); this.resetForm();
} }
......
vue.config.js
...@@ -18,7 +18,7 @@ module.exports = defineConfig({ ...@@ -18,7 +18,7 @@ module.exports = defineConfig({
proxy: { proxy: {
'/arch-evaluation':{ '/arch-evaluation':{
// target: `http://192.168.69.1:18102`, // pin // target: `http://192.168.69.1:18102`, // pin
target: `http://192.168.14.1:18000/tools`, // pin target: `http://192.168.145.1:18000/tools`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/arch-evaluation":"/" "^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!