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/produceOrderList.vue | 49 ++++++++++++++++
src/views/workOrder/workOrderList.vue | 74 ++++++++++++++++++++++--
2 files changed, 116 insertions(+), 7 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index b6198de..d5116c6 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -248,6 +248,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="qty"
label="璁㈠崟鏁伴噺"
width="150"
@@ -418,6 +442,15 @@
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
+
+ <el-form-item label="椤剁骇鐗╂枡缂栫爜" prop="TopInventoryCode">
+ <el-input v-model="dialogForm.TopInventoryCode" disabled style="width: 200px" />
+ </el-form-item>
+
+ <el-form-item label="椤剁骇鐗╂枡鍚嶇О" prop="TopInventoryName">
+ <el-input v-model="dialogForm.TopInventoryName" disabled style="width: 200px" />
+ </el-form-item>
+
<el-form-item label="鐢熶骇杞﹂棿" prop="wkshopname">
<el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
</el-form-item>
@@ -568,6 +601,10 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
},
@@ -886,6 +923,10 @@
this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
this.dialogForm.ordernum = 1
this.dialogForm.relse_qty = row.relse_qty
+
+ this.dialogForm.idTopInventory = row.idTopInventory
+ this.dialogForm.TopInventoryCode = row.TopInventoryCode
+ this.dialogForm.TopInventoryName = row.TopInventoryName
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -910,6 +951,10 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
}
@@ -945,6 +990,10 @@
'wkshopcode': this.dialogForm.wkshopcode,
'warehousecode': this.dialogForm.warehousecode,
+ 'idTopInventory': this.dialogForm.idTopInventory,
+ 'TopInventoryCode': this.dialogForm.TopInventoryCode,
+ 'TopInventoryName': this.dialogForm.TopInventoryName,
+
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 43b926e..bce0fd6 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -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,row.saleOrderCode)"
+ @click.stop="handlePrint(row.wo_code,row.saleOrderCode,row.TopInventoryName)"
/>
</el-tooltip>
@@ -613,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
@@ -1099,6 +1132,7 @@
<div v-else>/</div>
</template>
</el-table-column>
+
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
@@ -1270,6 +1304,9 @@
<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 }}
</el-form-item>
@@ -1347,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>
@@ -2056,6 +2100,10 @@
deliverydate: '', // 浜や粯鏃堕棿
data_sources: '', // 鏁版嵁鏉ユ簮
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
+
mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
ordertypeArr: [// 宸ュ崟绫诲瀷
@@ -2143,6 +2191,7 @@
partname: '',
partspec: '',
plan_qty: '',
+ TopInventoryName: '',
routename: '',
lm_date: ''
},
@@ -2517,6 +2566,10 @@
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,
sourcewo: this.dialogForm.sourceorder,
@@ -2612,6 +2665,10 @@
mesqty: '', // 宸ュ崟鏁伴噺
wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
+
+ idTopInventory: '', // 椤剁骇鐗╂枡id
+ TopInventoryCode: '', // 椤剁骇鐗╂枡缂栫爜
+ TopInventoryName: '', // 椤剁骇鐗╂枡鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
data_sources: '' // 鏁版嵁鏉ユ簮
@@ -2731,12 +2788,14 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code, saleOrderCode) {
+ 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
@@ -2834,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