From e2655141b07ab811f755daee54680c5748e9d8e6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 07 五月 2024 12:17:02 +0800
Subject: [PATCH] 1.生产订单、生成工单 新增顶极物料
---
src/views/workOrder/workOrderList.vue | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 14 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index dec0654..bce0fd6 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
/>
@@ -256,6 +256,30 @@
</template>
</el-table-column>
<el-table-column
+ prop="TopInventoryCode"
+ label="椤剁骇鐗╂枡缂栫爜"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.TopInventoryCode">{{ row.TopInventoryCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="TopInventoryName"
+ label="椤剁骇鐗╂枡鍚嶇О"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.TopInventoryName">{{ row.TopInventoryName }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="plan_qty"
label="宸ュ崟鏁�"
sortable="custom"
@@ -336,7 +360,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click.stop="handlePrint(row.wo_code)"
+ @click.stop="handlePrint(row.wo_code,row.saleOrderCode,row.TopInventoryName)"
/>
</el-tooltip>
@@ -574,6 +598,7 @@
<!-- />-->
<!-- </div>-->
<!-- </div>-->
+
<el-form-item label="宸ュ崟鏁伴噺" prop="mesqty">
<el-input
v-model="dialogForm.mesqty"
@@ -612,6 +637,15 @@
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
+
+ <el-form-item v-if="operation!=='add'" label="椤剁骇鐗╂枡缂栫爜" prop="TopInventoryCode">
+ <el-input v-model="dialogForm.TopInventoryCode" disabled style="width: 200px" />
+ </el-form-item>
+
+ <el-form-item v-if="operation!=='add'" label="椤剁骇鐗╂枡鍚嶇О" prop="TopInventoryName">
+ <el-input v-model="dialogForm.TopInventoryName" disabled style="width: 200px" />
+ </el-form-item>
+
<!-- :disabled="dialogForm.partcode===''"-->
<el-form-item label="鎵�灞炶溅闂�" prop="wkshopcode">
<el-select
@@ -629,6 +663,13 @@
:value="item.torg_code"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="閿�鍞鍗�" prop="">
+ <el-input
+ v-model="dialogForm.saleordercode"
+ style="width: 200px"
+ :disabled="!(dialogForm.mesorderstus==='NEW'&&dialogForm.data_sources==='MES')"
+ />
</el-form-item>
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="deliverydate">
<el-date-picker
@@ -1091,6 +1132,7 @@
<div v-else>/</div>
</template>
</el-table-column>
+
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
@@ -1244,6 +1286,9 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�:" class="formContent">
+ {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿:" class="formContent">
{{ formApprove.mesordercode }}
</el-form-item>
@@ -1258,6 +1303,9 @@
</el-form-item>
<el-form-item label="浜у搧瑙勬牸:" class="formContent">
{{ formApprove.partspec }}
+ </el-form-item>
+ <el-form-item label="椤剁骇鐗╂枡:" class="formContent">
+ {{ formApprove.TopInventoryName }}
</el-form-item>
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
@@ -1336,22 +1384,29 @@
<el-table-column
id="column4"
prop="good_qty"
- width="100"
+ width="60"
align="center"
- label="鍚堟牸鏁伴噺"
+ label="鍚堟牸"
/>
<el-table-column
id="column5"
- width="100"
+ width="60"
prop="ng_qty"
align="center"
- label="涓嶈壇鏁伴噺"
+ label="涓嶈壇"
/>
<el-table-column
id="column6"
prop="desc"
align="center"
- width="120"
+ width="100"
+ label="妫�楠屽憳"
+ />
+ <el-table-column
+ id="column6"
+ prop="desc"
+ align="center"
+ width="100"
label="澶囨敞"
/>
</el-table>
@@ -1361,7 +1416,7 @@
<el-button v-waves @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
<!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
- <el-button v-waves v-print="printObj" type="primary">鎵� 鍗�</el-button>
+ <el-button v-waves v-print="printObj" type="primary" @click="sendMesOrderDistribution">鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -2032,6 +2087,8 @@
sourceorderid: '', // 婧愬崟id
sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗曞彿
+
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -2042,6 +2099,10 @@
deliverydate: '', // 浜や粯鏃堕棿
data_sources: '', // 鏁版嵁鏉ユ簮
+
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
@@ -2121,14 +2182,16 @@
console.log('鎵ц浜嗘墦鍗�')
}
},
-
+ sendMesOrderWoCode: '',
formApprove: {
m_po: '', // 婧愬崟鍗曞彿
mesordercode: '',
+ saleOrderCode: '', // 閿�鍞崟鍙�
partcode: '',
partname: '',
partspec: '',
plan_qty: '',
+ TopInventoryName: '',
routename: '',
lm_date: ''
},
@@ -2264,6 +2327,16 @@
// })
},
methods: {
+ // 鎵撳嵃鐨勬椂鍊欐墽琛屾淳鍙戜簨浠�
+ sendMesOrderDistribution() {
+ MesOrderDistribution([this.sendMesOrderWoCode]).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('娲惧彂鎴愬姛!')
+ this.getMesOrderSearch()
+ }
+ })
+ },
+
setSort() {
const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
@@ -2485,12 +2558,17 @@
this.dialogForm.ordertype = row.wotype
this.dialogForm.sourceorderid = row.sourceid
this.dialogForm.sourceorder = row.m_po
+ this.dialogForm.saleordercode = row.saleOrderCode
this.dialogForm.partcode = row.partcode
this.dialogForm.partname = row.partname
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
+
+ this.dialogForm.TopInventoryCode = row.TopInventoryCode
+ this.dialogForm.TopInventoryName = row.TopInventoryName
+ this.dialogForm.idTopInventory = row.idTopInventory
const data = {
sourceid: this.dialogForm.sourceorderid,
@@ -2548,7 +2626,7 @@
this.getMesOrderNewStepContent()
}
},
- async getMesOrderNewStepContent() {
+ async getMesOrderNewStepContent() {
const data = {
wkshopcode: this.dialogForm.wkshopcode,
partcode: this.dialogForm.partcode
@@ -2579,7 +2657,7 @@
ordertype: 'PO', // 宸ュ崟绫诲瀷
sourceorderid: '', // 婧愬崟id
sourceorder: '', // 婧愬崟鍗曞彿
-
+ saleordercode: '', // 閿�鍞鍗曞彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -2587,6 +2665,10 @@
mesqty: '', // 宸ュ崟鏁伴噺
wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
+
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
data_sources: '' // 鏁版嵁鏉ユ簮
@@ -2634,6 +2716,7 @@
wotype: this.dialogForm.ordertype, // 宸ュ崟绫诲瀷
sourceid: this.dialogForm.sourceorderid, // 婧愬崟id
sourcewo: this.dialogForm.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.dialogForm.saleordercode, // 婧愬崟鍗曞彿
partcode: this.dialogForm.partcode, // 浜у搧缂栧彿
wkshopcode: this.dialogForm.wkshopcode,
woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
@@ -2648,11 +2731,11 @@
if (res.code === '200') {
this.dialogVisible = false
// this.handlePrint()
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇濆瓨鎴愬姛锛�')
this.getMesOrderSearch()
this.$store.state.app.buttonIsDisabled = false
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇濆瓨澶辫触锛�')
}
})
}
@@ -2705,14 +2788,19 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code) {
+ handlePrint(wo_code, saleOrderCode, TopInventoryName) {
// const number = Math.random() * Math.random()
// this.number = number === 0 ? (10 + Math.random()) : number
// console.log(number)
+ this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
+
+ this.formApprove.TopInventoryName = TopInventoryName || '/'
+
const data2 = {
mesordercode: wo_code || this.dialogForm.mesordercode
}
+ this.sendMesOrderWoCode = wo_code || this.dialogForm.mesordercode
MesOrderPrintSearch(data2).then(res2 => {
if (res2.code === '200') {
const res3 = res2.data.recordset
@@ -2796,6 +2884,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
@@ -2804,6 +2893,7 @@
this.formApprove.plan_qty = ''
this.formApprove.routename = ''
this.formApprove.lm_date = ''
+ this.formApprove.TopInventoryName = ''
// this.$refs.qrCodeDiv0.title = ''
--
Gitblit v1.9.3