From a00f2386cd0e504892abb4af6cfe2f5c8502105f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 07 八月 2024 13:40:46 +0800
Subject: [PATCH] 1.递交
---
src/views/basicSettings/meterPrice.vue | 16 +++++++
src/views/workOrder/workOrderList.vue | 90 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/views/basicSettings/meterPrice.vue b/src/views/basicSettings/meterPrice.vue
index 4fee272..42ab6ef 100644
--- a/src/views/basicSettings/meterPrice.vue
+++ b/src/views/basicSettings/meterPrice.vue
@@ -297,7 +297,6 @@
/>
<div style="margin-left: 5px">绉�</div>
</div>
-
</template>
</el-table-column>
<el-table-column
@@ -330,6 +329,19 @@
>
<template slot-scope="{row}">
<el-input v-model="row.unprice" oninput="value=value.replace(/[^0-9.]/g,'')" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="enable"
+ label="鏄惁鍚敤"
+ min-width="150"
+ >
+ <template slot-scope="{row}">
+ <el-switch
+ v-model="row.enable"
+ inactive-value="N"
+ active-value="Y"
+ />
</template>
</el-table-column>
</el-table>
@@ -781,6 +793,7 @@
row.stand_value = 0
}
},
+
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
@@ -792,6 +805,7 @@
this.$refs.tableDataRef.doLayout()
})
}
+
}
}
</script>
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index c3f274e..ab7f027 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -767,6 +767,91 @@
:cell-style="this.$cellStyle"
row-key="stepcode"
>
+ <el-table-column type="expand">
+ <template slot-scope="props">
+
+ <el-table
+ :data="props.row.children"
+ style="width: 96%;margin: auto;"
+ border
+ :row-class-name="tableRowClassName"
+ >
+ <el-table-column
+ prop="eqp_code"
+ label="璁惧/寰�鏉ョ紪鐮�"
+ min-width="120"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧/寰�鏉ュ悕绉�"
+ min-width="120"
+ />
+ <el-table-column
+ prop="eqp_value"
+ label="璁惧鑺傛媿"
+ min-width="150"
+ >
+ <template slot-scope="{row}">
+ <div style="display: flex;align-items: center">
+ <el-input
+ v-model="row.eqp_value"
+ placeholder="璇疯緭鍏�"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ @change="val=>eqpValueChange(val,row)"
+ />
+ <div style="margin-left: 5px">绉�</div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stand_value"
+ label="鐢熶骇鑺傛媿"
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.stand_value + ' ' + '绉�/娆�' }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="cavity_qty"
+ label="鑵斿瀷鏁�"
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <el-input
+ v-model="row.cavity_qty"
+ placeholder="璇疯緭鍏�"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ @change="val=>cavityQtyChange(val,row)"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unprice"
+ label="宸ュ簭宸ヤ环"
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <el-input v-model="row.unprice" oninput="value=value.replace(/[^0-9.]/g,'')" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="enable"
+ label="鏄惁鍚敤"
+ min-width="150"
+ >
+ <template slot-scope="{row}">
+ <el-switch
+ v-model="row.enable"
+ inactive-value="N"
+ active-value="Y"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-table-column>
+
<el-table-column
type="index"
label="搴忓彿"
@@ -793,7 +878,6 @@
placeholder="璇疯緭鍏ュ伐搴忓崟浠�"
oninput="value=value.replace(/[^0-9.]/g,'')"
style="width: 100%"
- @click=""
/>
</template>
</el-table-column>
@@ -2882,7 +2966,7 @@
this.dialogForm.mesmaxqty = res.canupdate_qty
if (this.mesSetting.route) { // 鎸夊伐鑹鸿矾绾胯蛋妯″紡
- if (!this.dialogForm.routecode) {
+ if (this.dialogForm.routecode) {
await this.getPartcodeChangeDialog()
}
@@ -3009,7 +3093,7 @@
res.forEach(i => {
this.stepTableData.push(
{
- stepcode: i.step_code,
+ stepcode: i.code,
// stepname: i.stepname,
stepprice: i.unprice
}
--
Gitblit v1.9.3