From dea3e0d4fc4ec96f12eaf3d8ecb32a8d3659ea32 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 05 一月 2023 16:48:36 +0800
Subject: [PATCH] 1.节拍工价 取消行功能优化
---
src/views/zzmx/jpgj.vue | 10 ++++++----
src/styles/global.css | 1 +
src/views/kb/cgdd.vue | 32 ++++++++++++++++++++++----------
public/favicon.ico | 0
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac..1d643d0 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/styles/global.css b/src/styles/global.css
index af5ecb4..d0026d2 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -83,6 +83,7 @@
width: 100%;
margin: 10px auto;
/*margin-top: 20px;*/
+ box-shadow: 0 0 5px #d7d6d6;
}
.operationClass {
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 3c48a08..3c82b2c 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -44,7 +44,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">閲囪喘鍒拌揣璺熻釜 <div style="margin-left: 30px">{{ number1 }} 鍗�</div></div>
+ <div class="content_head kb_title_text">閲囪喘鍒拌揣璺熻釜
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -138,7 +140,12 @@
prop="checkuser"
label="妫�楠屼汉鍛�"
width="94"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.checkuser===null">/</div>
+ <div v-else>{{ row.checkuser }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="quantity1"
label="宸叉敹鏁伴噺"
@@ -154,7 +161,7 @@
width="94"
>
<template slot-scope="{row}">
- <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity- row.quantity1) }}</div>
+ <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>
<div v-else>0</div>
</template>
</el-table-column>
@@ -174,10 +181,15 @@
width="114"
>
<template slot-scope="{row}">
- <div v-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
+ <div v-if="parseFloat(row.warning)<0" style="color: red">{{
+ Math.abs(parseFloat(row.warning))
+ }}
+ </div>
<div v-else-if="row.warning===null||row.warning===''||row.warning===0">0</div>
<div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>
- <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">{{ row.warning }}</div>
+ <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">
+ {{ row.warning }}
+ </div>
</template>
</el-table-column>
</el-table>
@@ -354,7 +366,7 @@
},
getPurchaseLeftBottom() {
PurchaseLeftBottom().then(res => {
- this.tableData = res.data
+ this.tableData = res.data.filter(i => !parseFloat(i.quantity1))// 杩囨护鎺夊凡鏀舵暟閲忓ぇ浜庨浂鐨勫��
this.number1 = this.tableData.length
const divData = this.$refs.tableData.bodyWrapper
@@ -367,7 +379,7 @@
// 閲嶇疆table璺濈椤堕儴璺濈
divData.scrollTop = 0
PurchaseLeftBottom().then(res => {
- this.tableData = res.data
+ this.tableData = res.data.filter(i => !parseFloat(i.quantity1))// 杩囨护鎺夊凡鏀舵暟閲忓ぇ浜庨浂鐨勫��
this.number1 = this.tableData.length
if (this.tableData.length > 14) {
clearInterval(this.PurchaseLeftBottom)
@@ -456,7 +468,7 @@
<style scoped lang="scss">
//$kbBorderColor: #09d8f2;
-$kbBorderColor: rgba(9,216,242,0.4);
+$kbBorderColor: rgba(9, 216, 242, 0.4);
.kb_content {
display: flex;
@@ -484,7 +496,7 @@
display: flex;
//border: 1px solid rgba(255, 255, 255, 0.6);
justify-content: space-around;
- background-color: rgba(30, 33, 46,0.6);
+ background-color: rgba(30, 33, 46, 0.6);
.content01 {
margin: auto;
@@ -509,7 +521,7 @@
font-size: 20px;
}
- .text{
+ .text {
margin-top: 50px;
font-size: 20px;
}
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 8c67361..de525e9 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -431,10 +431,10 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-show="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
- <el-button v-show="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
- <el-button v-show="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-show="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
</div>
</template>
</el-table-column>
@@ -714,6 +714,8 @@
// 鍙栨秷琛�
cancelRow(row) {
this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
+ this.dialogForm.stepcode = this.radioChangeTempValue
this.isEqpTableEdit = true
},
// 缂栬緫琛�
--
Gitblit v1.9.3