hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡查记录页面修改

Browse Source
main
wanglei 2 years ago
parent 25522186eb
commit f89208d4d3
2 changed files with 183 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-ui/src/views/szxc/workrecard/index.vue
Unescape View File

@ -137,7 +137,7 @@
<el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
<el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.gzStatus"/>
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
</template>
</el-table-column>
<el-table-column label="审核人" align="center" prop="auditName" min-width="180" show-overflow-tooltip/>

210
ruoyi-ui/src/views/szxc/xcrecard/index.vue
Unescape View File

@ -157,7 +157,6 @@
</template>
</el-table-column>
<el-table-column label="被巡查对象" align="center" prop="xcObj" min-width="120" show-overflow-tooltip/>
<el-table-column label="随行巡查人" align="center" prop="flowPeople" min-width="120" show-overflow-tooltip/>
<el-table-column label="是否需要整改" align="center" prop="reform" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
@ -165,21 +164,30 @@
</template>
</el-table-column>
<el-table-column label="整改进度" align="center" prop="zgProgress" min-width="120" show-overflow-tooltip/>
<el-table-column label="审核状态" align="center" prop="xcStatus" min-width="120" show-overflow-tooltip>
<el-table-column label="图片" align="center" prop="picture" >
<template slot-scope="scope">
<image-preview :src="scope.row.picture" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="巡查情况描述" align="center" prop="content" min-width="200" show-overflow-tooltip/>
<el-table-column label="审核状态" align="center" prop="xcStatus" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.xcStatus"/>
</template>
</el-table-column>
<el-table-column label="审核备注" align="center" prop="shRemark" min-width="120" show-overflow-tooltip/>
<el-table-column label="图片" align="center" prop="picture" >
<el-table-column label="审核部门" align="center" prop="auditDept" min-width="180" show-overflow-tooltip/>
<el-table-column label="审核结果" align="center" prop="auditResult" min-width="180" show-overflow-tooltip>
<template slot-scope="scope">
<image-preview :src="scope.row.picture" :width="50" :height="50"/>
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
</template>
</el-table-column>
<el-table-column label="巡查情况描述" align="center" prop="content" min-width="200" show-overflow-tooltip/>
<el-table-column label="审核人" align="center" prop="auditName" min-width="180" show-overflow-tooltip/>
<el-table-column label="审核原因" align="center" prop="auditReason" min-width="180" show-overflow-tooltip/>
<el-table-column label="审核备注" align="center" prop="shRemark" min-width="180" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
<template slot-scope="scope">
<el-button
v-if="scope.row.xcStatus==='0'"
size="mini"
type="text"
icon="el-icon-edit"
@ -200,6 +208,26 @@
@click="handleUpdate1(scope.row)"
v-hasPermi="['szxc:xcrecard:edit']"
>整改进度</el-button>
<el-button
v-if="scope.row.xcStatus==='0'"
size="mini"
type="text"
@click="handleShenHe(scope.row)"
v-hasPermi="['szxc:wish:edit']"
>审核</el-button>
<el-button
v-if="scope.row.xcStatus==='2'"
size="mini"
type="text"
@click="handleUpdate2(scope.row)"
v-hasPermi="['szxc:wish:edit']"
>重新提交</el-button>
<el-button
size="mini"
type="text"
@click="handleSHJL(scope.row)"
v-hasPermi="['szxc:wish:edit']"
>审核记录</el-button>
</template>
</el-table-column>
</el-table>
@ -303,23 +331,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="审核状态" prop="xcStatus">
<el-select
v-model="form.xcStatus"
placeholder="审核状态"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_audit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="图片" prop="picture">
@ -328,9 +339,6 @@
<el-form-item label="巡查情况描述" prop="content">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
<el-form-item label="审核备注" prop="shRemark">
<el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -350,11 +358,53 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 审核对话框 -->
<el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>
<el-form ref="shenHeForm" :model="shenHe.form" :rules="shenHe.rules" label-width="90px">
<el-form-item label="审核结果" prop="auditResult">
<el-select
v-model="shenHe.form.auditResult"
placeholder="请选择审核结果"
clearable
style="width:100%"
>
<el-option label="通过" value="1"/>
<el-option label="不通过" value="2"/>
</el-select>
</el-form-item>
<el-form-item label="审核原因" prop="auditReason">
<el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="shenHe.form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="shenHeSubmit">确 定</el-button>
</div>
</el-dialog>
<el-dialog title="审核记录" :visible.sync="shjl.visible" width="1000px" append-to-body>
<el-table v-loading="shjl.loading" :data="shjl.list" border>
<el-table-column label="审核部门" align="center" prop="auditDept" />
<el-table-column label="审核人" align="center" prop="auditName" />
<el-table-column label="审核结果" align="center" prop="auditResult" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.auditResult"/>
</template>
</el-table-column>
<el-table-column label="审核原因" align="center" prop="auditReason" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
</el-dialog>
</div>
</template>
<script>
import { listXcrecard, getXcrecard, delXcrecard, addXcrecard, updateXcrecard } from "@/api/szxc/xcrecard";
import { listXyrecard, addXyrecard } from "@/api/szxc/xyrecard";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -455,7 +505,34 @@ export default {
zgProgress: [
{ required: true, message: "整改进度不能为空", trigger: "blur" }
],
}
},
// 审核
shenHe:{
row: null,
// 是否显示审核弹出层
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
auditResult: [
{ required: true, message: "审核结果不能为空", trigger: "blur" }
],
auditReason: [
{ required: true, message: "审核原因不能为空", trigger: "blur" }
],
}
},
// 审核记录信息
shjl: {
visible: false,
// 遮罩层
loading: false,
// 查询列表
list: [],
// 选中信息
selectedRow: null,
},
};
},
created() {
@ -568,6 +645,7 @@ export default {
this.getList();
});
} else {
this.form.xcStatus = '0'
addXcrecard(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
@ -592,7 +670,83 @@ export default {
this.download('szxc/xcrecard/export', {
...this.queryParams
}, `xcrecard_${new Date().getTime()}.xlsx`)
}
},
/** 审核按钮操作 */
handleShenHe(row) {
this.shenHe.row = row;
this.resetForm("shenHeForm");
this.shenHe.form = {
id: null,
shRecardType: '0',
jlId: row.id,
auditDept: row.auditDept,
auditName: this.$store.state.user.nickName,
auditResult: null,
auditReason: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.shenHe.open = true
},
// 审核提交
shenHeSubmit(){
this.$refs["shenHeForm"].validate(valid => {
if (valid) {
this.shenHe.row.auditName = this.shenHe.form.auditName;
this.shenHe.row.auditResult = this.shenHe.form.auditResult;
this.shenHe.row.auditReason = this.shenHe.form.auditReason;
this.shenHe.row.shRemark = this.shenHe.form.remark;
if(this.shenHe.form.auditResult==='1'){
this.shenHe.row.xcStatus = '1'
}
if(this.shenHe.form.auditResult==='2'){
this.shenHe.row.xcStatus = '2'
}
updateXcrecard(this.shenHe.row).then(response1 => {
addXyrecard(this.shenHe.form).then(response => {
this.$modal.msgSuccess("操作成功");
this.shenHe.open = false;
this.getList();
});
});
}
});
},
// 审核记录信息
handleSHJL(row){
this.shjl.selectedRow = row;
this.shjl.visible = true;
this.getlistXyrecard();
},
/** 查询审核记录信息列表 */
getlistXyrecard() {
listXyrecard({
pageNum: 1,
pageSize: 100000000,
shRecardType: '0',
jlId: this.shjl.selectedRow.id
}).then(response => {
this.shjl.list = response.rows
});
},
/** 重新提交按钮操作 */
handleUpdate2(row) {
this.reset();
const id = row.id
getXcrecard(id).then(response => {
this.form = response.data;
this.form.xcStatus = '0';
this.form.auditName = '';
this.form.auditResult = '';
this.form.auditReason = '';
this.form.shRemark = '';
this.open = true;
this.title = "修改巡查记录";
});
},
}
};
</script>

Write Preview
Loading…
Cancel
Save