From ff3ab0080ee0972fde942fe929845995873f60e0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 13 十月 2023 16:05:53 +0800
Subject: [PATCH] 1.点检标准80%
---
src/views/workOrder/workOrderList.vue | 156 +++++++++++++++++++++++++++------------------------
1 files changed, 83 insertions(+), 73 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index d2a2399..ddec367 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">
@@ -404,6 +404,11 @@
width="150"
/>
<el-table-column
+ label="宸ュ簭鍗曚环"
+ show-tooltip-when-overflow
+ prop="stepprice"
+ />
+ <el-table-column
label="宸茬敓浜ф暟閲�"
show-tooltip-when-overflow
prop="produceq_qty"
@@ -634,6 +639,7 @@
placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
@change="stepSelectedValueChange"
>
+ <!-- :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
<el-option
v-for="item in stepSelectArr"
:key="item.stepcode"
@@ -720,7 +726,7 @@
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
<el-button
- v-if="operation!=='view'"
+ v-if="operation!=='view'&&(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
@@ -883,30 +889,30 @@
<!-- size="mini"-->
<!-- />-->
<!-- </el-form-item>-->
- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
- <el-select
- v-model="sourceForm.mesordercode"
- filterable
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in erporderstusArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="sourceForm.mesordercode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in erporderstusArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="sourceForm.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
@@ -967,10 +973,10 @@
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
+ :height="isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -995,7 +1001,7 @@
</template>
</el-table-column>
<el-table-column
- prop="RowNum"
+ prop="rowNum"
width="50"
fixed
label="搴忓彿"
@@ -1061,8 +1067,15 @@
/>
<el-table-column
- prop="bad_qty"
- label="鎶ュ簾鏁伴噺"
+ prop="laborbad_qty"
+ label="宸ュ簾鏁伴噺"
+ width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="materielbad_qty"
+ label="鏂欏簾鏁伴噺"
width="150"
show-tooltip-when-overflow
sortable="custom"
@@ -1087,30 +1100,30 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="plan_startdate"
- label="棰勮寮�宸ユ椂闂�"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="plan_enddate"
- label="棰勮瀹屽伐鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="plan_startdate"-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="plan_enddate"-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -1216,11 +1229,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 +1943,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 +1983,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 +2379,7 @@
},
selected(row, index) {
- // && row.isstep === 'Y' //鍚庣杩欎釜瀛楁杩樻病鏀惧嚭鏉�
- if (row.status === 'NEW') {
- return true
- } else {
- return false
- }
+ return row.status === 'NEW' && row.isstep === 'Y'
},
// 娲惧彂
send() {
@@ -2381,9 +2391,6 @@
MesOrderDistribution(this.multipleSelection).then(res => {
if (res.code === '200') {
this.$notify.success('娲惧彂鎴愬姛!')
- if (this.form.page > 1 && this.tableData.length === 1) {
- this.form.page--
- }
this.getMesOrderSearch()
}
})
@@ -2524,6 +2531,10 @@
)
})
+ if (workListSub.length === 0) {
+ return this.$message.info('宸ュ簭涓嶈兘涓虹┖锛�')
+ }
+
const data = {
wostatus: this.dialogForm.mesorderstus, // 宸ュ崟鐘舵��
wocode: this.dialogForm.mesordercode, // 宸ュ崟鍙�
@@ -2607,21 +2618,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(() => {
@@ -2821,8 +2831,8 @@
const data = {
mesordercode: this.sourceForm.mesordercode, // 宸ュ崟缂栧彿
- sourceorder: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
- saleordercode: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
+ sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞崟鍙�
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
--
Gitblit v1.9.3