From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交
---
src/views/workOrder/workOrderList.vue | 428 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 331 insertions(+), 97 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index c3f274e..4ce503d 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -471,7 +471,7 @@
<el-table-column
label="宸ュ簭鍗曚环"
show-tooltip-when-overflow
- prop="stepprice"
+ prop="unprice"
/>
<el-table-column
label="宸茬敓浜ф暟閲�"
@@ -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"
@@ -765,8 +773,95 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- row-key="stepcode"
>
+ <el-table-column type="expand">
+ <template slot-scope="props">
+
+ <el-table
+ :data="props.row.children"
+ style="width: 96%;margin: auto;"
+ border
+ row-key="eqp_code"
+ :row-class-name="tableRowClassName"
+ >
+ <el-table-column
+ prop="eqp_code"
+ label="璁惧/寰�鏉ョ紪鐮�"
+ min-width="120"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧/寰�鏉ュ悕绉�"
+ min-width="120"
+ />
+ <!-- <el-table-column-->
+ <!-- prop="eqp_value"-->
+ <!-- label="璁惧鑺傛媿"-->
+ <!-- min-width="150"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div style="display: flex;align-items: center">-->
+ <!-- <el-input-->
+ <!-- v-model="row.eqp_value"-->
+ <!-- placeholder="璇疯緭鍏�"-->
+ <!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
+ <!-- @change="val=>eqpValueChange(val,row)"-->
+ <!-- />-->
+ <!-- <div style="margin-left: 5px">绉�</div>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="stand_value"-->
+ <!-- label="鐢熶骇鑺傛媿"-->
+ <!-- min-width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ row.stand_value + ' ' + '绉�/娆�' }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="cavity_qty"-->
+ <!-- label="鑵斿瀷鏁�"-->
+ <!-- min-width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-input-->
+ <!-- v-model="row.cavity_qty"-->
+ <!-- placeholder="璇疯緭鍏�"-->
+ <!-- oninput="value=value.replace(/[^0-9.]/g,'')"-->
+ <!-- @change="val=>cavityQtyChange(val,row)"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column
+ prop="unprice"
+ label="璁惧宸ヤ环"
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <el-input v-model="row.unprice" oninput="value=value.replace(/[^0-9.]/g,'')" />
+ </template>
+ </el-table-column>
+ <!-- v-if="!sourceType"-->
+ <el-table-column
+
+ prop="enable"
+ label="鏄惁鍚敤"
+ min-width="150"
+ >
+ <template slot-scope="{row}">
+ <el-switch
+ v-model="row.enable"
+ inactive-value="N"
+ active-value="Y"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-table-column>
+
<el-table-column
type="index"
label="搴忓彿"
@@ -783,17 +878,16 @@
show-tooltip-when-overflow
/>
<el-table-column
- prop="stepprice"
+ prop="unprice"
label="鐢熶骇鍗曚环"
show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input
- v-model="row.stepprice"
+ v-model="row.unprice"
placeholder="璇疯緭鍏ュ伐搴忓崟浠�"
oninput="value=value.replace(/[^0-9.]/g,'')"
style="width: 100%"
- @click=""
/>
</template>
</el-table-column>
@@ -1337,7 +1431,7 @@
>
<div class="elForm">
<el-form-item label="閿�鍞崟鍙�:" class="formContent">
- {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
+ {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿:" class="formContent">
{{ formApprove.mesordercode }}
@@ -1466,7 +1560,7 @@
>
<div class="elForm">
<el-form-item label="閿�鍞崟鍙�:" class="formContent">
- {{ formApprove.saleOrderCode ?formApprove.saleOrderCode :'/' }}
+ {{ formApprove.saleOrderCode ? formApprove.saleOrderCode : '/' }}
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿:" class="formContent">
{{ formApprove.mesordercode }}
@@ -2223,7 +2317,8 @@
type="primary"
style="margin-left: 37px"
@click="view"
- >棰� 瑙�/涓� 杞�</el-button>
+ >棰� 瑙�/涓� 杞�
+ </el-button>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -2258,13 +2353,20 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, PrentOrganizationNoCompany, StepData } 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
import DateType from '@/components/DateType'
import { PartSelectRpute, RouteSelectStep } from '@/api/basicSettings'
import { DeviceSopSearch } from '@/api/DeviceManager'
+
export default {
name: 'WorkOrderList',
components: {
@@ -2334,7 +2436,9 @@
routecode: '', // 宸ヨ壓璺嚎
mesmaxqty: 0, // 宸ュ崟鐨勬渶澶у��
- mesqtyinit: 0// 宸ュ崟鏁伴噺鍒濆鍊�
+ mesqtyinit: 0, // 宸ュ崟鏁伴噺鍒濆鍊�
+
+ bomid: ''//
},
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
@@ -2364,6 +2468,9 @@
],
wkshopcode: [
{ required: true, message: '璇烽�夋嫨鐢熶骇杞﹂棿', trigger: ['blur', 'change'] }
+ ],
+ routecode: [
+ { required: true, message: '璇烽�夋嫨宸ヨ壓璺嚎', trigger: ['blur', 'change'] }
],
deliverydate: [
{ required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
@@ -2541,7 +2648,16 @@
},
sopArr: [],
routeCode: '', // 宸ヨ壓璺嚎code
- partCode: ''
+ partCode: '',
+
+ StepEqpArr: [],
+
+ editStepEqpArr: [],
+
+ flag1: false,
+
+ BomDataArr: []
+
}
},
watch: {
@@ -2552,13 +2668,43 @@
console.log(val, 1)
const arr = JSON.parse(JSON.stringify(this.stepTableData))
const arrStepcode = arr.map(i => i.stepcode)
+
+ console.log(arr, 3)
this.stepTableData = []
val.forEach(i => {
+ let children = []
+
+ if (arrStepcode.includes(i)) { // 瀛愰」淇濇寔涓嶅彉
+ children = arr.find(j => j.stepcode === i).children
+ } else {
+ // 1.鍏堟煡鎵捐嚜宸卞師鏈夊瓙椤规槸鍚︽湁
+ console.log(this.editStepEqpArr.find(j => j.step_code === i), 'this.editStepEqpArr.find(j => j.step_code === i)')
+ if (this.editStepEqpArr.find(j => j.step_code === i)) {
+ children = this.editStepEqpArr.find(j => j.step_code === i).children
+
+ console.log(children, 10)
+ } else {
+ // 鍐嶆煡鎵� 鍘嗗彶鏈�鏂版垨鑰呭熀纭�璧勬枡鏄惁鏈�
+ if (this.sourceType) {
+ children = this.StepEqpArr.find(j => j.step_code === i).children
+ console.log(children, 11)
+ }
+ if (!this.sourceType) {
+ children = this.StepEqpArr.find(j => j.step_code === i).children
+ console.log(children, 12)
+ }
+ }
+ }
+
this.stepTableData.push(
{
stepcode: i,
stepname: this.stepSelectArr.find(j => j.stepcode === i).stepname,
- stepprice: arrStepcode.includes(i) ? arr.find(j => j.stepcode === i).stepprice : 0
+ unprice: arrStepcode.includes(i) ? arr.find(j => j.stepcode === i).unprice : 0,
+ // children:arrStepcode.includes(i)? arr.find(j => j.stepcode === i).children:
+
+ children
+
}
)
})
@@ -2577,6 +2723,12 @@
// })
},
methods: {
+ // 宸ュ簭璁惧鍩虹璧勬枡
+ async getStepEqpData() {
+ const { data: res } = await StepEqpData()
+ this.StepEqpArr = res
+ },
+
// 寮瑰嚭妗嗗叧闂�
handleSopClose() {
this.SopDialogVisible = false
@@ -2616,6 +2768,7 @@
},
// 宸ュ簭鏉ユ簮鍒囨崲
sourceTypeChange(val) {
+ this.flag1 = false
this.stepTableData = []
if (val) {
this.getMesOrderNewStepContent()
@@ -2662,6 +2815,7 @@
if (res.code === '200') {
this.getSelect()
this.getPrentOrganizationNoCompany()
+ this.getStepEqpData()
}
})
},
@@ -2872,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,
@@ -2880,10 +3037,34 @@
}
const { data: res } = await UpdateMesOrderStepSearch(data)
this.dialogForm.mesmaxqty = res.canupdate_qty
+ this.editStepEqpArr = JSON.parse(JSON.stringify(res.stepdata))
+ this.flag1 = res.stepdata.length !== 0
+ // console.log(this.editStepEqpArr.find(i => i.step_code === '102'))
if (this.mesSetting.route) { // 鎸夊伐鑹鸿矾绾胯蛋妯″紡
- if (!this.dialogForm.routecode) {
+ if (this.dialogForm.routecode) {
await this.getPartcodeChangeDialog()
+
+ // this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ this.stepTableData = []
+ res.stepdata.forEach(i => {
+ this.stepTableData.push(
+ {
+ stepcode: i.step_code,
+ stepname: i.stepname,
+ unprice: i.unprice,
+ children: i.children
+ }
+ )
+ })
+ this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+
+ this.dialogVisible = true
+ this.$nextTick(() => {
+ this.setSort()
+ })
+
+ return
}
if (res.stepdata.length > 0) {
@@ -2892,7 +3073,8 @@
{
stepcode: i.step_code,
stepname: i.stepname,
- stepprice: i.stepprice
+ unprice: i.unprice,
+ children: i.children
}
)
})
@@ -2910,7 +3092,8 @@
{
stepcode: i.step_code,
// stepname: i.stepname,
- stepprice: i.stepprice
+ unprice: i.unprice,
+ children: i.children
}
)
})
@@ -2925,7 +3108,8 @@
{
stepcode: i.step_code,
stepname: i.stepname,
- stepprice: i.stepprice
+ unprice: i.unprice,
+ children: i.children
}
)
})
@@ -2938,12 +3122,13 @@
}
this.dialogVisible = true
+
this.$nextTick(() => {
this.setSort()
})
},
// 鎸夊伐搴忔ā寮忚蛋鐨勬椂鍊� 寮曠敤鍩虹璧勬枡 宸ヨ壓
- async getBasicProcessData() {
+ async getBasicProcessData() {
const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
res.sort((a, b) => a.step_seq - b.step_seq)
this.stepTableData = []
@@ -2952,7 +3137,8 @@
{
stepcode: i.step_code,
stepname: i.step_name,
- stepprice: i.unprice
+ unprice: i.unprice,
+ children: i.children
}
)
})
@@ -2976,9 +3162,10 @@
} else {
this.getBasicProcessData()
}
+ this.getPartSearchBomDate(val)
},
- async getPartcodeChangeDialog() {
+ async getPartcodeChangeDialog() {
const { data: res } = await PartSelectRpute({ partcode: this.dialogForm.partcode })
this.routecodeArr = res
@@ -2996,55 +3183,92 @@
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange() {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode
+ if (!this.flag1) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode
+ }
+ const { data: res } = await RouteSelectStep(data)
+ console.log(res, 887)
+ this.stepSelectedValue = []
+ this.stepTableData = []
+ if (res.length > 0) {
+ res.sort((a, b) => a.step_seq - b.step_seq)
+ res.forEach(i => {
+ this.stepTableData.push(
+ {
+ stepcode: i.code,
+ // stepname: i.stepname,
+ unprice: i.unprice,
+ children: i.children
+ }
+ )
+ })
+ this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ }
}
- const { data: res } = await RouteSelectStep(data)
- this.stepSelectedValue = []
- this.stepTableData = []
- if (res.length > 0) {
- res.sort((a, b) => a.step_seq - b.step_seq)
- res.forEach(i => {
- this.stepTableData.push(
- {
- stepcode: i.step_code,
- // stepname: i.stepname,
- stepprice: i.unprice
- }
- )
- })
- this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ if (this.flag1 && !this.sourceType) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode
+ }
+ const { data: res } = await RouteSelectStep(data)
+ console.log(res, 887)
+ this.stepSelectedValue = []
+ this.stepTableData = []
+ if (res.length > 0) {
+ res.sort((a, b) => a.step_seq - b.step_seq)
+ res.forEach(i => {
+ this.stepTableData.push(
+ {
+ stepcode: i.code,
+ // stepname: i.stepname,
+ unprice: i.unprice,
+ children: i.children
+ }
+ )
+ })
+ this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ }
}
},
- async getMesOrderNewStepContent() {
+ async getMesOrderNewStepContent() {
// if (!this.mesSetting.route && this.operation === 'edit') {
// return
// }
- const data = {
- routecode: this.dialogForm.routecode,
- wkshopcode: this.dialogForm.wkshopcode,
- partcode: this.dialogForm.partcode
+ if (this.sourceType) {
+ const data = {
+ routecode: this.dialogForm.routecode,
+ wkshopcode: this.dialogForm.wkshopcode,
+ partcode: this.dialogForm.partcode
+ }
+ const { data: res } = await MesOrderNewStepContent(data)
+ // console.log(res)
+ this.stepSelectedValue = []
+ this.stepTableData = []
+ if (res.length > 0) {
+ res.forEach(i => {
+ this.stepTableData.push(
+ {
+ stepcode: i.step_code,
+ // stepname: i.stepname,
+ unprice: i.unprice,
+ children: i.children
+ }
+ )
+ })
+ this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+ }
+ } else {
+ await this.routecodeChange()
}
- const { data: res } = await MesOrderNewStepContent(data)
- // console.log(res)
- this.stepSelectedValue = []
- this.stepTableData = []
- if (res.length > 0) {
- res.forEach(i => {
- this.stepTableData.push(
- {
- stepcode: i.step_code,
- // stepname: i.stepname,
- stepprice: i.stepprice
- }
- )
- })
- this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
- }
+ },
+ async getPartSearchBomDate(val) {
+ const { data: res } = await PartSearchBomDate({ partnumber: val })
+ this.BomDataArr = res
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -3065,13 +3289,17 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ bomid: ''
}
this.sourceType = false
this.stepSelectedValue = []
this.stepTableData = []
+ this.BomDataArr = []
+ this.flag1 = false
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -3094,20 +3322,33 @@
return this.$message.info('姝ゅ伐鍗曠殑鏈�澶т慨鏀规暟鍊间负锛�' + this.dialogForm.mesmaxqty)
}
- const workListSub = []
+ const WorkListSub = []
this.stepTableData.forEach((i, j) => {
- workListSub.push(
+ const children = []
+ if (i.children.length > 0) {
+ i.children.forEach(k => {
+ if (k.enable === 'Y') {
+ children.push({
+ eqpcode: k.eqp_code,
+ unprice: parseFloat(k.unprice)
+ })
+ }
+ })
+ }
+
+ WorkListSub.push(
{
stepseq: j + 1,
stepcode: i.stepcode,
- stepprice: i.stepprice,
+ unprice: i.unprice,
isbott: j === 0 ? 'Y' : 'N',
- isend: j === this.stepTableData.length - 1 ? 'Y' : 'N'
+ isend: j === this.stepTableData.length - 1 ? 'Y' : 'N',
+ WorkEqpListSub: children
}
)
})
- if (workListSub.length === 0) {
+ if (WorkListSub.length === 0) {
return this.$message.info('宸ュ簭涓嶈兘涓虹┖锛�')
}
@@ -3122,10 +3363,11 @@
woqty: this.dialogForm.mesqty, // 宸ュ崟鏁伴噺
deliverydate: this.dialogForm.deliverydate, // 浜や粯鏃堕棿
data_sources: this.dialogForm.data_sources, // 鏁版嵁鏉ユ簮
- isstep: workListSub.length > 0 ? 'Y' : 'N', //
+ isstep: WorkListSub.length > 0 ? 'Y' : 'N', //
difference: this.dialogForm.mesqty - this.dialogForm.mesqtyinit, // 鏁版嵁宸��
routecode: this.dialogForm.routecode,
- workListSub
+ bomid: this.dialogForm.bomid,
+ WorkListSub
}
this.$store.state.app.buttonIsDisabled = true
@@ -3225,10 +3467,10 @@
div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
})
- // const div = document.getElementById('qrCode')
- // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
- // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
- // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
+ // const div = document.getElementById('qrCode')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -3701,6 +3943,14 @@
color: #fff !important;
background: #42b983 !important;
}
+
+.formContent .el-form-item__label {
+ color: #000 !important;
+}
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
</style>
<style lang="scss" scoped>
$main_color: #42b983;
@@ -3858,11 +4108,7 @@
}
</style>
-<style>
-.formContent .el-form-item__label {
- color: #000 !important;
-}
-</style>
+
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
@@ -4003,15 +4249,3 @@
}
}
</style>
-<style>
-
-.el-table .custom-row {
- background: #f8f8fa;
-}
-</style>
-<style>
-.sortable-ghost{
- opacity: .8;
- color: #fff!important;
- background: #42b983!important;
-}
--
Gitblit v1.9.3