From 9b825939b7f0a7439d704b379812362dd95697fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 11 七月 2022 17:49:26 +0800
Subject: [PATCH] 1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分
---
src/views/scgl/gd.vue | 108 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 39 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 353cc11..0710533 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -12,10 +12,12 @@
<div class="elForm">
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
- v-model="form.erporderstus"
+ v-model="form.mesorderstus"
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ filterable
+ @change="erporderstusChange"
>
<el-option
v-for="item in erporderstusArr"
@@ -26,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -50,14 +52,23 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
<el-date-picker
v-model="form.createdate"
- type="daterange"
- :clearable="false"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ type="date"
size="mini"
+ :clearable="false"
+ style="width: 200px;"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
/>
</el-form-item>
</div>
@@ -92,7 +103,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -268,6 +279,7 @@
<el-select
v-model="dialogForm.mesorderstus"
disabled
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -299,6 +311,7 @@
>
<el-select
v-model="dialogForm.partcode"
+ filterable
:disabled="operation!=='add'"
:popper-append-to-body="false"
style="width: 200px"
@@ -323,29 +336,16 @@
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wkshopArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
<div style="display: flex;flex-wrap: nowrap">
<el-form-item label="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
+ filterable
:disabled="dialogForm.partcode===''"
:popper-append-to-body="false"
- style="width: 160px"
+ style="width: 172px"
placeholder="璇烽�夋嫨"
+ @change="routecodeChange"
>
<el-option
v-for="item in routeArr"
@@ -364,6 +364,23 @@
<!-- :disabled="dialogForm.routecode===''"-->
</div>
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.routecode===''"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
</div>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
@@ -388,6 +405,7 @@
<el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
<el-select
v-model="dialogForm.orderlev"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -539,7 +557,7 @@
ClosedErpOrder,
ClosedMesOrder,
DeleteMesOrder,
- MesOrderSearch, SearchWorkStep,
+ MesOrderSearch, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
import { WorkShopSelect } from '@/api/sbgl'
@@ -548,7 +566,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GD',
components: {
Pagination
},
@@ -685,10 +703,10 @@
},
methods: {
async getMesOrderSearch() {
- let tempDate = this.form.createdate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
@@ -697,7 +715,7 @@
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: tempDate, // 鍒涘缓鏃堕棿
+ createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -713,10 +731,10 @@
// 鑾峰彇浜у搧淇℃伅
const { data: res1 } = await PartSelect()
this.partArr = res1
-
- // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
- const { data: res2 } = await WorkShopSelect()
- this.wkshopArr = res2
+ },
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -738,8 +756,8 @@
// 閲嶇疆
reset(val) {
- this.form.erporderstus = ''
- this.form.erpordercode = ''
+ this.form.mesorderstus = ''
+ this.form.mesordercode = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
@@ -766,6 +784,18 @@
const { data: res } = await PartSelectRpute({ partcode: val })
this.routeArr = res
this.dialogForm.routecode = ''
+ this.dialogForm.wkshopcode = ''
+ },
+ // 宸ヨ壓璺嚎鍊兼敼鍙�
+ async routecodeChange(val) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode
+ }
+ // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
+ const { data: res2 } = await RouteSelectWkshop(data)
+ this.wkshopArr = res2
+ this.dialogForm.wkshopcode = ''
},
// 宸ュ簭浠诲姟
async check(row) {
@@ -798,7 +828,7 @@
this.dialogForm.mesqty = row.plan_qty
this.dialogForm.partspec = row.partspec
// this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
- this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
+ // this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
@@ -944,7 +974,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (this.isFullscreen) {
this.tableHeight = this.tableHeight - 50
}
--
Gitblit v1.9.3