Commit 1191e62e by liangzhen

问题辅助整改

1 parent 63f3b89b
...@@ -204,3 +204,26 @@ export function xfappealAssistanceConfirmatio(params) { ...@@ -204,3 +204,26 @@ export function xfappealAssistanceConfirmatio(params) {
export function wtssSelAssistanceConfirmatio(params) { export function wtssSelAssistanceConfirmatio(params) {
return post(`/api/appealAssistanceConfirmation/wtssSel`, params) return post(`/api/appealAssistanceConfirmation/wtssSel`, params)
} }
//问题辅助整改
//分页
export function ProblemRectification(params) {
return post(`/api/ProblemRectification/`, params)
}
//问题清单查询
export function wtssSelProblemRectification(params) {
return post(`/api/ProblemRectification/wtssSel`, params)
}
//问题整改保存
export function wtzgProblemRectification(params) {
return post(`/api/ProblemRectification/wtzg`, params)
}
//问题整改下发
export function wtzgxfProblemRectification(params) {
return post(`/api/ProblemRectification/wtzgxf`, params)
}
//材料同步归档
//列表
export function materialSync(params) {
return post(`/api/materialSync/`, params)
}
\ No newline at end of file
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
<!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> --> <!-- <el-table-column prop="reviewStatus" label="后评估状态"> </el-table-column> -->
<el-table-column prop="reviewDate" label="评估日期"> </el-table-column> <el-table-column prop="reviewDate" label="评估日期"> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -84,11 +85,11 @@ ...@@ -84,11 +85,11 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- 问题确认 --> <!-- 问题复核 -->
<el-dialog <el-dialog
title="问题确认" title="问题确认"
:visible.sync="dialogQR" :visible.sync="dialogQR"
width="90%" width="79%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
@close="closed" @close="closed"
...@@ -150,26 +151,37 @@ ...@@ -150,26 +151,37 @@
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId"> <el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<el-option label="请选择" value=""></el-option>
<el-option label="未申诉" :value="0"></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>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancelSS()">取消</span <span @click="cancelSS()">取消</span
><span @click="saveSS()">确认</span> ><span @click="saveSS()">保存</span>
</p> </p>
</el-dialog> </el-dialog>
<!-- 申诉 --> <!-- 复核下发 -->
<el-dialog <el-dialog
title="申诉" title="复核情况"
:visible.sync="dialogSS" :visible.sync="dialogSS"
width="90%" width="79%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
> >
...@@ -230,19 +242,30 @@ ...@@ -230,19 +242,30 @@
<el-input v-model="scope.row.feedback"></el-input> <el-input v-model="scope.row.feedback"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="zgFileId"> <el-table-column label="附加解释材料" prop="zgFileId" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<input type="file" @change="handleFileUpload"> <input type="file" @change="handleFileUpload">
<button @click="submitFile(scope.row)">上传</button> <button @click="submitFile(scope.row)">上传</button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="zgFileId">
<template slot-scope="scope">
<el-select v-model="scope.row.appealStatus" placeholder="请选择">
<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="2"></el-option>
<el-option label="申诉通过" :value="3"></el-option>
</el-select>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancel()">取消</span <span @click="cancel()">取消</span
><span @click="save()">确认</span> ><span @click="save()">问题下发</span>
</p> </p>
</el-dialog> </el-dialog>
...@@ -310,14 +333,10 @@ ...@@ -310,14 +333,10 @@
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
if (item.appealStatus == "1") { if (item.reviewStatus >= "4") {
this.$set(item, "postEvalState", "已申诉"); this.$set(item, "postEvalState", "复核已下发");
} else if (item.appealStatus == "2") {
this.$set(item, "postEvalState", "申诉驳回");
} else if (item.appealStatus == "3") {
this.$set(item, "postEvalState", "申诉通过");
} else { } else {
this.$set(item, "postEvalState", "未申诉"); this.$set(item, "postEvalState", "复核未下发");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -329,7 +348,7 @@ ...@@ -329,7 +348,7 @@
this.pageSize = 10; this.pageSize = 10;
this.submitForm(); this.submitForm();
}, },
//确认问题 //问题复核
async confirm() { async confirm() {
this.mergingPos=0; this.mergingPos=0;
this.mergingRows=[] this.mergingRows=[]
...@@ -476,10 +495,12 @@ ...@@ -476,10 +495,12 @@
this.dialogQR=false this.dialogQR=false
}, },
async save(){ async save(){
let res= await ssProblemAssistedFeedback(this.tableDataSS) let res= await xfappealAssistanceConfirmatio(this.tableDataSS)
if(res.code=='200'){ if(res.code=='200'){
this.dialogSS=false this.dialogSS=false
this.resetForm() this.resetForm()
}else{
this.$message('复核下发失败')
} }
}, },
...@@ -487,18 +508,18 @@ ...@@ -487,18 +508,18 @@
this.dialogSS=false this.dialogSS=false
}, },
async saveSS(){ async saveSS(){
let res= await qrProblemAssistedFeedback(this.tableDataQR) let res= await wtfhappealAssistanceConfirmatio(this.tableDataQR)
if(res.code=='200'){ if(res.code=='200'){
this.dialogQR=false this.dialogQR=false
this.resetForm() this.resetForm()
} }
}, },
//申诉 //问题下发
async appeal(){ async appeal(){
this.mergingPosss=0; this.mergingPosss=0;
this.mergingRowsss=[]; this.mergingRowsss=[];
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择一条数据进行申诉"); this.$message("请选择一条数据进行下发");
return; return;
} }
this.dialogSS = true; this.dialogSS = true;
...@@ -507,7 +528,7 @@ ...@@ -507,7 +528,7 @@
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
let res = await wtssSelProblemAssistedFeedback(params); let res = await wtssSelAssistanceConfirmatio(params);
if (res.code == "200") { if (res.code == "200") {
this.tableDataSS = res.data.records; this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => { this.tableDataSS.forEach((item) => {
...@@ -588,7 +609,7 @@ ...@@ -588,7 +609,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
...@@ -632,6 +653,9 @@ ...@@ -632,6 +653,9 @@
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 150%;
min-width: 150%;
margin-right: 210px;
// margin-top: 3vh; // margin-top: 3vh;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
...@@ -899,5 +923,27 @@ ...@@ -899,5 +923,27 @@
/deep/ .el-dialog__body{ /deep/ .el-dialog__body{
padding-bottom: 15px; padding-bottom: 15px;
} }
.setscroll{
width: 100%;
height: 600px;
overflow: auto;
}
.dialog{
.eltable {
box-sizing: border-box;
text-align: center;
width: 100%;
min-width: 100%;
// margin-right: 210px;
// margin-top: 3vh;
}
}
// ::-webkit-scrollbar {
// width: 6px; // 横向滚动条
// height: 6px; // 纵向滚动条必写
// }
</style> </style>
\ No newline at end of file
...@@ -577,7 +577,7 @@ export default { ...@@ -577,7 +577,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -810,7 +810,7 @@ export default { ...@@ -810,7 +810,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -408,7 +408,7 @@ export default { ...@@ -408,7 +408,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -352,7 +352,7 @@ export default { ...@@ -352,7 +352,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -42,17 +42,18 @@ ...@@ -42,17 +42,18 @@
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
> >
<el-button @click="resetForm('ruleForm')"> <el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="detailsForm('ruleForm')"> <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<el-button @click="attach('ruleForm')"> <el-button @click="attach('ruleForm')">
<img class="buttonIcon" src="../../assets/gd.png" />材料归档</el-button <i class="el-icon-receiving"></i>&nbsp;&nbsp;&nbsp;材料归档</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
<el-table-column prop="createTime" label="创建时间" width="auto"> <el-table-column prop="createTime" label="创建时间" width="auto">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -171,7 +173,7 @@ ...@@ -171,7 +173,7 @@
<script> <script>
import { import {
evalBatchInfo, materialSync,
} from "@/api/index"; } from "@/api/index";
export default { export default {
data() { data() {
...@@ -279,7 +281,7 @@ ...@@ -279,7 +281,7 @@
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
let res = await evalBatchInfo(params); let res = await materialSync(params);
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
...@@ -393,7 +395,7 @@ ...@@ -393,7 +395,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
...@@ -435,8 +437,13 @@ ...@@ -435,8 +437,13 @@
} }
} }
.eltable { .eltable {
widows: 100%; // widows: 100%;
box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
text-align: center;
width: 150%;
min-width: 150%;
// margin-right: 210px;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
background: #f0ffff; background: #f0ffff;
...@@ -592,4 +599,9 @@ ...@@ -592,4 +599,9 @@
/deep/ .el-table__cell{ /deep/ .el-table__cell{
text-align: center; text-align: center;
} }
.setscroll{
width: 100%;
height: 600px;
overflow: auto;
}
</style> </style>
\ No newline at end of file
...@@ -394,7 +394,7 @@ export default { ...@@ -394,7 +394,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -791,7 +791,7 @@ export default { ...@@ -791,7 +791,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -485,7 +485,7 @@ export default { ...@@ -485,7 +485,7 @@ export default {
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -13,6 +13,7 @@ export default { ...@@ -13,6 +13,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.main{ .main{
padding: 10px; padding: 10px;
padding-top:5px;
} }
</style> </style>
\ No newline at end of file
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
border-right: 1px solid #dee5e7; border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7; border-bottom: 1px solid #dee5e7;
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
......
...@@ -3,7 +3,7 @@ const { defineConfig } = require('@vue/cli-service') ...@@ -3,7 +3,7 @@ const { defineConfig } = require('@vue/cli-service')
// const ip = '172.20.10.3'; // const ip = '172.20.10.3';
// const ip = '172.20.10.9'; // 何鹏 // const ip = '172.20.10.9'; // 何鹏
// const ip = '192.168.0.120'; // const ip = '192.168.0.120';
// const ip = '192.168.0.13'; // const ip = '192.168.50.1';
const ip = '192.168.8.120'; const ip = '192.168.8.120';
module.exports = defineConfig({ module.exports = defineConfig({
transpileDependencies: true, transpileDependencies: true,
...@@ -13,7 +13,7 @@ module.exports = defineConfig({ ...@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true, hot: true,
proxy: { proxy: {
'/api':{ '/api':{
target: `http://192.168.8.120:18101`, // pin target: `http://192.168.8.248:18101`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/api":"" "^/api":""
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!