From 752670ad623900bd8ffdbfd68d2a0e34f4d623ed Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 15 四月 2024 18:00:55 +0800
Subject: [PATCH] 1.新增订单启动 工单启动功能
---
src/views/workOrder/produceOrderList.vue | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 6ac4df5..b6198de 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -164,11 +164,11 @@
@selection-change="handleSelectionChange"
>
<!-- @row-click="rowClick"-->
- <el-table-column
- type="selection"
- width="50"
- :selectable="selected"
- />
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- :selectable="selected"-->
+ <!-- />-->
<!-- <el-table-column-->
<!-- width="50"-->
<!-- fixed-->
@@ -184,7 +184,7 @@
<!-- </el-table-column>-->
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
@@ -340,7 +340,7 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
+ <el-tooltip class="item" effect="dark" content="璁㈠崟涓嬭揪" placement="top">
<!-- <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
<i
class="el-icon-bottom"
@@ -351,10 +351,21 @@
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍏抽棴" placement="top">
<i
+ v-if="row.status!=='CLOSED'"
class="el-icon-switch-button"
- :style="{color:$store.state.settings.theme}"
+ :style="{color:'red'}"
style="cursor: pointer;margin-left: 15px"
@click="orderClose(row.id)"
+ />
+ </el-tooltip>
+
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍚姩" placement="top">
+ <i
+ v-if="row.status==='CLOSED'"
+ class="el-icon-thumb"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-left: 15px"
+ @click="orderOpen(row.id)"
/>
</el-tooltip>
@@ -479,7 +490,7 @@
DeleteErpOrder,
ErpOrderSearch,
MarkBatchSaveErpOrder,
- MarkSaveErpOrder
+ MarkSaveErpOrder, ReverseClosedErpOrder
} from '@/api/WorkOrder'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
@@ -700,6 +711,7 @@
this.form.partname = ''
this.form.partspec = ''
this.form.paystartdate = ''
+ this.form.saleordercode = ''
this.form.payenddate = ''
this.form.creatuser = ''
this.form.erpordercode = ''
@@ -743,24 +755,50 @@
async orderClose(id) {
this.tableData.forEach(item => {
if (item.id === id) {
- if (item.status !== 'NEW') {
- return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
- } else {
- this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
- if (res.code === '200') {
- this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
- this.getErpOrderSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝叧闂紒')
+ // if (item.status !== 'NEW') {
+ // return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
+ // } else {
+ this.$confirm('鏄惁纭鍏抽棴璁㈠崟锛岃璁㈠崟涓嬬殑鎵�鏈夊伐鍗曞皢浼氬叧闂紒', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
+ this.getErpOrderSearch()
+ }
})
- }
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝叧闂紒')
+ })
+ // }
+ }
+ })
+ },
+
+ // 璁㈠崟寮�鍚�
+ async orderOpen(id) {
+ this.tableData.forEach(item => {
+ if (item.id === id) {
+ // if (item.status !== 'NEW') {
+ // return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
+ // } else {
+ this.$confirm('鏄惁纭鍚姩璁㈠崟锛岃璁㈠崟涓嬬殑鎵�鏈夊伐鍗曞皢浼氬紑鍚紒', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ ReverseClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍚姩鎴愬姛!')
+ this.getErpOrderSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝叧闂紒')
+ })
+ // }
}
})
},
--
Gitblit v1.9.3