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/api/WorkOrder.js | 18 ++++
vue.config.js | 4
src/views/statistic/workOrderProcess.vue | 2
src/views/workOrder/workOrderClose.vue | 62 +++++++++++++--
src/views/workOrder/produceOrderList.vue | 90 ++++++++++++++++------
src/views/produce/reportCorrect.vue | 2
src/views/workOrder/workOrderSend.vue | 2
src/views/statistic/defectDetailList.vue | 2
src/views/statistic/personSalaryList.vue | 2
src/views/statistic/repairDetailList.vue | 2
src/views/statistic/groupSalaryList.vue | 2
src/views/statistic/subcontractingOperation.vue | 2
src/views/kanbanManager/zhkb.vue | 2
src/views/produce/stepReport.vue | 2
src/views/workOrder/workOrderList.vue | 2
src/views/produce/reportVerify.vue | 2
16 files changed, 148 insertions(+), 50 deletions(-)
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
index ac81081..6ee1881 100644
--- a/src/api/WorkOrder.js
+++ b/src/api/WorkOrder.js
@@ -43,6 +43,15 @@
})
}
+// ERP璁㈠崟鍙嶅叧闂�
+export function ReverseClosedErpOrder(data) {
+ return request({
+ url: 'WorkOrder/ReverseClosedErpOrder',
+ method: 'post',
+ params: data
+ })
+}
+
// ERP璁㈠崟鍒犻櫎
export function DeleteErpOrder(data) {
return request({
@@ -133,6 +142,15 @@
})
}
+// MES宸ュ崟鍚姩鎻愪氦
+export function MesOrderBitchReverseClosedSeave(data) {
+ return request({
+ url: 'WorkOrder/MesOrderBitchReverseClosedSeave',
+ method: 'post',
+ data
+ })
+}
+
// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
export function MesOrderStepSearch(data) {
return request({
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index 8660532..8306516 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -175,7 +175,7 @@
const res = await PrentOrganizationNoCompany()
this.wkshopArr = res.data
- const temp = ['CJ001', '006', 'ZP001']
+ const temp = ['00301', '00302', '00303']
temp.forEach(i => {
const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 7df5531..3801568 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -106,7 +106,7 @@
<!-- />-->
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 5fec7b8..20a414d 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -133,7 +133,7 @@
/>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index b48169f..d71a72d 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -178,7 +178,7 @@
</el-table-column>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
label="搴忓彿"
fixed
/>
diff --git a/src/views/statistic/defectDetailList.vue b/src/views/statistic/defectDetailList.vue
index 18a7a12..c91d38e 100644
--- a/src/views/statistic/defectDetailList.vue
+++ b/src/views/statistic/defectDetailList.vue
@@ -114,7 +114,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/statistic/groupSalaryList.vue b/src/views/statistic/groupSalaryList.vue
index 9d61962..d9727f0 100644
--- a/src/views/statistic/groupSalaryList.vue
+++ b/src/views/statistic/groupSalaryList.vue
@@ -149,7 +149,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index d4aa68f..4d5e263 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -148,7 +148,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/statistic/repairDetailList.vue b/src/views/statistic/repairDetailList.vue
index 09c6421..a58f316 100644
--- a/src/views/statistic/repairDetailList.vue
+++ b/src/views/statistic/repairDetailList.vue
@@ -122,7 +122,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/statistic/subcontractingOperation.vue b/src/views/statistic/subcontractingOperation.vue
index 1eec12e..3b262b2 100644
--- a/src/views/statistic/subcontractingOperation.vue
+++ b/src/views/statistic/subcontractingOperation.vue
@@ -123,7 +123,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
diff --git a/src/views/statistic/workOrderProcess.vue b/src/views/statistic/workOrderProcess.vue
index b517db9..3fb6b68 100644
--- a/src/views/statistic/workOrderProcess.vue
+++ b/src/views/statistic/workOrderProcess.vue
@@ -114,7 +114,7 @@
>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
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('宸插彇娑堝叧闂紒')
+ })
+ // }
}
})
},
diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index 4435910..9fb197a 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -3,7 +3,8 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup">
- <el-button v-waves icon="el-icon-switch-button" type="success" @click="orderClose()">宸ュ崟鍏抽棴</el-button>
+ <el-button v-waves icon="el-icon-switch-button" type="danger" @click="orderClose()">宸ュ崟鍏抽棴</el-button>
+ <el-button v-waves icon="el-icon-thumb" type="success" @click="orderOpen()">宸ュ崟鍚姩</el-button>
</div>
<div class="bodyTopFormGroup">
@@ -136,6 +137,7 @@
</div>
<div class="elTableDiv">
+ <!-- @row-click="rowClick"-->
<el-table
ref="tableDataRef"
class="tableFixed"
@@ -148,17 +150,16 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
- @row-click="rowClick"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="50"
- :selectable="selected"
/>
+ <!-- :selectable="selected"-->
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
label="搴忓彿"
fixed
/>
@@ -347,10 +348,20 @@
<el-tooltip class="item" effect="dark" content="宸ュ崟鍏抽棴" placement="top">
<i
+ v-if="row.status!=='CLOSED'"
class="el-icon-switch-button"
style="cursor: pointer;margin-left: 15px"
- :style="{color:$store.state.settings.theme}"
+ :style="{color:'red'}"
@click.stop="orderClose(row)"
+ />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="宸ュ崟鍚姩" placement="top">
+ <i
+ v-if="row.status==='CLOSED'"
+ class="el-icon-thumb"
+ style="cursor: pointer;margin-left: 15px"
+ :style="{color:$store.state.settings.theme}"
+ @click.stop="orderOpen(row)"
/>
</el-tooltip>
@@ -1976,7 +1987,7 @@
AddUpdateMesOrder, DeleteMesOrder,
MesBadOrderSearch, MesOrderDistribution,
MesOrderClosedSearch,
- UpdateMesOrderStepSearch, MesOrderBitchClosedSeave
+ UpdateMesOrderStepSearch, MesOrderBitchClosedSeave, MesOrderBitchReverseClosedSeave
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
@@ -2423,7 +2434,7 @@
this.dialogVisibleTask = false
},
handleSelectionChange(val) {
- this.multipleSelection = val.map(i => i.wo_code)
+ this.multipleSelection = val
},
selected(row, index) {
@@ -2520,15 +2531,19 @@
},
// 宸ュ崟鍏抽棴浜嬩欢
async orderClose(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ this.$confirm('鏄惁纭鍏抽棴?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
+ let data = null
if (row) { // 琛屽叧闂伐鍗�
- this.multipleSelection = [row.wo_code]
+ data = [row.wo_code]
+ } else {
+ data = this.multipleSelection.filter(i => i.status !== 'CLOSED').map(i => i.wo_code)
}
- MesOrderBitchClosedSeave(this.multipleSelection).then(res => {
+
+ MesOrderBitchClosedSeave(data).then(res => {
if (res.code === '200') {
this.$notify.success('鍏抽棴鎴愬姛!')
// if (this.form.page > 1 && this.tableData.length === 1) {
@@ -2541,6 +2556,33 @@
this.$notify.info('宸插彇娑堝垹闄わ紒')
})
},
+ // 宸ュ崟鍚姩浜嬩欢
+ async orderOpen(row) {
+ this.$confirm('鏄惁纭鍚姩?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let data = null
+ if (row) { // 琛屽惎鍔ㄥ伐鍗�
+ data = [row.wo_code]
+ } else {
+ data = this.multipleSelection.filter(i => i.status === 'CLOSED').map(i => i.wo_code)
+ }
+
+ MesOrderBitchReverseClosedSeave(data).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍚姩鎴愬姛!')
+ // if (this.form.page > 1 && this.tableData.length === 1) {
+ // this.form.page--
+ // }
+ this.getMesOrderClosedSearch()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄わ紒')
+ })
+ },
// 瀵硅瘽妗嗕骇鍝佷俊鎭�兼敼鍙�
partcodeChangeDialog(val) {
console.log(val)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index dec0654..6e12be6 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -163,7 +163,7 @@
/>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
label="搴忓彿"
fixed
/>
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index c726f93..305ee5b 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.vue
@@ -164,7 +164,7 @@
<!-- />-->
<el-table-column
prop="rowNum"
- width="50"
+ width="80 "
label="搴忓彿"
fixed
/>
diff --git a/vue.config.js b/vue.config.js
index b1d699a..6a358eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://121.196.36.24:8031', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.21.221:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ target: 'http://121.196.36.24:8031', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴娴嬭瘯鍦板潃
+ // target: 'http://192.168.21.221:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鍦板潃
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3