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/zzmx/chda.vue | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index d1debbf..9f8c7ca 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -4,26 +4,29 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between;">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-office-building" @click="office">鍗曚綅</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-office-building" @click="office">鍗曚綅</el-button>-->
<div style="display: flex">
<el-button
+ v-waves
icon="el-icon-refresh-right"
@click="syncSeaveSearchUnit"
>鍚屾璁￠噺鍗曚綅
</el-button>
<el-button
+ v-waves
icon="el-icon-refresh-right"
@click="syncInventoryFileSelect"
>鍚屾瀛樿揣妗ｆ
</el-button>
<el-button
+ v-waves
icon="el-icon-refresh-right"
@click="syncStockTypeSelect"
>鍚屾瀛樿揣绫诲瀷
</el-button>
</div>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -100,8 +103,8 @@
class="bodySearchReset"
:style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'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>
+ <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
@@ -457,12 +460,12 @@
content=""
placement="top"
>
- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍏ュ簱妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍏ュ簱鍙嶅垯璇ョ墿鏂欒川閲忕姸鎬佷负寰呮鐘舵�佹槸涓嶅厑璁稿叆搴撶殑銆�</div>
+ <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍏ュ巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍏ュ巶鍙嶅垯璇ョ墿鏂欒川閲忕姸鎬佷负寰呮鐘舵�佹槸涓嶅厑璁稿叆鍘傜殑銆�</div>
<i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
</el-tooltip>
</div>
- <div style="margin: 0 3px">鍏ュ簱妫�楠岋細</div>
+ <div style="margin: 0 3px">鍏ュ巶妫�楠岋細</div>
<el-switch
v-model="isInCheck"
/>
@@ -475,7 +478,7 @@
content=""
placement="top"
>
- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍑哄簱妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍑哄簱锛屽弽鍒欒鐗╂枡璐ㄩ噺鐘舵�佷负寰呮鐘舵�佹槸涓嶅厑璁稿嚭搴撶殑銆�</div>
+ <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍑哄巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍑哄巶锛屽弽鍒欒鐗╂枡璐ㄩ噺鐘舵�佷负寰呮鐘舵�佹槸涓嶅厑璁稿嚭鍘傜殑銆�</div>
<i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
</el-tooltip>
</div>
@@ -491,8 +494,9 @@
<!-- </div>-->
<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"
@@ -514,8 +518,8 @@
@close="handleCloseOffice"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addOffice">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addOffice">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
:data="officeTableData"
@@ -606,9 +610,9 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="delOffice(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="saveOffice(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancelOffice(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delOffice(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveOffice(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelOffice(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -625,8 +629,8 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="officeDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="officeDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
@@ -759,8 +763,9 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -789,13 +794,14 @@
import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'CHDA',
components: {
Pagination
},
- directives: { elDragDialog },
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -831,8 +837,8 @@
warehousecode: '', // 鎵�灞炰粨搴撶紪鐮�
stocktypecode: '', // 瀛樿揣绫诲瀷缂栫爜
materialtypecode: '', // 鐗╂枡绫诲瀷缂栫爜
- minstockqty: '', // 鏈�灏忓簱瀛�
- maxstockqty: '', // 鏈�澶у簱瀛�
+ minstockqty: null, // 鏈�灏忓簱瀛�
+ maxstockqty: null, // 鏈�澶у簱瀛�
OperType: '' // 鎿嶄綔绫诲瀷
},
uomArr: [], // 鍗曚綅鏁扮粍缂栫爜
@@ -1068,8 +1074,8 @@
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.stocktypecode = row.stocktypecode
this.dialogForm.materialtypecode = row.materialtypecode
- this.dialogForm.minstockqty = row.maxqty
- this.dialogForm.maxstockqty = row.minqty
+ this.dialogForm.minstockqty = row.minqty
+ this.dialogForm.maxstockqty = row.maxqty
this.isBatchNo = row.is_batchno === 'Y'
this.isFifo = row.is_fifo === 'Y'
this.isInCheck = row.is_incheck === 'Y'
@@ -1120,6 +1126,7 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ console.log(this.dialogForm.minstockqty, 1)
this.$refs.dialogForm.validate(valid => {
if (valid) {
this.$store.state.app.buttonIsDisabled = true
@@ -1132,8 +1139,8 @@
warehousecode: this.dialogForm.warehousecode,
stocktypecode: this.dialogForm.stocktypecode,
materialtypecode: this.dialogForm.materialtypecode,
- minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
- maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
+ minstockqty: this.dialogForm.minstockqty ? parseFloat(this.dialogForm.minstockqty) : 0,
+ maxstockqty: this.dialogForm.maxstockqty ? parseFloat(this.dialogForm.maxstockqty) : 0,
OperType: this.operation === 'add' ? 'Add' : 'Update',
is_batchno: this.isBatchNo ? 'Y' : 'N',
is_fifo: this.isFifo ? 'Y' : 'N',
--
Gitblit v1.9.3