From e3d123d92579acfb3a34816db2b18627d6f35813 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 25 九月 2023 11:30:57 +0800
Subject: [PATCH] 1.MES工单90% 2.工单派发100%
---
src/views/workOrder/workOrderList.vue | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index d2a2399..5bf0fb9 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -8,7 +8,7 @@
<el-button v-waves type="success" icon="el-icon-connection" @click="send">娲惧彂</el-button>
</div>
- <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
+ <!-- <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -1216,11 +1216,12 @@
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
</el-form-item>
- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">
- {{ formApprove.routename }}
- </el-form-item>
+ <!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
+ <!-- {{ formApprove.routename }}-->
+ <!-- </el-form-item>-->
<el-form-item label="鎵撳嵃浜哄憳:" class="formContent">
- {{ username }}
+ <!-- {{ localStorage.getItem('username') }}-->
+ {{ formApprove.routename }}
</el-form-item>
<el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
{{ formApprove.lm_date }}
@@ -1929,7 +1930,8 @@
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
-import ElDragSelect from '@/components/DragSelect' // base on element-ui
+import ElDragSelect from '@/components/DragSelect'
+import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
export default {
name: 'WorkOrderList',
@@ -1968,9 +1970,9 @@
// { code: 'CREATED', name: '宸插叧闂�' }
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
- { code: 'CLOSED', name: '瀹屽伐' },
- { code: 'NOSCHED', name: '寰呮帓绋�' },
- { code: 'SCHED', name: '宸叉帓绋�' }
+ { code: 'CLOSED', name: '瀹屽伐' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
tableData: [],
@@ -2364,12 +2366,7 @@
},
selected(row, index) {
- // && row.isstep === 'Y' //鍚庣杩欎釜瀛楁杩樻病鏀惧嚭鏉�
- if (row.status === 'NEW') {
- return true
- } else {
- return false
- }
+ return row.status === 'NEW' && row.isstep === 'Y'
},
// 娲惧彂
send() {
@@ -2607,21 +2604,20 @@
// console.log(number)
const data2 = {
- username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
}
- MesOrderPrintSearch1(data2).then(res2 => {
+ MesOrderPrintSearch(data2).then(res2 => {
if (res2.code === '200') {
const res3 = res2.data.recordset
this.tableDataPrint = res3
this.formApprove.mesordercode = res3[0].wo_code
- this.formApprove.m_po = res3[0].m_po
+ this.formApprove.m_po = res3[0].m_po || '/'
this.formApprove.partcode = res3[0].partcode
this.formApprove.partname = res3[0].partname
- this.formApprove.partspec = res3[0].partspec
+ this.formApprove.partspec = res3[0].partspec || '/'
this.formApprove.plan_qty = res3[0].plan_qty
- this.formApprove.routename = res3[0].routename
+ this.formApprove.routename = localStorage.getItem('username') // 鎵撳嵃浜哄憳
this.formApprove.lm_date = res3[0].lm_date
this.$nextTick(() => {
--
Gitblit v1.9.3