From 76a3c7dcf11171f515a395f9961f7d080e6dce27 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 28 六月 2023 15:25:00 +0800
Subject: [PATCH] 1.项目优化
---
src/views/produceManager/workOrder.vue | 191 +++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 83 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 2078b10..31e11ab 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -368,6 +368,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 +526,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,55 +608,56 @@
<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"
+ <!-- <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"
/>
- <!-- :disabled="dialogForm.routecode===''"-->
+ </el-select>
+ </el-form-item>
- </div>
- </div>
+ <!-- <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: 200px"
+ 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>
@@ -2217,7 +2240,9 @@
isLastPrint: false, // 鏄惁鏄湯閬撴墦鍗�
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
- lastPrintArrSelected: []// 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+ lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+
+ switchButton: false
}
},
created() {
@@ -3062,8 +3087,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