From 7985764aa551ca2a74041e35f76e86ab67f0b3b3 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 22 十二月 2025 16:30:08 +0800
Subject: [PATCH] 1.新增 控制指定车间是否末道工序报工
---
src/views/basicSettings/organizationList.vue | 20 ++++++++++++++++++++
src/views/workOrder/workOrderList.vue | 25 +++++++++++++++----------
2 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 7fe1420..681c698 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -92,6 +92,16 @@
</template>
</el-table-column>
<el-table-column
+ prop="islastreport"
+ label="鏄惁鏈亾鎶ュ伐"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.islastreport==='Y'" size="small" type="success">鏄�</el-tag>
+ <el-tag v-if="row.islastreport==='N'" size="small" type="danger">鍚�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="username"
label="鍒涘缓浜哄憳"
sortable="custom"
@@ -164,6 +174,7 @@
ref="cascader"
v-model="dialogForm.storgcode"
:options="cascaderOptions"
+ style="width: 492px;"
filterable
:props="defaultProps"
:show-all-levels="false"
@@ -174,6 +185,12 @@
<el-radio-group v-model="dialogForm.status">
<el-radio label="Y">姝ｅ父</el-radio>
<el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item required label="鏄惁鏈亾鎶ュ伐" label-width="120px">
+ <el-radio-group v-model="dialogForm.islastreport">
+ <el-radio label="Y">鏄�</el-radio>
+ <el-radio label="N">鍚�</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@@ -235,6 +252,7 @@
storgcode: '', // 鐖剁骇缂栫爜
parent_id: '', // 鍘焢id
torg_seq: '', // 鎺掑簭
+ islastreport: 'N', //
status: 'Y'// 鐘舵��
},
operation: '',
@@ -332,6 +350,7 @@
this.dialogForm.leve = parseFloat(row.leve)
this.dialogForm.torg_seq = row.torg_seq
this.dialogForm.status = row.status
+ this.dialogForm.islastreport = row.islastreport
this.dialogForm.storgcode = this.findParent([], row.parent_id, this.cascaderOptions).reverse()
this.dialogForm.parent_id = row.parent_id
})
@@ -398,6 +417,7 @@
this.dialogForm.storgcode = ''
this.dialogForm.parent_id = ''
this.dialogForm.status = 'Y'
+ this.dialogForm.islastreport = 'N'
this.dialogForm.leve = 0
this.$refs.cascader.checkedValue = ''
this.$refs.dialogForm.clearValidate()
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index e00068f..9ff67f5 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -514,18 +514,18 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
>
- <!-- <el-table-column-->
- <!-- width="50"-->
- <!-- type="index"-->
- <!-- prop="搴忓彿"-->
- <!-- fixed-->
- <!-- /> -->
<el-table-column
width="50"
- prop="seq"
- label="搴忓彿"
+ type="index"
+ prop="搴忓彿"
fixed
/>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- prop="seq"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
+ <!-- />-->
<el-table-column
prop="wo_code"
show-tooltip-when-overflow
@@ -4463,7 +4463,12 @@
data_sources: row.data_sources
}
const { data: res } = await UpdateMesOrderStepSearch(data)
- this.tableDataDetail = res.stepdata
+
+ if (row.islastreport === 'Y') {
+ this.tableDataDetail = res.stepdata.filter(i => i.isend === 'Y')
+ } else {
+ this.tableDataDetail = res.stepdata
+ }
},
// 宸ュ簭鍒犻櫎
stepDel(row) {
@@ -4539,7 +4544,7 @@
getSummaries(param) {
const { columns, data } = param
const sums = []
- const i = 9
+ const i = 11
columns.forEach((column, index) => {
if (index === i) {
sums[index] = '鎬绘暟'
--
Gitblit v1.9.3