From d64a1dca101070ce7d5dcbcffc34d0efbd2da841 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 03 十一月 2023 10:46:15 +0800
Subject: [PATCH] 1.综合看板 初始化
---
src/views/workOrder/workOrderList.vue | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 107 insertions(+), 54 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index c52a4bb..6c176b4 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -20,6 +20,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
@@ -43,7 +59,7 @@
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
<el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="閿�鍞鍗�" style="display: flex;">
+ <el-form-item v-show="isExpandForm" label="閿�鍞鍗�" style="display: flex;">
<el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
@@ -269,13 +285,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="data_sources"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="鏁版嵁鏉ユ簮"-->
+ <!-- sortable="custom"-->
+ <!-- width="120"-->
+ <!-- />-->
<el-table-column
prop="lm_user"
@@ -472,7 +488,7 @@
<!--鏂板娲惧彂瀵硅瘽妗�-->
<el-dialog
v-el-drag-dialog
- :title="operation==='add'?'鏂板':'娲惧彂'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="1200px"
top="8vh"
@@ -889,24 +905,40 @@
<!-- size="mini"-->
<!-- />-->
<!-- </el-form-item>-->
- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
+ <!-- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="sourceForm.mesordercode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in erporderstusArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
- v-model="sourceForm.mesordercode"
+ v-model="sourceForm.wkshopcode"
filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in erporderstusArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
/>
</el-select>
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="sourceForm.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
@@ -915,9 +947,9 @@
<el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">-->
+ <!-- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -973,10 +1005,10 @@
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
+ :height="isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -1001,7 +1033,7 @@
</template>
</el-table-column>
<el-table-column
- prop="RowNum"
+ prop="rowNum"
width="50"
fixed
label="搴忓彿"
@@ -1067,8 +1099,15 @@
/>
<el-table-column
- prop="bad_qty"
- label="鎶ュ簾鏁伴噺"
+ prop="laborbad_qty"
+ label="宸ュ簾鏁伴噺"
+ width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="materielbad_qty"
+ label="鏂欏簾鏁伴噺"
width="150"
show-tooltip-when-overflow
sortable="custom"
@@ -1093,30 +1132,30 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="plan_startdate"
- label="棰勮寮�宸ユ椂闂�"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="plan_enddate"
- label="棰勮瀹屽伐鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="plan_startdate"-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="plan_enddate"-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -1934,7 +1973,7 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
+import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
@@ -1955,6 +1994,7 @@
tableHeight: 0,
username: '',
form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesorderstus: '', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -1980,6 +2020,7 @@
// { code: 'NOSCHED', name: '寰呮帓绋�' },
// { code: 'SCHED', name: '宸叉帓绋�' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -2126,6 +2167,7 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesordercode: '', // 宸ュ崟缂栧彿
sourceorder: '', // 璁㈠崟缂栧彿
saleordercode: '', // 閿�鍞鍗曞彿
@@ -2248,8 +2290,13 @@
this.getMesOrderSearch().then(res => {
if (res.code === '200') {
this.getSelect()
+ this.getPrentOrganizationNoCompany()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
async getMesOrderSearch() {
// let tempDate = this.form.createdate
@@ -2258,6 +2305,7 @@
// }
const data = {
+ wkshopcode: this.form.wkshopcode,
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2329,6 +2377,7 @@
// 閲嶇疆
reset(val) {
+ this.form.wkshopcode = ''
this.form.mesorderstus = ''
this.form.mesordercode = ''
this.form.partcode = ''
@@ -2384,9 +2433,6 @@
MesOrderDistribution(this.multipleSelection).then(res => {
if (res.code === '200') {
this.$notify.success('娲惧彂鎴愬姛!')
- if (this.form.page > 1 && this.tableData.length === 1) {
- this.form.page--
- }
this.getMesOrderSearch()
}
})
@@ -2526,6 +2572,10 @@
}
)
})
+
+ if (workListSub.length === 0) {
+ return this.$message.info('宸ュ簭涓嶈兘涓虹┖锛�')
+ }
const data = {
wostatus: this.dialogForm.mesorderstus, // 宸ュ崟鐘舵��
@@ -2822,9 +2872,10 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
mesordercode: this.sourceForm.mesordercode, // 宸ュ崟缂栧彿
- sourceorder: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
- saleordercode: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
+ sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞崟鍙�
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
@@ -2857,6 +2908,7 @@
this.getMesBadOrderSearch()
},
sourceReset() {
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
@@ -2871,6 +2923,7 @@
dialogVisibleSourceClose() {
this.radioSelectedId = ''
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
--
Gitblit v1.9.3