From 729bb3b1bac72bd760638e6329ba77cf1a8fb43f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 07 十月 2023 15:16:05 +0800
Subject: [PATCH] 1.工序报工100%
---
src/views/workOrder/workOrderList.vue | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 1f3ad55..c52a4bb 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">
@@ -269,6 +269,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="data_sources"
+ show-tooltip-when-overflow
+ label="鏁版嵁鏉ユ簮"
+ sortable="custom"
+ width="120"
+ />
<el-table-column
prop="lm_user"
@@ -295,12 +302,12 @@
<i
class="el-icon-edit-outline"
:style="{color:$store.state.settings.theme}"
- @click="edit('edit',row)"
+ @click.stop="edit('edit',row)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">
@@ -313,7 +320,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click.stop="handlePrint(row.wo_code)"
/>
</el-tooltip>
@@ -322,7 +329,7 @@
class="el-icon-view"
style="cursor: pointer;"
:style="{color:$store.state.settings.theme}"
- @click="edit('view',row)"
+ @click.stop="edit('view',row)"
/>
</el-tooltip>
@@ -395,6 +402,11 @@
show-tooltip-when-overflow
prop="stepname"
width="150"
+ />
+ <el-table-column
+ label="宸ュ簭鍗曚环"
+ show-tooltip-when-overflow
+ prop="stepprice"
/>
<el-table-column
label="宸茬敓浜ф暟閲�"
@@ -627,6 +639,7 @@
placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
@change="stepSelectedValueChange"
>
+ <!-- :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
<el-option
v-for="item in stepSelectArr"
:key="item.stepcode"
@@ -713,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"
@@ -1209,11 +1222,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 }}
@@ -1922,7 +1936,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',
@@ -1961,9 +1976,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: [],
@@ -1984,7 +1999,9 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
@@ -2355,12 +2372,7 @@
},
selected(row, index) {
- // && row.isstep === 'Y'
- if (row.status === 'NEW') {
- return true
- } else {
- return false
- }
+ return row.status === 'NEW' && row.isstep === 'Y'
},
// 娲惧彂
send() {
@@ -2427,6 +2439,7 @@
this.dialogForm.partspec = row.partspec
this.dialogForm.wkshopcode = row.wkshp_code
this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
+ this.dialogForm.mesqty = row.plan_qty
const data = {
sourceid: this.dialogForm.sourceorderid,
@@ -2435,7 +2448,8 @@
data_sources: this.dialogForm.data_sources
}
const { data: res } = await UpdateMesOrderStepSearch(data)
- this.dialogForm.mesqty = res.canupdate_qty
+ this.dialogForm.mesmaxqty = res.canupdate_qty
+
res.stepdata.forEach(i => {
this.stepTableData.push(
{
@@ -2494,6 +2508,10 @@
if (valid) {
if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
+ }
+
+ if (this.dialogForm.data_sources === 'ERP' && this.dialogForm.mesmaxqty < this.dialogForm.mesqty) {
+ return this.$message.info('姝ゅ伐鍗曠殑鏈�澶т慨鏀规暟鍊间负锛�' + this.dialogForm.mesmaxqty)
}
const workListSub = []
@@ -2592,21 +2610,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