From 271679eded47a621158e7a4f1a570ed1b4b508c8 Mon Sep 17 00:00:00 2001
From: panzy <225@qq.com>
Date: 星期二, 10 五月 2022 21:05:30 +0800
Subject: [PATCH] 对接接口
---
src/views/hiddenDangerManagement/fillRectification.vue | 25 ++++++++----
src/api/sgyhpczl/hiddenDangerManagement.js | 12 ++++++
src/views/hiddenDangerManagement/fillInspector.vue | 71 +++++++++++++++++++++++++++++++++--
src/views/hiddenDangerManagement/fillRectificationAdd.vue | 7 +++
4 files changed, 101 insertions(+), 14 deletions(-)
diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js
index a0670c0..974b827 100644
--- a/src/api/sgyhpczl/hiddenDangerManagement.js
+++ b/src/api/sgyhpczl/hiddenDangerManagement.js
@@ -135,3 +135,15 @@
data
})
}
+
+export function getUserInfo() {
+ return request({
+ headers: {
+ 'Authorization': getToken()
+ },
+ url: process.env.BASE_API + '/auth/verify',
+ method: 'get',
+ data: { 'token': getToken(), 'action': 'getUserInfo' }
+ })
+}
+
diff --git a/src/views/hiddenDangerManagement/fillInspector.vue b/src/views/hiddenDangerManagement/fillInspector.vue
index 8383cbc..33df0e6 100644
--- a/src/views/hiddenDangerManagement/fillInspector.vue
+++ b/src/views/hiddenDangerManagement/fillInspector.vue
@@ -3,7 +3,7 @@
<div>
<Titlename title="填写督查"></Titlename>
<div class="whole-form">
- <el-form :model="config" ref="configTableForm">
+ <el-form ref="configTableForm">
<el-table
:data="tableData"
border
@@ -24,7 +24,7 @@
width="100">
</el-table-column>
<el-table-column
- prop="hiddenDanger"
+ prop="ht_branch"
label="隐患单位"
align="center"
width="100">
@@ -45,6 +45,7 @@
prop="check_date"
label="检查时间"
align="center"
+ :formatter="formatDate"
width="100">
</el-table-column>
<el-table-column
@@ -87,12 +88,14 @@
prop="alter_time"
label="限改时间"
align="center"
+ :formatter="formatDate"
width="120">
</el-table-column>
<el-table-column
prop="ACCOMPLISHTIME"
align="center"
label="完成时间"
+ :formatter="formatDate"
width="100">
</el-table-column>
<el-table-column
@@ -105,15 +108,17 @@
prop="CALLBACKTIME"
align="center"
width="100"
+ :formatter="formatDate"
label="复查时间">
</el-table-column>
<el-table-column
prop="inspectionClass"
label="督察单位"
+ disabled=""
align="center"
width="160">
<div class="item" slot-scope="scope">
- <el-input class="item__input" v-model="scope.row.inspectionClass" placeholder="请输入内容" clearable></el-input>
+ <el-input class="item__input" v-model="scope.row.inspectionClass" disabled placeholder="请输入内容" clearable></el-input>
<div class="item__txt">{{scope.row.inspectionClass}}</div>
</div>
</el-table-column>
@@ -158,7 +163,7 @@
class="btns"
size="small"
type="primary"
- @click="submitConfig('config')">保存</el-button>
+ @click="submitConfig()">保存</el-button>
<el-button size="small"
@click="close()">关闭</el-button>
</div>
@@ -169,13 +174,16 @@
</template>
<script>
+
import Titlename from "../../components/Titlename/index.vue";
+ import {getUserInfo,self_edit_do} from "@/api/sgyhpczl/hiddenDangerManagement";
export default {
components: {Titlename},
name: "fillInspector",
data() {
return {
+ department:"",
// 表格数据
tableData: [],
// 需要编辑的属性
@@ -183,8 +191,17 @@
};
},
mounted(){
- console.log(this.$store)
this.tableData = this.$route.query.checkData;
+ getUserInfo().then(res=>{
+ if(res.data.code == 200){
+ this.tableData.forEach(n=>{
+ n.inspectionClass = res.data.result.department;
+ n.inspectionTime = new Date().toLocaleDateString().replaceAll("/","-")
+ })
+ }else{
+ this.$message({type:'error', message:"用户信息获取失败！请重试", duration:3000})
+ }
+ })
},
computed: {
foodLabel () {
@@ -210,6 +227,50 @@
// cell.querySelector('.item__txt').style.display = 'block'
}
},
+ submitConfig(){
+ console.log(this.tableData)
+ var requestData = [];
+ this.tableData.forEach(n=>{
+ if(n.inspectionResult == null ||n.inspectionResult == ""
+ ||n.inspectionMan == null ||n.inspectionMan == "" ){
+ this.$message({type: 'Warn', message: "请填写完整信息", duration: 3000})
+ return;
+ }
+ var data= {
+ "type": 2,
+ "id": n.id,
+ "inspectionResult": n.inspectionResult,
+ "inspectionMan": n.inspectionMan,
+ "inspectionTime": n.inspectionTime,
+ "inspectionClass": n.inspectionClass
+ }
+ requestData.push(data);
+ })
+
+ var successFlag = 0;
+ for (let i = 0; i < requestData.length; i++) {
+ self_edit_do(requestData[i]).then(res=>{
+ if(res.data.ok){
+ successFlag ++;
+ if(successFlag== requestData.length){
+ this.$message({type: 'success', message: "操作成功！", duration: 3000})
+ this.$router.push({
+ path:"/hiddenDangerManagement"
+ })
+ }
+ }
+ })
+ }
+ },
+ formatDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+ },
close(){
this.$router.push({
path:"/hiddenDangerManagement"
diff --git a/src/views/hiddenDangerManagement/fillRectification.vue b/src/views/hiddenDangerManagement/fillRectification.vue
index 57f70f1..d151cf0 100644
--- a/src/views/hiddenDangerManagement/fillRectification.vue
+++ b/src/views/hiddenDangerManagement/fillRectification.vue
@@ -24,7 +24,7 @@
width="100">
</el-table-column>
<el-table-column
- prop="hiddenDanger"
+ prop="ht_branch"
label="隐患单位"
align="center"
width="100">
@@ -44,6 +44,7 @@
<el-table-column
prop="check_date"
label="检查时间"
+ :formatter="formatDate"
align="center"
width="100">
</el-table-column>
@@ -86,6 +87,7 @@
<el-table-column
prop="alter_time"
label="限改时间"
+ :formatter="formatDate"
align="center"
width="120">
</el-table-column>
@@ -190,7 +192,7 @@
}
},
submitConfig(){
- var reqeustData = [];
+ var requestData = [];
for (const n of this.tableData) {
if (n.CALLBACKTIME == null || n.CALLBACKTIME == ""
|| n.CALLBACKPERSON == null || n.CALLBACKPERSON == ""
@@ -204,14 +206,14 @@
sigleData.CALLBACKTIME = n.CALLBACKTIME;
sigleData.CALLBACKPERSON = n.CALLBACKPERSON;
sigleData.ACCOMPLISHTIME = n.ACCOMPLISHTIME;
- reqeustData.push(sigleData);
+ requestData.push(sigleData);
}
var successFlag = 0;
- for (let i = 0; i < reqeustData.length; i++) {
- self_edit_do(reqeustData[i]).then(res=>{
+ for (let i = 0; i < requestData.length; i++) {
+ self_edit_do(requestData[i]).then(res=>{
if(res.data.ok){
successFlag ++;
- if(successFlag== reqeustData.length){
+ if(successFlag== requestData.length){
this.$message({type: 'success', message: "操作成功！", duration: 3000})
this.$router.push({
path:"/hiddenDangerManagement"
@@ -221,8 +223,15 @@
})
}
-
-
+ },
+ formatDate(row, column) {
+ // 获取单元格数据
+ let data = row[column.property]
+ if(data == null) {
+ return null
+ }
+ let dt = new Date(data)
+ return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
},
close(){
this.$router.push({
diff --git a/src/views/hiddenDangerManagement/fillRectificationAdd.vue b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
index 944f527..a099da3 100644
--- a/src/views/hiddenDangerManagement/fillRectificationAdd.vue
+++ b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
@@ -565,7 +565,7 @@
if (res.data.ok==1){
this.$message({type:'success', message:"新增成功", duration:3000})
this.$router.push({
- path:"/hiddenDangerRegistration"
+ path:"/hiddenDangerManagement"
})
}else {
this.$message({type:'error', message:res.data.msg, duration:3000})
@@ -578,6 +578,11 @@
}
});
},
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerManagement"
+ })
+ },
},
};
</script>
--
Gitblit v1.9.2