Commit 6ff7f71d by liangzhen

序号修改

1 parent db3c9e65
......@@ -40,14 +40,14 @@
<el-button @click="resetForm('ruleForm')">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
>
<el-button @click="confirm()">
<el-button @click="appeal()">
<i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;问题复核</el-button
>
<el-button @click="appeal()">
<!-- <el-button @click="appeal()">
<i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;问题下发</el-button
>
> -->
</el-form-item>
</el-form>
<div class="setscroll">
......@@ -131,7 +131,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem" show-overflow-tooltip>
......@@ -232,7 +232,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem" show-overflow-tooltip>
......@@ -273,7 +273,7 @@
</el-table-column>
<el-table-column label="附加解释材料" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'&&scope.row.fileId">
{{
{{
scope.row.fileName
}} <el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template>
......@@ -283,11 +283,10 @@
<el-select
v-model="scope.row.appealStatus"
placeholder="请选择"
disabled
>
<el-option label="请选择" :value="null"></el-option>
<!-- <el-option label="未申诉" :value="0"></el-option> -->
<el-option label="已申诉" :value="1"></el-option>
<!-- <el-option label="已申诉" :value="1"></el-option> -->
<el-option label="申诉驳回" :value="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
......@@ -297,7 +296,7 @@
</div>
</div>
<p class="midBtn">
<span @click="cancel()">取消</span><span @click="save()">问题下发</span>
<span @click="cancel()">取消</span><span @click="saveSS()">保存</span><span @click="save()">问题下发</span>
</p>
</el-dialog>
</div>
......@@ -386,49 +385,49 @@ export default {
this.pageSize = 10;
this.submitForm();
},
//问题复核
async confirm() {
this.mergingPos = 0;
this.mergingRows = [];
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行复核");
return;
}
this.dialogQR = true;
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
// //问题复核
// async confirm() {
// this.mergingPos = 0;
// this.mergingRows = [];
// if (this.checkedList.length != 1) {
// this.$message("请选择一条数据进行复核");
// return;
// }
// this.dialogQR = true;
// let params = {
// projectId: this.checkedList[0].projectId,
// batchId: this.checkedList[0].batchId,
// };
let res = await wtssSelAssistanceConfirmatio(params);
if (res.code == "200") {
this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => {
switch (item.projectStage) {
case "1":
this.$set(item, "projectStagetext", "1.可研");
break;
case "2":
this.$set(item, "projectStagetext", "2.计划");
break;
case "3":
this.$set(item, "projectStagetext", "3.采购");
break;
case "4":
this.$set(item, "projectStagetext", "4.合同");
break;
case "5":
this.$set(item, "projectStagetext", "5.执行");
break;
case "6":
this.$set(item, "projectStagetext", "6.结决算及转资");
break;
}
});
console.log(this.tableDataQR, "加不进去?");
this.dataPretreatment();
}
},
// let res = await wtssSelAssistanceConfirmatio(params);
// if (res.code == "200") {
// this.tableDataQR = res.data.records;
// this.tableDataQR.forEach((item) => {
// switch (item.projectStage) {
// case "1":
// this.$set(item, "projectStagetext", "1.可研");
// break;
// case "2":
// this.$set(item, "projectStagetext", "2.计划");
// break;
// case "3":
// this.$set(item, "projectStagetext", "3.采购");
// break;
// case "4":
// this.$set(item, "projectStagetext", "4.合同");
// break;
// case "5":
// this.$set(item, "projectStagetext", "5.执行");
// break;
// case "6":
// this.$set(item, "projectStagetext", "6.结决算及转资");
// break;
// }
// });
// console.log(this.tableDataQR, "加不进去?");
// this.dataPretreatment();
// }
// },
dataPretreatment() {
for (let i = 0; i < this.tableDataQR.length; i++) {
// tabledata 表格数据源
......@@ -530,6 +529,15 @@ export default {
this.dialogQR = false;
},
async save() {
console.log('this.tableDataSS',this.tableDataSS)
this.tableDataSS.forEach(item=>{
if(item.confirmStatus==1&&item.appealStatus!=2&&item.appealStatus!=3){
this.$message("有未选择的复核情况");
throw new Error("主动跳出循环");
}
return
})
let res = await xfappealAssistanceConfirmatio(this.tableDataSS);
if (res.code == "200") {
this.dialogSS = false;
......@@ -557,7 +565,7 @@ export default {
this.mergingPosss = 0;
this.mergingRowsss = [];
if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行下发");
this.$message("请选择一条数据进行复核");
return;
}
if (this.checkedList[0].postEvalStateText == "复核已下发") {
......@@ -840,15 +848,20 @@ export default {
margin-right: 10px;
border-radius: 5px;
box-sizing: border-box;
}
span:first-of-type {
border: 1px solid grey;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
border: 1px solid #4ca6a7;
}
span:first-of-type {
border: 1px solid grey;
background-color: #fff;
color: grey;
}
// span:last-of-type {
// background-color: #4ca6a7;
// color: #fff;
// border: 1px solid #4ca6a7;
// }
}
.dialog {
height: 680px;
......
......@@ -136,7 +136,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......@@ -208,7 +208,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
......@@ -136,7 +136,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column
......@@ -263,7 +263,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column
......
......@@ -182,7 +182,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
......@@ -253,7 +253,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
......@@ -18,7 +18,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
......@@ -20,7 +20,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
......@@ -181,7 +181,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column
......@@ -315,7 +315,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column
......
......@@ -20,7 +20,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="questionId">
<el-table-column label="序号" width="100" prop="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
<template>
<div>
<div id="parentElement" v-show="false">{{id}}</div>
<iframe src="http:/127.0.0.1:80/static/" frameborder="0" style="width:100vw;height:100vh;" id="iframe" ></iframe>
<iframe src="http:/127.0.0.1:80/arch-evaluation/static/" frameborder="0" style="width:100vw;height:100vh;" id="iframe" ></iframe>
</div>
</template>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!