From f5389299d31e2236d399e48cfc1b09e5dd16f4c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 10:01:39 +0800
Subject: [PATCH] 1.看板样式优化
---
src/views/scgl/gd.vue | 485 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 341 insertions(+), 144 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 6c41179..20002ba 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -4,11 +4,11 @@
<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">
@@ -17,10 +17,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
:popper-append-to-body="false"
@@ -37,7 +37,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
@@ -59,7 +59,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" 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;">
@@ -71,7 +71,7 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
<!-- v-model="form.createdate"-->
<!-- type="daterange"-->
@@ -93,9 +93,9 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
- <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 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>
@@ -158,9 +158,10 @@
/>
<el-table-column
prop="status"
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
sortable="custom"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂板伐鍗�</div>
@@ -176,6 +177,7 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
min-width="160"
/>
@@ -183,6 +185,7 @@
prop="m_po"
label="婧愬崟鍗曞彿"
sortable="custom"
+ show-tooltip-when-overflow
min-width="160"
>
<template slot-scope="{row}">
@@ -194,6 +197,7 @@
prop="wotype"
label="鍗曟嵁绫诲瀷"
sortable="custom"
+ show-tooltip-when-overflow
min-width="120"
>
<template slot-scope="{row}">
@@ -205,6 +209,7 @@
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
min-width="120"
/>
@@ -231,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"
>
@@ -269,6 +276,7 @@
<el-table-column
prop="plan_startdate"
label="璁″垝寮�濮嬫椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
>
@@ -282,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>
@@ -291,6 +300,7 @@
<el-table-column
prop="piroque"
label="宸ュ崟绛夌骇"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -303,6 +313,7 @@
</el-table-column>
<el-table-column
prop="lm_user"
+ show-tooltip-when-overflow
label="鍒涘缓浜哄憳"
sortable="custom"
width="120"
@@ -310,6 +321,7 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -327,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>
@@ -375,6 +388,7 @@
/>
<el-table-column
prop="wo_code"
+ show-tooltip-when-overflow
label="宸ュ崟缂栧彿"
width="160"
/>
@@ -383,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
@@ -421,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>
@@ -434,6 +456,7 @@
</div>
<!--鏂板娲惧彂瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'娲惧彂'"
:visible.sync="dialogVisible"
width="840px"
@@ -450,7 +473,7 @@
label-width="110px"
>
<el-form-item
- label="璁㈠崟鐘舵��"
+ label="宸ュ崟鐘舵��"
prop="mesorderstus"
>
<el-select
@@ -501,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"
@@ -569,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"
@@ -585,6 +610,7 @@
style="width: 200px;"
placeholder="璇烽�夋嫨"
:disabled="dialogForm.routecode===''"
+ @change="wkshopcodeChange"
>
<el-option
v-for="item in wkshopArr"
@@ -687,15 +713,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>
@@ -705,6 +734,7 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ show-tooltip-when-overflow
fixed="right"
/>
</el-table>
@@ -712,12 +742,23 @@
<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 v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
+
<el-button
+ v-if="!sumbitBottonIsDisabled"
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+
+ <el-button
+ v-if="sumbitBottonIsDisabled"
+ v-waves
+ type="primary"
+ disabled
@click="dialogVisibleConfirm"
>纭� 瀹�</el-button>
</div>
@@ -726,6 +767,7 @@
<!-- 宸ュ簭浠诲姟瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="宸ュ簭浠诲姟"
:visible.sync="dialogVisibleTask"
width="840px"
@@ -735,6 +777,7 @@
@close="dialogVisibleTaskClose"
>
<el-button
+ v-waves
style="margin-bottom: 15px"
type="primary"
@click="supplementClick"
@@ -758,15 +801,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-->
@@ -784,14 +830,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
@@ -799,21 +848,22 @@
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"
@@ -831,45 +881,45 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item
- label="棰勮寮�宸ユ椂闂�"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.paystartdate"
- type="daterange"
- range-separator="~"
- class="timeMini"
- size="mini"
- style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
- <!-- :picker-options="expireTimeOption"-->
+ <!-- <el-form-item-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.paystartdate"-->
+ <!-- type="daterange"-->
+ <!-- range-separator="~"-->
+ <!-- class="timeMini"-->
+ <!-- size="mini"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"-->
+ <!-- :clearable="false"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- />-->
+ <!-- <!– :picker-options="expireTimeOption"–>-->
- </el-form-item>
- <el-form-item
- label="棰勮瀹屽伐鏃堕棿"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.payenddate"
- type="daterange"
- :clearable="false"
- class="timeMini"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
- end-placeholder="缁撴潫鏃ユ湡"
- size="mini"
- />
- </el-form-item>
- <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <!-- </el-form-item>-->
+ <!-- <el-form-item-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- label-width="100px"-->
+ <!-- style=" display: flex;font-size: 14px;margin-top: 3px"-->
+ <!-- >-->
+ <!-- <el-date-picker-->
+ <!-- v-model="sourceForm.payenddate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- class="timeMini"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
- v-model="sourceForm.erporderstus"
+ v-model="sourceForm.mesordercode"
filterable
:popper-append-to-body="false"
style="width: 200px"
@@ -883,10 +933,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -900,11 +950,32 @@
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
+ <el-form-item
+ v-show="isExpandDialog"
+ label="鍒涘缓鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.createdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+
+ </el-form-item>
+
</div>
<div style="display: flex;align-items: start;margin-top: 3px;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>
+ <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>
@@ -938,6 +1009,7 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sourceSortChange"
+ @row-click="getCurrentRowSource"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -952,8 +1024,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
@@ -962,40 +1034,50 @@
fixed
label="搴忓彿"
/>
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- label="宸ュ崟鐘舵��"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="110"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.status==='NEW'">鏂拌鍗�</div>-->
+ <!-- <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>-->
+ <!-- <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>-->
+ <!-- <div v-if="row.status==='CLOSED'">宸插叧闂�</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
- prop="status"
- label="璁㈠崟鐘舵��"
- sortable="custom"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.status==='NEW'">鏂拌鍗�</div>
- <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
- <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
- <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="璁㈠崟缂栧彿"
- sortable="custom"
+ label="宸ュ崟缂栧彿"
+ prop="wo_code"
+ show-tooltip-when-overflow
min-width="150"
- />
+ sortable="custom"
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.m_po">{{ row.m_po }}</div>-->
+ <!-- <div v-else>{{ row.wo_code }}</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
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"
>
@@ -1005,20 +1087,32 @@
</template>
</el-table-column>
<el-table-column
- prop="qty"
- label="璁㈠崟鏁伴噺"
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
+
<el-table-column
- prop="relse_qty"
- label="宸蹭笅鍗曟暟閲�"
+ prop="bad_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"-->
+ <!-- />-->
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -1028,46 +1122,50 @@
</template>
</el-table-column>
<el-table-column
- prop="planstartdate"
+ prop="plan_startdate"
label="棰勮寮�宸ユ椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <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="planenddate"
+ prop="plan_enddate"
label="棰勮瀹屽伐鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <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="createuser"
+ prop="lm_user"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
<template slot-scope="{row}">
- <div v-if="row.createuser">{{ row.createuser }}</div>
+ <div v-if="row.lm_user">{{ row.lm_user }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="createdate"
+ prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+ <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -1079,7 +1177,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"-->
@@ -1099,18 +1197,19 @@
align="right"
layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getErpOrderSearch"
+ @pagination="getMesBadOrderSearch"
/>
<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"
@@ -1246,16 +1345,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"
@@ -1409,6 +1509,67 @@
</div>
<div
+ v-if="printSize===2"
+ style="display: flex;width: 220px;height: 130px;border: 1px solid #000;text-align: center;font-size: 12px"
+ >
+
+ <div style="width: 70px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 60%;border-bottom:1px solid #000;
+ justify-content: center;align-items: center;position: relative"
+ >
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:71%;position: absolute;left: 7px;"
+ />
+ </div>
+ <div
+ style="display: flex;height: 20%;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
+ <div style="margin-left: 3px; ">鏁伴噺:{{ qrForm.startqty }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;">
+ <div style="margin-left: 3px; ">鎿嶄綔:{{ qrForm.operator }}</div>
+
+ </div>
+ </div>
+
+ <div style="width:150px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">缂栧彿:{{ qrForm.wo_code }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧缂栫爜:{{ qrForm.partcode }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">浜у搧鍚嶇О:{{ qrForm.partname }}</div>
+
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="margin-left: 3px;">涓嬮亾宸ュ簭:{{ qrForm.nextstepname }}</div>
+
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style=" margin-left: 3px;">鏃堕棿: {{ qrForm.operatorTime }}</div>
+ <!-- <div>{{ qrForm.operatorTime?qrForm.operatorTime.substring(5):'' }}</div>-->
+ <!-- <div>{{ qrForm.operatorTime }}</div>-->
+ </div>
+
+ </div>
+
+ </div>
+ <div
v-if="printSize===5"
style="display: flex;width: 140px;height: 80px;border: 1px solid #000;text-align: center;font-size: 10px;"
>
@@ -1473,14 +1634,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"
@@ -1564,10 +1726,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"
@@ -1589,8 +1753,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>
@@ -1603,8 +1767,8 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
+ DeleteMesOrder, MesBadOrderSearch, JobCreationSonAddVison,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1614,12 +1778,15 @@
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',
@@ -1805,17 +1972,18 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
- erporderstus: '', // 璁㈠崟鐘舵�佺爜
- erpordercode: '', // 璁㈠崟缂栧彿
+ mesordercode: '', // 璁㈠崟鐘舵�佺爜
+ sourceorder: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
// paystartdate: '', // 浜や粯鏃堕棿
- paystartdate: '', // 棰勮寮�宸ユ椂闂�
- payenddate: '', // 棰勮瀹屽伐鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ // payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'createdate', // 鎺掑簭瀛楁
+
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -1833,10 +2001,11 @@
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
tableDataDetail: [], // 鐐瑰嚮宸ュ崟琛ㄧ殑琛� 鏄剧ず璇︾粏淇℃伅
- printSize: 1,
+ printSize: 0,
printSizeSelectArr: [// 瀹�*楂�
{ code: 0, name: '80*50' },
- { code: 1, name: '78*60' }
+ { code: 1, name: '78*60' },
+ { code: 2, name: '60*40' }
// { code: 2, name: '50*60' },
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
@@ -1846,7 +2015,8 @@
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
- }
+ },
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1930,7 +2100,7 @@
}
this.sourceForm.order = order
this.sourceForm.prop = prop
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
// 鏌ヨ
search() {
@@ -1981,6 +2151,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -1992,7 +2164,24 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ wkshopcodeChange(val) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode,
+ wkshopcode: val
+ }
+ SelectRouteOrWkshop(data).then((res) => {
+ // console.log(res, 1)
+ }).catch(err => {
+ // console.log(err, 2)
+ this.sumbitBottonIsDisabled = true
+ })
+ },
+
// 鏄惁鎺掔▼鍊兼敼鍙樻椂
changeIsAps(val) {
if (val === 'N') {
@@ -2154,6 +2343,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2410,8 +2600,8 @@
bindQRCode2(text) {
new QRCode(this.$refs.qrCodeDiv2, {
text: text,
- width: 60,
- height: 60,
+ width: this.printSize !== 2 ? 60 : 55,
+ height: this.printSize !== 2 ? 60 : 55,
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
@@ -2423,30 +2613,31 @@
return this.$message.info('宸ュ崟绫诲瀷涓烘姤搴熻ˉ鍗曟儏鍐典笅鍙�夋嫨锛�')
}
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
this.dialogVisibleSource = true
},
- async getErpOrderSearch() {
- let tempDate2 = this.sourceForm.paystartdate
- if (tempDate2.length > 0) {
- tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
- }
+ async getMesBadOrderSearch() {
+ // let tempDate2 = this.sourceForm.paystartdate
+ // if (tempDate2.length > 0) {
+ // tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ // }
- let tempDate = this.sourceForm.payenddate
+ let tempDate = this.sourceForm.createdate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
- erporderstus: this.sourceForm.erporderstus, // 璁㈠崟鐘舵�佺爜
- erpordercode: this.sourceForm.erpordercode, // 璁㈠崟缂栧彿
+ mesordercode: this.sourceForm.mesordercode, // 璁㈠崟鐘舵�佺爜
+ sourceorder: this.sourceForm.sourceorder, // 宸ュ崟缂栧彿
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
- paystartdate: tempDate2, // 浜や粯鏃堕棿
- payenddate: tempDate, // 浜や粯鏃堕棿
+ // paystartdate: tempDate2, // 浜や粯鏃堕棿
+ // payenddate: tempDate, // 浜や粯鏃堕棿
creatuser: this.sourceForm.creatuser, // 鍒涘缓浜哄憳
+ createdate: tempDate, // 鍒涘缓鏃堕棿
prop: this.sourceForm.prop, // 鎺掑簭瀛楁
order: this.sourceForm.order, // 鎺掑簭瀛楁
@@ -2455,34 +2646,39 @@
}
- const res = await ErpOrderSearch(data)
- this.sourceTableData = res.data.filter(item => item.status !== 'NEW')
+ const res = await MesBadOrderSearch(data)
+ this.sourceTableData = res.data
this.sourceFormTotal = res.count
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- getCurrentRowSource(id) {
- this.radioSelectedId = id
+ // getCurrentRowSource2(id) {
+ // this.radioSelectedId = id
+ // },
+ // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+ getCurrentRowSource(row, event, column) {
+ this.radioSelectedId = row.id
+ this.dialogForm.mesqty = row.bad_qty
},
sourceSearch() {
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
sourceReset() {
- this.sourceForm.erporderstus = ''
- this.sourceForm.erpordercode = ''
+ this.sourceForm.mesordercode = ''
+ this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
this.sourceForm.partname = ''
this.sourceForm.partspec = ''
- this.sourceForm.paystartdate = ''
- this.sourceForm.payenddate = ''
+ // this.sourceForm.paystartdate = ''
+ // this.sourceForm.payenddate = ''
this.sourceForm.creatuser = ''
this.sourceForm.createdate = ''
- this.getErpOrderSearch()
+ this.getMesBadOrderSearch()
},
dialogVisibleSourceClose() {
this.radioSelectedId = ''
- this.sourceForm.erporderstus = ''
- this.sourceForm.erpordercode = ''
+ this.sourceForm.mesordercode = ''
+ this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
this.sourceForm.partname = ''
this.sourceForm.partspec = ''
@@ -2501,7 +2697,7 @@
console.log(this.radioSelectedId)
this.sourceTableData.forEach(item => {
if (item.id === this.radioSelectedId) {
- this.dialogForm.sourceorder = item.wo
+ this.dialogForm.sourceorder = item.wo_code
this.dialogForm.partcode = item.partcode
this.dialogForm.partspec = item.partspec
}
@@ -2631,6 +2827,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
+
.dialogVisibleRoute {
.myCheckboxGroup {
display: flex;
--
Gitblit v1.9.3