From e5fb337fe1b0e788f4d99523f889aa28aa03fc86 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期四, 07 四月 2022 16:47:41 +0800 Subject: [PATCH] 已评审 --- src/views/safetyproduction/gojudging.vue | 62 +++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue index f0947c3..80eb638 100644 --- a/src/views/safetyproduction/gojudging.vue +++ b/src/views/safetyproduction/gojudging.vue @@ -1,6 +1,7 @@ <template> <div> <div class="box-right"> + <el-button type="primary" style="float: right" @click="finish()">结单</el-button> <div v-for="(item, index) in lists" :key="index" style="padding:0 0 20px 0"> <div class="title"> A级要素:<span>{{ item.elementAName }}</span> @@ -11,12 +12,14 @@ ><p><span>B级要素:</span>{{ item.elementBName }}</p></el-col > <el-col :span="6" - ><p><span>得分:</span>50</p></el-col + ><p><span>总分:</span>50</p></el-col > + <el-col :span="6" + ><p><span>得分:</span>{{item.point}}</p></el-col> </el-row> <el-row> <el-col :span="24"> - <el-table border :data="item.child"> + <el-table border :data="item.child" :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}"> <el-table-column prop="standardizationRequirements" align="center" @@ -57,6 +60,8 @@ <template slot-scope="scope"> <el-table :data="scope.row.selfDeductionList" + border + :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}" > <el-table-column prop="name" align="center" label="扣分项"> </el-table-column> @@ -99,7 +104,7 @@ </template> <script> import Titlename from "../../components/Titlename/index.vue"; -import { safetySelfInspectionInfo } from "@/api/safetySelfInspection.js"; +import { safetySelfInspectionInfo ,safetySelfInspectionFinish} from "@/api/safetySelfInspection.js"; export default { components: { Titlename }, data() { @@ -122,6 +127,33 @@ this.safeInitem(this.id); }, methods: { + finish(){ + let id = this.id + this.$confirm('确定要结单吗?','提示',{ + confirmButtonText:'确定', + cancelButtonText:'取消', + type:'warning', + }).then(()=> { + safetySelfInspectionFinish({id:this.id}).then(res=>{ + console.log(123,res) + if (res.data.code === '200') { + this.$notify({ + title:'成功', + message:'结单成功', + type:'success', + duration:2000, + }) + }else{ + this.$message({ + message:res.data.message, + type:'warning' + }) + } + }) + }).catch(error =>{ + }) + }, + safeInitem(id) { safetySelfInspectionInfo({ id: id }).then((res) => { if (res.data.code == 200) this.list = res.data.result; @@ -130,6 +162,7 @@ arr[i].child = this.checkSameData(arr[i].child); } this.lists = arr; + // console.log('tag', arr) }); }, checkSameDataA(resData) { @@ -154,12 +187,30 @@ if (!dataInfo[elementBName]) { dataInfo[elementBName] = { elementBName, + point:"", child: [], }; } dataInfo[elementBName].child.push(item); }); let list = Object.values(dataInfo); // list 转换成功的数据 + console.log(list) + for(var i=0;i<list.length;i++){ + var pot=50 + for(var j=0;j<list[i].child.length;j++){ + if(list[i].child[j].safetyInspectionItemResult!=0){ + pot=pot-list[i].child[j].selfDeductionList[0].point + }else{ + var cont=0 + pot=0 + } + } + if(pot>0){ + list[i].point=pot + }else{ + list[i].point=0 + } + } return list; }, handleClick(data) { @@ -186,6 +237,8 @@ background-color: white; border-radius: 5px; padding: 20px; + height: 850px; + overflow-y:overlay; } .title { font-size: 16px; @@ -195,4 +248,7 @@ .titles { font-size: 14px; } +.box-right /deep/ .el-table__expanded-cell{ + background-color: #fff !important; +} </style> -- Gitblit v1.9.2