From 3b956ef69d23f52e5a52812259c6ff967723695e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 三月 2023 16:37:18 +0800
Subject: [PATCH] 1.节拍工价计件单价控制修改2.班组、人员报表红字添加
---
src/views/scgl/gd.vue | 1 +
src/views/xtsz/sc.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
src/views/zzmx/jpgj.vue | 2 +-
3 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index ed9761b..4c44ef9 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -2018,6 +2018,7 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+ this.sumbitBottonIsDisabled = false
},
// 棰勮
async check(row) {
diff --git a/src/views/xtsz/sc.vue b/src/views/xtsz/sc.vue
index b473666..1f63e66 100644
--- a/src/views/xtsz/sc.vue
+++ b/src/views/xtsz/sc.vue
@@ -50,52 +50,92 @@
min-width="160"
show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.define_name">{{ row.define_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="filetype_name"
label="鏂囦欢绫诲瀷"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.filetype_name">{{ row.filetype_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="file_version"
label="鐗堟湰鍙�"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.file_version">{{ row.file_version }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partcode"
label="鐗╂枡缂栫爜"
min-width="110"
show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partcode">{{ row.partcode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="partname"
label="鐗╂枡鍚嶇О"
min-width="110"
show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partname">{{ row.partname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
min-width="110"
show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.eqptype_name">{{ row.eqptype_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="username"
min-width="110"
label="涓婁紶浜哄憳"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.username">{{ row.username }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_date"
label="涓婁紶鏃堕棿"
min-width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.lm_date">{{ row.lm_date }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
width="120"
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 2656b6a..471cc3b 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -696,7 +696,7 @@
},
// 淇濆瓨琛�
async saveRow(row) {
- if (parseFloat(row.unprice) <= 0) {
+ if (parseFloat(row.unprice) <= 0 && this.eqpTable.steptype !== 'W') {
return this.$message.info('璁′欢鍗曚环蹇呴』澶т簬闆讹紒')
}
const data = {
--
Gitblit v1.9.3