From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/scgl/gd.vue | 376 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 264 insertions(+), 112 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 5e90e95..5fb73da 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -4,20 +4,20 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<div style="display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
</div>
- <el-button icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
+ <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
</div>
<div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
@@ -59,7 +59,7 @@
/>
</el-select>
</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.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -92,46 +92,41 @@
/>
</el-form-item>
</div>
- <div>
- <div class="bodySearchReset">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
- </div>
- <!-- <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
- <!-- </div>-->
- <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
- <!-- <div style="display: flex;margin: 10px 0">-->
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
- <!-- </div>-->
- <!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
- <!-- </div>-->
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
+
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <div
- class="bodyTopFormExpand"
- @click="isExpandForm=!isExpandForm"
- >
- <i
- :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
- :style="{color:'#42B983'}"
- /></div>
-
- <div class="elTableDiv" style="margin-top: 0">
+ <div class="elTableDiv">
<el-table
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -151,8 +146,8 @@
v-model="radioSelected"
:label="row.wo_code"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRow(row.wo_code)"
/>
+ <!-- @change.native="getCurrentRow(row.wo_code)"-->
</template>
</el-table-column>
<el-table-column
@@ -166,6 +161,7 @@
label="璁㈠崟鐘舵��"
sortable="custom"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂板伐鍗�</div>
@@ -174,11 +170,14 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
min-width="160"
/>
@@ -186,12 +185,19 @@
prop="m_po"
label="婧愬崟鍗曞彿"
sortable="custom"
+ show-tooltip-when-overflow
min-width="160"
- />
+ >
+ <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="wotype"
label="鍗曟嵁绫诲瀷"
sortable="custom"
+ show-tooltip-when-overflow
min-width="120"
>
<template slot-scope="{row}">
@@ -203,6 +209,7 @@
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
min-width="120"
/>
@@ -210,6 +217,7 @@
prop="partname"
min-width="150"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -228,11 +236,13 @@
prop="plan_qty"
label="宸ュ崟鏁�"
sortable="custom"
+ show-tooltip-when-overflow
width="100"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -266,6 +276,7 @@
<el-table-column
prop="plan_startdate"
label="璁″垝寮�濮嬫椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
>
@@ -279,6 +290,7 @@
label="璁″垝缁撴潫鏃堕棿"
sortable="custom"
width="160"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.plan_enddate">{{ row.plan_enddate }}</div>
@@ -288,6 +300,7 @@
<el-table-column
prop="piroque"
label="宸ュ崟绛夌骇"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -300,6 +313,7 @@
</el-table-column>
<el-table-column
prop="lm_user"
+ show-tooltip-when-overflow
label="鍒涘缓浜哄憳"
sortable="custom"
width="120"
@@ -307,6 +321,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -324,13 +339,14 @@
<!-- @click="check(row)"-->
<!-- />-->
<i
- class="el-icon-tickets"
- style="cursor: pointer;color: #42b983;margin-right: 15px"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-printer"
+ style="cursor: pointer;margin-right: 15px"
@click="handlePrint(row.wo_code)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -372,6 +388,7 @@
/>
<el-table-column
prop="wo_code"
+ show-tooltip-when-overflow
label="宸ュ崟缂栧彿"
width="160"
/>
@@ -380,33 +397,40 @@
prop="partcode"
label="浜у搧缂栫爜"
width="150"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
width="200"
+ show-tooltip-when-overflow
/>
<el-table-column
label="宸ュ簭缂栫爜"
prop="stepcode"
+ show-tooltip-when-overflow
width="150"
/>
<el-table-column
label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
prop="stepname"
width="150"
/>
<el-table-column
label="浠诲姟鏁伴噺"
+ show-tooltip-when-overflow
prop="plan_qty"
/>
<el-table-column
label="鍚堟牸鏁伴噺"
+ show-tooltip-when-overflow
prop="good_qty"
/>
<el-table-column
label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
prop="ng_qty"
/>
<el-table-column
@@ -418,8 +442,9 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
- class="el-icon-tickets"
- style="cursor: pointer;color: #42b983;margin-right: 15px"
+ class="el-icon-printer"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
@click="supplementSmallClick(row)"
/>
</el-tooltip>
@@ -431,6 +456,7 @@
</div>
<!--鏂板娲惧彂瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'娲惧彂'"
:visible.sync="dialogVisible"
width="840px"
@@ -498,6 +524,7 @@
/>
</el-form-item>
<el-button
+ v-waves
type="primary"
style="padding: 0 10px;margin-left: -8px;margin-top: 3px"
class="el-icon-search"
@@ -566,6 +593,7 @@
</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"
@@ -592,12 +620,36 @@
</el-select>
</el-form-item>
</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':''">
+ <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="閫夋嫨鏃ユ湡"
/>
@@ -610,6 +662,7 @@
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
/>
</el-form-item>
<el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
@@ -628,6 +681,7 @@
/>
</el-select>
</el-form-item>
+
</el-form>
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
@@ -658,15 +712,18 @@
/>
<el-table-column
prop="stepcode"
+ show-tooltip-when-overflow
label="宸ュ簭缂栫爜"
/>
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="flwtype"
label="宸ュ簭绫诲瀷"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.flwtype==='W'">澶栧崗</div>
@@ -676,6 +733,7 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ show-tooltip-when-overflow
fixed="right"
/>
</el-table>
@@ -683,15 +741,22 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <!-- <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!-- 宸ュ簭浠诲姟瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="宸ュ簭浠诲姟"
:visible.sync="dialogVisibleTask"
width="840px"
@@ -701,6 +766,7 @@
@close="dialogVisibleTaskClose"
>
<el-button
+ v-waves
style="margin-bottom: 15px"
type="primary"
@click="supplementClick"
@@ -724,15 +790,18 @@
/>
<el-table-column
prop="wo_code"
+ show-tooltip-when-overflow
label="宸ュ崟缂栧彿"
width="200"
/>
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stepname"
+ show-tooltip-when-overflow
label="宸ュ簭鍚嶇О"
/>
<!-- <el-table-column-->
@@ -750,14 +819,17 @@
<!-- />-->
<el-table-column
prop="plan_qty"
+ show-tooltip-when-overflow
label="浠诲姟鏁伴噺"
/>
<el-table-column
prop="good_qty"
+ show-tooltip-when-overflow
label="鍚堟牸鏁伴噺"
/>
<el-table-column
prop="ng_qty"
+ show-tooltip-when-overflow
label="涓嶈壇鏁伴噺"
/>
<el-table-column
@@ -765,30 +837,31 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" style="padding: 0;" @click="supplementSmallClick(row)">琛ユ墦</el-button>
+ <el-button v-waves type="text" style="padding: 0;" @click="supplementSmallClick(row)">琛ユ墦</el-button>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleBack">杩� 鍥�</el-button>
- <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="dialogVisibleBack">杩� 鍥�</el-button>
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!-- 婧愬崟鍗曞彿瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="婧愬崟鍗曞彿"
:visible.sync="dialogVisibleSource"
width="1200px"
- top="5vh"
+ top="10vh"
class="dialogVisibleSearch"
:close-on-click-modal="false"
@close="dialogVisibleSourceClose"
>
- <div class="bodyTopFormGroup" style="animation: move 1s linear">
+ <div class="bodyTopFormGroup">
<el-form
ref="sourceForm"
:model="sourceForm"
@@ -796,10 +869,8 @@
inline
style="display: flex;justify-content: space-between"
>
- <div class="elForm">
-
+ <div class="elForm" style="justify-content: flex-start">
<el-form-item
-
label="棰勮寮�宸ユ椂闂�"
label-width="100px"
style=" display: flex;font-size: 14px;margin-top: 3px"
@@ -869,36 +940,44 @@
</el-form-item>
</div>
- <div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
- <el-button type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
- </div>
+
+ <div style="display: flex;align-items: start;margin-top: 3px;z-index: 2;justify-content: end">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
</div>
+
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverTypeDialog==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandDialog?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverTypeDialog=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverTypeDialog==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandDialog?'doubleDown':'doubleUp'"
+ @click="isExpandDialog=!isExpandDialog"
+ @mouseout="mouseHoverTypeDialog=$event.type"
+ />
+ </div>
</div>
- <!-- <el-tooltip :content="!isExpandDialog?'鐐瑰嚮灞曠ず鏇村':'鏀惰捣'" placement="bottom">-->
- <div
- style="display:flex;justify-content: center;
- align-items:center;background-color:#eee;cursor: pointer"
- @click="isExpandDialog=!isExpandDialog"
- >
- <i
- :class="!isExpandDialog?'el-icon-arrow-down':'el-icon-arrow-up'"
- :style="{color:'#42B983'}"
- /></div>
- <!-- </el-tooltip>-->
+
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="(tableHeight-100)+'px'"
+ :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-100)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sourceSortChange"
+ @row-click="getCurrentRowSource"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -913,8 +992,8 @@
v-model="radioSelectedId"
:label="row.id"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRowSource(row.id)"
/>
+ <!-- @change.native="getCurrentRowSource(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -926,6 +1005,7 @@
<el-table-column
prop="status"
label="璁㈠崟鐘舵��"
+ show-tooltip-when-overflow
sortable="custom"
width="110"
>
@@ -939,6 +1019,7 @@
<el-table-column
prop="wo"
label="璁㈠崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
min-width="150"
/>
@@ -946,17 +1027,20 @@
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
min-width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ show-tooltip-when-overflow
min-width="150"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
+ show-tooltip-when-overflow
sortable="custom"
min-width="110"
>
@@ -969,10 +1053,12 @@
prop="qty"
label="璁㈠崟鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="relse_qty"
+ show-tooltip-when-overflow
label="宸蹭笅鍗曟暟閲�"
width="150"
sortable="custom"
@@ -980,6 +1066,7 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -991,6 +1078,7 @@
<el-table-column
prop="planstartdate"
label="棰勮寮�宸ユ椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
@@ -1002,6 +1090,7 @@
<el-table-column
prop="planenddate"
label="棰勮瀹屽伐鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
@@ -1013,6 +1102,7 @@
<el-table-column
prop="createuser"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -1024,6 +1114,7 @@
<el-table-column
prop="createdate"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="130"
sortable="custom"
>
@@ -1040,7 +1131,7 @@
<!-- <template slot-scope="{row}">-->
<!-- <div class="operationClass">-->
<!-- <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">-->
- <!-- <!– <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>–>-->
+ <!-- <!– <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>–>-->
<!-- <i-->
<!-- class="el-icon-bottom"-->
<!-- style="color:#42b983;cursor: pointer;margin-left: 5px"-->
@@ -1064,14 +1155,15 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleSourceBack">杩� 鍥�</el-button>
- <el-button type="primary" @click="dialogVisibleSourceConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisibleSourceBack">杩� 鍥�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleSourceConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!--鎵撳嵃棰勮瀵硅瘽妗� 澶ф爣绛�-->
<el-dialog
+ v-el-drag-dialog
title=""
:visible.sync="dialogVisibleApprove"
width="812px"
@@ -1207,16 +1299,17 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
- <!-- <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
- <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
- <el-button v-print="printObj" type="primary">鎵� 鍗�</el-button>
+ <el-button v-waves @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
+ <!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
+ <el-button v-waves v-print="printObj" type="primary">鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
<!--鎵撳嵃棰勮椤甸潰 灏忔爣绛�-->
<el-dialog
+ v-el-drag-dialog
title="棰勮"
:visible.sync="dialogVisible2"
width="1140"
@@ -1257,7 +1350,11 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1314,7 +1411,11 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1371,7 +1472,11 @@
style="display: flex;height: 60px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 20px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1422,14 +1527,15 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
- <el-button v-print="printObj2" type="primary">鎵� 鍗�</el-button>
+ <el-button v-waves @click="dialogVisible2 = false">鍙� 娑�</el-button>
+ <el-button v-waves v-print="printObj2" type="primary">鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
<!-- 宸ヨ壓璺嚎瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
title="鍏宠仈宸ヨ壓璺嚎"
:visible.sync="dialogVisibleRoute"
@@ -1513,10 +1619,12 @@
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="enable"
@@ -1538,8 +1646,8 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="routeDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="routeDialogVisibleConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -1552,7 +1660,7 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder, ErpOrderSearch,
+ DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
@@ -1563,14 +1671,20 @@
import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
import QRCode from 'qrcodejs2'
import $ from 'jquery'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'GD',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
return {
+ mouseHoverType: 'mouseout',
+ mouseHoverTypeDialog: 'mouseout',
+ isExpandForm: false,
isIpad: false,
mainHeight: 0,
tableHeight: 0,
@@ -1596,7 +1710,9 @@
// { code: 'CREATED', name: '宸插叧闂�' }
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
- { code: 'CLOSED', name: '瀹屽伐' }
+ { code: 'CLOSED', name: '瀹屽伐' },
+ { code: 'NOSCHED', name: '寰呮帓绋�' },
+ { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
@@ -1621,9 +1737,11 @@
planstartdate: '', // 璁″垝寮�濮嬫椂闂�
planenddate: '', // 璁″垝瀹屾垚鏃堕棿
orderlev: '', // 宸ュ崟绛夌骇
-
+ isAps: 'N', // 鏄惁鎺掔▼
+ bomId: '', // 鐗╂枡娓呭崟id
OperType: '' // 鎿嶄綔绫诲瀷
},
+ bomIdArr: [], // 鐗╂枡娓呭崟涓嬫媺
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
{ code: 'FO', name: '鎶ュ簾琛ュ崟' }
@@ -1664,6 +1782,12 @@
],
orderlev: [
{ required: true, message: '璇烽�夋嫨宸ュ崟绛夌骇', trigger: ['blur', 'change'] }
+ ],
+ isAps: [
+ { required: true, message: '璇烽�夋嫨鏄惁鎺掔▼', trigger: ['blur', 'change'] }
+ ],
+ bomId: [
+ { required: true, message: '璇烽�夋嫨鐗╂枡娓呭崟', trigger: ['blur', 'change'] }
]
},
@@ -1768,7 +1892,6 @@
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
- isExpandForm: false, // 琛ㄥ崟鏄惁灞曞紑锛岄粯璁や笉灞曞紑
tableDataDetail: [], // 鐐瑰嚮宸ュ崟琛ㄧ殑琛� 鏄剧ず璇︾粏淇℃伅
printSize: 1,
printSizeSelectArr: [// 瀹�*楂�
@@ -1778,7 +1901,12 @@
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
// { code: 5, name: '40*30' }
- ]
+ ],
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ }
}
},
created() {
@@ -1895,10 +2023,8 @@
this.dialogForm.planenddate = handleDatetime(new Date())
this.dialogForm.orderlev = 3
},
-
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
- console.log(val, 22)
const { data: res } = await PartSelectRoute({ partcode: val })
this.routeArr = res
@@ -1926,6 +2052,18 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+ },
+ // 鏄惁鎺掔▼鍊兼敼鍙樻椂
+ changeIsAps(val) {
+ if (val === 'N') {
+ this.dialogForm.bomId = ''
+ }
+ if (val === 'Y') {
+ JobCreationSonAddVison({ partnumber: this.dialogForm.partcode }).then(res => {
+ this.bomIdArr = res.data
+ this.dialogForm.bomId = this.bomIdArr[0].id
+ })
+ }
},
// 宸ュ簭浠诲姟
async check(row) {
@@ -1974,7 +2112,7 @@
},
// 鍒犻櫎鎸夐挳
async del(row) {
- if (row.status === 'START' || row.status === 'CLOSED') {
+ if (row.status === 'START' || row.status === 'CLOSED' || row.status === 'SCHED') {
return this.$message.info('姝ゅ伐鍗曚笉鍙垹闄わ紒')
}
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
@@ -1984,7 +2122,7 @@
}).then(() => {
console.log(row, 1)
const data = {
- souceid: row.sourceid,
+ souceid: row.sourceid ? row.sourceid : '',
wocode: row.wo_code,
m_po: row.m_po,
orderqty: row.plan_qty
@@ -2047,6 +2185,8 @@
// const { data: res } = await PartSelectRpute({ partcode: val })
// this.routeArr = res
// this.dialogForm.routecode = ''
+ this.dialogForm.isAps = 'N'
+ this.dialogForm.bomId = ''
this.partcodeChange(val)
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -2069,7 +2209,10 @@
this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
+ this.dialogForm.isAps = 'N' // 鏄惁鎺掔▼
+ this.dialogForm.bomId = ''
+ this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -2083,6 +2226,7 @@
if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
}
+
const data = {
// partname: this.dialogForm.partname, // 浜у搧鍚嶇О
// partspec: this.dialogForm.partspec, // 浜у搧瑙勬牸
@@ -2100,9 +2244,11 @@
planstartdate: this.dialogForm.planstartdate, // 璁″垝寮�濮嬫椂闂�
planenddate: this.dialogForm.planenddate, // 璁″垝瀹屾垚鏃堕棿
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
+ is_aps: this.dialogForm.isAps, // 鏄惁鎺掔▼
+ bom_id: this.dialogForm.bomId, // 鐗╂枡娓呭崟id
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
-
+ this.$store.state.app.buttonIsDisabled = true
AddUpdateMesOrder(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -2112,6 +2258,7 @@
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
// this.dialogVisible = false
this.getMesOrderSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
}
@@ -2145,7 +2292,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
// this.tableHeight = this.mainHeight - 250
- this.tableHeight = this.mainHeight - 470
+ this.tableHeight = this.mainHeight - 515
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 20
}
@@ -2200,9 +2347,9 @@
// div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
+ this.dialogVisibleApprove = true
}
})
- this.dialogVisibleApprove = true
},
dialogVisibleTaskClose() {
this.dialogForm.mesordercode = ''
@@ -2373,8 +2520,12 @@
this.sourceFormTotal = res.count
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- getCurrentRowSource(id) {
- this.radioSelectedId = id
+ // getCurrentRowSource2(id) {
+ // this.radioSelectedId = id
+ // },
+ // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+ getCurrentRowSource(row, event, column) {
+ this.radioSelectedId = row.id
},
sourceSearch() {
this.getErpOrderSearch()
@@ -2515,9 +2666,8 @@
this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
},
// 琛岀偣鍑讳簨浠�
- async rowClick(row, event, column) {
- console.log(row, event, column)
- console.log(row.wo_code, event, column)
+ async rowClick(row, event, column) {
+ this.radioSelected = row.wo_code
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.tableDataDetail = res
},
@@ -2663,12 +2813,12 @@
margin-bottom: 0;
}
-//.elTableDiv {
-::v-deep .el-radio__label {
- display: none;
-}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
+ }
-//}
+}
.el-table::before {
height: 0;
@@ -2837,16 +2987,18 @@
//}
}
-::v-deep .el-select__caret{
+::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
--
Gitblit v1.9.3