From 0fe5b8389c7025ce34a05d3920d1d6c169f9fea7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 03 三月 2023 16:31:50 +0800
Subject: [PATCH] 1.字体引入研究2.节拍工价、工单新增控制必须设置计件单价
---
src/views/scgl/gd.vue | 170 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 132 insertions(+), 38 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 6c41179..854af65 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"
@@ -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>
@@ -161,6 +161,7 @@
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"
@@ -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"
@@ -903,8 +953,8 @@
</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 +988,7 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sourceSortChange"
+ @row-click="getCurrentRowSource"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -952,8 +1003,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
@@ -965,6 +1016,7 @@
<el-table-column
prop="status"
label="璁㈠崟鐘舵��"
+ show-tooltip-when-overflow
sortable="custom"
width="110"
>
@@ -978,6 +1030,7 @@
<el-table-column
prop="wo"
label="璁㈠崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
min-width="150"
/>
@@ -985,17 +1038,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"
>
@@ -1008,10 +1064,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"
@@ -1019,6 +1077,7 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -1030,6 +1089,7 @@
<el-table-column
prop="planstartdate"
label="棰勮寮�宸ユ椂闂�"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
@@ -1041,6 +1101,7 @@
<el-table-column
prop="planenddate"
label="棰勮瀹屽伐鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="130"
>
@@ -1052,6 +1113,7 @@
<el-table-column
prop="createuser"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -1063,6 +1125,7 @@
<el-table-column
prop="createdate"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="130"
sortable="custom"
>
@@ -1079,7 +1142,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"-->
@@ -1103,14 +1166,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"
@@ -1246,16 +1310,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"
@@ -1473,14 +1538,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 +1630,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 +1657,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>
@@ -1604,7 +1672,7 @@
AddUpdateMesOrder,
ClosedMesOrder,
DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
- MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
+ MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1614,12 +1682,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',
@@ -1846,7 +1917,8 @@
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
- }
+ },
+ sumbitBottonIsDisabled: false
}
},
created() {
@@ -1981,6 +2053,8 @@
}
this.dialogForm.wkshopcode = ''
+
+ this.sumbitBottonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -1993,6 +2067,21 @@
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
},
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ 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 +2243,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
+ this.sumbitBottonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2460,8 +2550,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()
--
Gitblit v1.9.3