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/scdd.vue | 102 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 73 insertions(+), 29 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index deaef12..a54b462 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -4,11 +4,13 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button
+ v-waves
icon="el-icon-refresh-right"
@click="syncERP"
>鍚屾ERP
</el-button>
<el-button
+ v-waves
icon="el-icon-switch-button"
@click="orderClose"
>鍏抽棴璁㈠崟
@@ -21,10 +23,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.erporderstus"
filterable
@@ -49,13 +51,18 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" 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-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<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="棰勮寮�宸ユ椂闂�" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮寮�宸ユ椂闂�"
+ label-width="100px"
+ style="display: flex;font-size: 14px;align-items: center"
+ >
<el-date-picker
v-model="form.paystartdate"
type="daterange"
@@ -71,7 +78,12 @@
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮瀹屽伐鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;align-items: center"
+ >
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -96,9 +108,12 @@
</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>
@@ -165,6 +180,7 @@
label="璁㈠崟鐘舵��"
sortable="custom"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
@@ -176,6 +192,7 @@
<el-table-column
prop="wo"
label="璁㈠崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
min-width="150"
/>
@@ -183,6 +200,7 @@
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
min-width="150"
/>
<el-table-column
@@ -208,17 +226,20 @@
prop="qty"
label="璁㈠崟鏁伴噺"
width="150"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="relse_qty"
label="宸蹭笅鍗曟暟閲�"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
width="150"
>
@@ -229,23 +250,25 @@
</el-table-column>
<el-table-column
prop="planstartdate"
+ show-tooltip-when-overflow
label="棰勮寮�宸ユ椂闂�"
sortable="custom"
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planstartdate">{{ row.planstartdate.substring(0,11) }}</div>
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
prop="planenddate"
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.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -253,14 +276,16 @@
prop="saleOrderDeliveryDate"
label="棰勮浜や粯鏃ユ湡"
sortable="custom"
+ show-tooltip-when-overflow
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0,11) }}</div>
+ <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
+ show-tooltip-when-overflow
prop="createuser"
label="鍒涘缓浜哄憳"
sortable="custom"
@@ -275,10 +300,11 @@
prop="createdate"
label="鍒涘缓鏃堕棿"
width="130"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.createdate">{{ row.createdate.substring(0,11) }}</div>
+ <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -290,8 +316,13 @@
<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>-->
- <i class="el-icon-bottom" style="color:#42b983;cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
+ <!-- <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
+ <i
+ class="el-icon-bottom"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-left: 5px"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
</div>
</template>
@@ -311,6 +342,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
width="860px"
@@ -397,8 +429,9 @@
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -415,6 +448,8 @@
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -422,6 +457,7 @@
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
const validateName = (rule, value, callback) => {
if (!value) {
@@ -781,29 +817,34 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-range-input{
+::v-deep .el-range-input {
//font-size: 14px !important;
}
-::v-deep .el-range__icon{
+
+::v-deep .el-range__icon {
line-height: 28px !important;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
line-height: 28px !important;
}
-::v-deep .el-range-input{
+
+::v-deep .el-range-input {
font-size: 14px;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
display: flex;
justify-content: center;
align-items: center;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -864,8 +905,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -881,6 +922,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
@@ -891,11 +933,12 @@
}
}
-.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;
}
}
@@ -920,11 +963,12 @@
.el-table .custom-row {
background: #f8f8fa;
}
-.osloading{
+
+.osloading {
font-size: 26px !important;
}
-.el-loading-text{
+.el-loading-text {
font-size: 26px !important;
}
</style>
--
Gitblit v1.9.3