From 43f4fd08bb99f587c387391aad727fb82b34b7c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 11 八月 2023 13:27:47 +0800
Subject: [PATCH] 1.存货类型页面优化
---
src/views/produceManager/workOrder.vue | 299 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 170 insertions(+), 129 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 9773266..14dd13a 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -43,7 +43,10 @@
<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 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;">
<el-select
v-model="form.ordertype"
:popper-append-to-body="false"
@@ -193,6 +196,18 @@
>
<template slot-scope="{row}">
<div v-if="row.m_po">{{ row.m_po }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -368,6 +383,22 @@
/>
<div class="elTableDiv">
+
+ <div
+ v-if="$store.state.settings.orgType === 'W'"
+ style="position:absolute;z-index: 1000;left: 20px;top: -50px"
+ >
+ <el-switch
+ v-model="switchButton"
+ style="display: block"
+ active-text="鎵�鏈夎溅闂�"
+ inactive-text="褰撳墠杞﹂棿"
+ @change="rowClick"
+ />
+ <!-- active-color="#13ce66"-->
+ <!-- inactive-color="#ff4949"-->
+ </div>
+
<el-table
:data="tableDataDetail"
border
@@ -510,43 +541,49 @@
<!-- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />-->
<el-input v-model="dialogForm.mesordercode" disabled style="width: 200px" />
</el-form-item>
- <div style="display: flex">
- <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
- <el-select
- v-model="dialogForm.ordertype"
- :popper-append-to-body="false"
- style="width: 200px"
- :disabled="operation!=='add'"
- placeholder="璇烽�夋嫨"
- @change="mesordertypeChange"
- >
-
- <el-option
- v-for="item in ordertypeArr"
- :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="婧愬崟鍗曞彿">
- <el-input
- v-model="dialogForm.sourceorder"
- :disabled="dialogForm.ordertype==='PO'"
- style="width: 172px"
- />
- </el-form-item>
+ <!-- <div style="display: flex">-->
+ <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
+ <el-select
+ v-model="dialogForm.ordertype"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ :disabled="operation!=='add'"
+ placeholder="璇烽�夋嫨"
+ @change="mesordertypeChange"
+ >
+ <el-option
+ v-for="item in ordertypeArr"
+ :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="婧愬崟鍗曞彿">
+ <el-input
+ v-model="dialogForm.sourceorder"
+ :disabled="dialogForm.ordertype==='PO'"
+ style="width: 200px"
+ >
<el-button
- v-waves
- type="primary"
- style="padding: 0 10px;margin-left: -8px;margin-top: 3px"
- class="el-icon-search"
+ slot="append"
+ icon="el-icon-search"
:disabled="operation!=='add'||dialogForm.ordertype==='PO'"
@click="mesordertsourcesearchclick"
/>
- </div>
- </div>
+ </el-input>
+ </el-form-item>
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- style="padding: 0 10px;margin-left: -8px;margin-top: 3px"-->
+ <!-- class="el-icon-search"-->
+ <!-- :disabled="operation!=='add'||dialogForm.ordertype==='PO'"-->
+ <!-- @click="mesordertsourcesearchclick"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- </div>-->
<el-form-item label="宸ュ崟鏁伴噺" prop="mesqty">
<el-input
v-model="dialogForm.mesqty"
@@ -586,116 +623,107 @@
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<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"
- filterable
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.partcode===''"
- @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
- >
- <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 style="display: flex;flex-wrap: nowrap">
- <el-form-item label="宸ヨ壓璺嚎" prop="routecode">
- <el-select
- v-model="dialogForm.routecode"
- filterable
- :popper-append-to-body="false"
- style="width: 172px"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.wkshopcode===''"
- @change="routecodeChange"
- >
- <el-option
- v-for="item in routeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <el-button
- v-waves
- type="primary"
- style="padding: 0 10px;margin-left: -8px;margin-top:3px"
- class="el-icon-search"
- @click="searchClick"
- />
- <!-- :disabled="dialogForm.routecode===''"-->
-
- </div>
- </div>
- <el-form-item label="鏄惁鎺掔▼" prop="isAps">
- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
+ <!-- <div style="display: flex">-->
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
<el-select
- v-model="dialogForm.bomId"
+ v-model="dialogForm.wkshopcode"
filterable
- :disabled="dialogForm.isAps==='N'"
:popper-append-to-body="false"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.partcode===''"
+ @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
>
<el-option
- v-for="item in bomIdArr"
- :key="item.id"
- :label="item.version"
- :value="item.id"
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
/>
</el-select>
</el-form-item>
- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
- <el-date-picker
- v-model="dialogForm.planstartdate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- :picker-options="pickerOptions"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- />
- </el-form-item>
- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">
- <el-date-picker
- v-model="dialogForm.planenddate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- />
- </el-form-item>
- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
+
+ <!-- <div style="display: flex;flex-wrap: nowrap">-->
+ <el-form-item label="宸ヨ壓璺嚎" prop="routecode">
<el-select
- v-model="dialogForm.orderlev"
+ v-model="dialogForm.routecode"
filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.wkshopcode===''"
+ @change="routecodeChange"
>
<el-option
- v-for="item in orderlevArr"
+ v-for="item in routeArr"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
+
+ <!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
+ <!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
+ <!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
+ <!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.bomId"-->
+ <!-- filterable-->
+ <!-- :disabled="dialogForm.isAps==='N'"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in bomIdArr"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.version"-->
+ <!-- :value="item.id"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planstartdate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planenddate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.orderlev"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in orderlevArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</el-form>
@@ -1999,6 +2027,7 @@
partcode: '', // 浜у搧缂栫爜
ordertype: '', // ordertype
sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗�
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
@@ -2217,7 +2246,9 @@
isLastPrint: false, // 鏄惁鏄湯閬撴墦鍗�
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
- lastPrintArrSelected: []// 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+ lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+
+ switchButton: false
}
},
created() {
@@ -2255,6 +2286,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
@@ -2369,11 +2401,19 @@
// this.submitButtonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
- async routecodeChange(partcode, routecode) {
- // const data = {
- // partcode,
- // routecode
- // }
+ async routecodeChange() {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode,
+ wkshopcode: this.dialogForm.wkshopcode
+ }
+ await SelectRouteOrWkshop(data).then((res) => {
+ // console.log(res, 1)
+ this.submitButtonIsDisabled = false
+ }).catch(err => {
+ // console.log(err, 2)
+ this.submitButtonIsDisabled = true
+ })
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
async wkshopcodeChange(wkshopcode, partcode) {
@@ -2387,6 +2427,7 @@
if (res.length === 1) {
this.dialogForm.routecode = res[0].code
+ await this.routecodeChange()
} else {
this.dialogForm.routecode = ''
}
@@ -3053,8 +3094,8 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
- this.radioSelected = row.wo_code
- const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
+ this.radioSelected = row.wo_code ? row.wo_code : this.radioSelected
+ const { data: res } = await SearchWorkStep({ wo_code: this.radioSelected, storg_code: this.$store.state.settings.orgType === 'W' ? (this.switchButton ? '' : getCookie('stu_torgcode')) : '' })
this.tableDataDetail = res
},
// 鎵撳嵃宸ュ崟
--
Gitblit v1.9.3