From 50339cf0c301487f66b9cdfe42265293eab31878 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 20 八月 2024 14:50:43 +0800
Subject: [PATCH] 1.工单列表新增 物料清单参数
---
src/api/GeneralBasicData.js | 10 +++++
src/views/workOrder/workOrderList.vue | 65 +++++++++++++++++++++++++-------
2 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/src/api/GeneralBasicData.js b/src/api/GeneralBasicData.js
index 96eed2e..4a75c25 100644
--- a/src/api/GeneralBasicData.js
+++ b/src/api/GeneralBasicData.js
@@ -228,6 +228,7 @@
params: data
})
}
+
// 宸ュ簭璁惧鍩虹璧勬枡
export function StepEqpData(data) {
return request({
@@ -236,3 +237,12 @@
params: data
})
}
+
+// 瀛樿揣鏌ヨ鐗╂枡娓呭崟Bom淇℃伅
+export function PartSearchBomDate(data) {
+ return request({
+ url: 'GeneralBasicData/PartSearchBomDate',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 8347e7f..4c4b21e 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -680,18 +680,10 @@
/>
</el-select>
</el-form-item>
- <!-- <el-form-item v-if="operation!=='add'" label="浜у搧鍚嶇О" prop="partname">-->
- <!-- <el-input v-model="dialogForm.partname" disabled style="width: 200px" />-->
- <!-- </el-form-item>-->
- <!-- <el-form-item v-if="operation!=='add'" label="浜у搧缂栫爜">-->
- <!-- <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />-->
- <!-- </el-form-item>-->
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
- <!-- :disabled="dialogForm.partcode===''"-->
-
- <el-form-item v-if="mesSetting.route" label="宸ヨ壓璺嚎" prop="wkshopcode">
+ <el-form-item v-if="mesSetting.route" label="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
filterable
@@ -713,6 +705,7 @@
<el-date-picker
v-model="dialogForm.deliverydate"
type="date"
+ style="width: 200px;"
size="mini"
:clearable="false"
class="dateMini"
@@ -721,8 +714,23 @@
value-format="yyyy-MM-dd"
placeholder="閫夋嫨鏃ユ湡"
/>
- <!-- :disabled="dialogForm.deliverydate"-->
</el-form-item>
+
+ <el-form-item label="鐗╂枡娓呭崟" prop="bomid">
+ <el-select
+ v-model="dialogForm.bomid"
+ clearable
+ placeholder="璇烽�夋嫨鐗╂枡娓呭崟"
+ >
+ <el-option
+ v-for="item in BomDataArr"
+ :key="item.id"
+ :label="item.version"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+
<el-form-item label="宸ュ簭鏉ユ簮" required>
<el-switch
v-model="sourceType"
@@ -2345,7 +2353,13 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, PrentOrganizationNoCompany, StepData, StepEqpData } from '@/api/GeneralBasicData'
+import {
+ PartSearchBomDate,
+ PrentOrganization,
+ PrentOrganizationNoCompany,
+ StepData,
+ StepEqpData
+} from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
@@ -2422,7 +2436,9 @@
routecode: '', // 宸ヨ壓璺嚎
mesmaxqty: 0, // 宸ュ崟鐨勬渶澶у��
- mesqtyinit: 0// 宸ュ崟鏁伴噺鍒濆鍊�
+ mesqtyinit: 0, // 宸ュ崟鏁伴噺鍒濆鍊�
+
+ bomid: ''//
},
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
@@ -2452,6 +2468,9 @@
],
wkshopcode: [
{ required: true, message: '璇烽�夋嫨鐢熶骇杞﹂棿', trigger: ['blur', 'change'] }
+ ],
+ routecode: [
+ { required: true, message: '璇烽�夋嫨宸ヨ壓璺嚎', trigger: ['blur', 'change'] }
],
deliverydate: [
{ required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
@@ -2635,7 +2654,9 @@
editStepEqpArr: [],
- flag1: false
+ flag1: false,
+
+ BomDataArr: []
}
},
@@ -3005,6 +3026,9 @@
this.dialogForm.mesqtyinit = row.plan_qty
+ this.dialogForm.bomid = row.bom_id
+ await this.getPartSearchBomDate(row.partcode)
+
const data = {
sourceid: this.dialogForm.sourceorderid,
sourcewo: this.dialogForm.sourceorder,
@@ -3020,7 +3044,9 @@
if (this.mesSetting.route) { // 鎸夊伐鑹鸿矾绾胯蛋妯″紡
if (this.dialogForm.routecode) {
await this.getPartcodeChangeDialog()
+
// this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ this.stepTableData = []
res.stepdata.forEach(i => {
this.stepTableData.push(
{
@@ -3096,6 +3122,7 @@
}
this.dialogVisible = true
+
this.$nextTick(() => {
this.setSort()
})
@@ -3135,6 +3162,7 @@
} else {
this.getBasicProcessData()
}
+ this.getPartSearchBomDate(val)
},
async getPartcodeChangeDialog() {
@@ -3235,9 +3263,12 @@
this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
}
} else {
- console.log(9)
await this.routecodeChange()
}
+ },
+ async getPartSearchBomDate(val) {
+ const { data: res } = await PartSearchBomDate({ partnumber: val })
+ this.BomDataArr = res
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -3258,13 +3289,16 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ bomid: ''
}
this.sourceType = false
this.stepSelectedValue = []
this.stepTableData = []
+ this.BomDataArr = []
this.flag1 = false
this.$refs.dialogForm.clearValidate()
},
@@ -3332,6 +3366,7 @@
isstep: WorkListSub.length > 0 ? 'Y' : 'N', //
difference: this.dialogForm.mesqty - this.dialogForm.mesqtyinit, // 鏁版嵁宸��
routecode: this.dialogForm.routecode,
+ bomid: this.dialogForm.bomid,
WorkListSub
}
--
Gitblit v1.9.3