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 | 472 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 355 insertions(+), 117 deletions(-)
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 3dba389..9f8c7ca 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -4,35 +4,38 @@
<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">
<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;">
@@ -78,7 +81,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鎵�灞炰粨搴�" style=" display: flex;">
<el-select
v-model="form.storehousecode"
filterable
@@ -96,19 +99,42 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <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>
+ <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="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
- :height="tableHeight"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
width="100%"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
:row-class-name="tableRowClassName"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -127,6 +153,7 @@
/>
<el-table-column
prop="partcode"
+ show-tooltip-when-overflow
label="鐗╂枡缂栫爜"
min-width="160"
sortable="custom"
@@ -134,6 +161,7 @@
<el-table-column
prop="partname"
min-width="160"
+ show-tooltip-when-overflow
label="鐗╂枡鍚嶇О"
sortable="custom"
/>
@@ -141,6 +169,7 @@
prop="partspec"
label="鐗╂枡瑙勬牸"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -152,12 +181,14 @@
prop="uom_name"
label="鍗曚綅"
width="75"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="stocktypename"
label="瀛樿揣绫诲瀷"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
/>
<!-- <el-table-column-->
@@ -168,6 +199,7 @@
<el-table-column
prop="stck_name"
label="浠撳簱鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
min-width="110"
>
@@ -180,6 +212,7 @@
prop="maxqty"
label="搴撳瓨涓婇檺"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -191,6 +224,7 @@
prop="minqty"
label="搴撳瓨涓嬮檺"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -200,6 +234,7 @@
</el-table-column>
<el-table-column
prop="lm_user"
+ show-tooltip-when-overflow
label="鍒涘缓浜哄憳"
sortable="custom"
width="110"
@@ -207,18 +242,30 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
/>
<el-table-column
label="宸ヨ壓璺嚎"
width="80"
+ show-tooltip-when-overflow
prop="proute_id"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
- <i v-if="row.proute_id==='N'" style="color:rgb(180 ,181, 185)" class="el-icon-share" @click="routeClick(row)" />
+ <i
+ v-if="row.proute_id==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="routeClick(row)"
+ />
+ <i
+ v-if="row.proute_id==='N'"
+ style="color:rgb(180 ,181, 185)"
+ class="el-icon-share"
+ @click="routeClick(row)"
+ />
</div>
</template>
</el-table-column>
@@ -230,10 +277,14 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-edit-outline"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -255,6 +306,7 @@
<!--鏂板缂栬緫瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
@@ -263,7 +315,17 @@
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <div>
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 20px" />鍩虹淇℃伅锛�
+ </div>
+ <el-form
+ ref="dialogForm"
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="80px"
+ style="padding: 0 80px"
+ >
<el-form-item label="鐗╂枡缂栫爜" prop="materialcode">
<el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
@@ -345,20 +407,108 @@
<el-form-item label="鏈�澶у簱瀛�" prop="maxstockqty">
<el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
<el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty" style="margin-left: 10px">
- <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+ <el-input
+ v-model="dialogForm.minstockqty"
+ oninput="value=value.replace(/[^0-9]/g,'')"
+ style="width: 200px"
+ />
</el-form-item>
</el-form-item>
</el-form>
+
+ <el-collapse>
+ <el-collapse-item title="涓�鑷存�� Consistency" name="1">
+ <template slot="title">
+ <div>
+ <i
+ class="el-icon-s-operation"
+ :style="{color:$store.state.settings.theme}"
+ style="margin: -20px 10px 20px 20px"
+ />楂樼骇璁剧疆锛�
+ </div>
+ </template>
+ <div style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between">
+ <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
+ <div>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content=""
+ placement="top"
+ >
+ <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>
+ <el-switch
+ v-model="isBatchNo"
+ />
+ </div>
+ <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
+ <div style="margin: 0 3px">鍏堣繘鍏堝嚭锛�</div>
+ <el-switch
+ v-model="isFifo"
+ />
+ </div>
+ <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
+ <div>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content=""
+ placement="top"
+ >
+ <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>
+ <el-switch
+ v-model="isInCheck"
+ />
+ </div>
+ <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
+ <div>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content=""
+ placement="top"
+ >
+ <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>
+ <el-switch
+ v-model="isOutCheck"
+ />
+ </div>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ <!-- </div>-->
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</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"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!-- 鍗曚綅鎸夐挳瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
title="鍗曚綅璁剧疆"
:visible.sync="officeDialogVisible"
@@ -368,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"
@@ -391,6 +541,7 @@
/>
<el-table-column
prop="code"
+ show-tooltip-when-overflow
label="绫诲瀷缂栫爜"
sortable="custom"
>
@@ -402,6 +553,7 @@
<el-table-column
prop="name"
label="绫诲瀷鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -412,6 +564,7 @@
<el-table-column
prop="digdect"
label="灏忔暟浣嶆暟"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -428,6 +581,7 @@
<el-table-column
prop="r_ule"
label="鍙栨暣瑙勫垯"
+ show-tooltip-when-overflow
sortable="custom"
>
@@ -456,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>
@@ -475,56 +629,71 @@
/>
<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>
<!-- 宸ヨ壓璺嚎瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
title="鍏宠仈宸ヨ壓璺嚎"
:visible.sync="dialogVisibleRoute"
width="800px"
- top="10vh"
+ top="5vh"
:fullscreen="isIpad"
class="dialogVisibleRoute"
@closed="handleCloseRoute"
@close="handleCloseRoute"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 浜у搧鍚嶇О锛歿{
+ dialogFormRoute.projectName
+ }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヨ壓璺嚎闆嗗悎
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ヨ壓璺嚎闆嗗悎
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormRoute.routeOperationArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :label="item.name"
+ :checked="item.isSelected2"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
</div>
</div>
<el-divider />
<div>
- <i class="el-icon-s-operation" style="color:#42b983;" /> 榛樿宸ヨ壓璺嚎
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎
</div>
<div style="margin-top: 20px">
<el-select
@@ -544,7 +713,7 @@
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ュ簭鍒楄〃
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍒楄〃
</div>
<div style="overflow-y: scroll">
<el-table
@@ -565,28 +734,43 @@
/>
<el-table-column
prop="stepcode"
+ show-tooltip-when-overflow
label="宸ュ簭缂栫爜"
/>
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="enable"
label="鍚敤鐘舵��"
+ show-tooltip-when-overflow
fixed="right"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />鏄�</div>
- <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />鍚�</div>
+ <div v-if="row.enable==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
</template>
</el-table-column>
</el-table>
</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"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="routeDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -608,26 +792,20 @@
} from '@/api/zzmx'
import $ from 'jquery'
import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'CHDA',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ墿鏂欑紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
isIpad: false,
mainHeight: 0,
tableHeight: 0,
@@ -659,8 +837,8 @@
warehousecode: '', // 鎵�灞炰粨搴撶紪鐮�
stocktypecode: '', // 瀛樿揣绫诲瀷缂栫爜
materialtypecode: '', // 鐗╂枡绫诲瀷缂栫爜
- minstockqty: '', // 鏈�灏忓簱瀛�
- maxstockqty: '', // 鏈�澶у簱瀛�
+ minstockqty: null, // 鏈�灏忓簱瀛�
+ maxstockqty: null, // 鏈�澶у簱瀛�
OperType: '' // 鎿嶄綔绫诲瀷
},
uomArr: [], // 鍗曚綅鏁扮粍缂栫爜
@@ -668,7 +846,7 @@
operation: '',
dialogFormRules: {
materialcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
materialname: [
{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉�', trigger: ['blur', 'change'] }
@@ -719,7 +897,11 @@
},
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
- projectTableData: []// 璁惧鍒楄〃
+ projectTableData: [], // 璁惧鍒楄〃
+ isBatchNo: false, // 鏄惁鎵规绠＄悊
+ isFifo: false, // 鏄惁鍏堣繘鍏堝嚭
+ isInCheck: false, // 鏄惁鍏ュ簱妫�楠�
+ isOutCheck: false// 鏄惁鍑哄巶妫�楠�
}
},
created() {
@@ -765,7 +947,7 @@
}
},
// 鍚屾瀛樿揣妗ｆ
- async syncInventoryFileSelect() {
+ async syncInventoryFileSelect() {
const loading = this.$loading({
lock: true,
text: '姝ｅ湪鍚屾瀛樿揣妗ｆ锛岃绋嶇瓑...',
@@ -879,7 +1061,7 @@
this.getuomSelect()
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
// await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
@@ -892,8 +1074,12 @@
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'
+ this.isOutCheck = row.is_outcheck === 'Y'
})
await this.getuomSelect()
},
@@ -928,6 +1114,10 @@
this.dialogForm.materialtypecode = ''
this.dialogForm.minstockqty = ''
this.dialogForm.maxstockqty = ''
+ this.isBatchNo = false
+ this.isFifo = false
+ this.isInCheck = false
+ this.isOutCheck = false
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -936,12 +1126,10 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- if (this.defaultroute_codeArr.length > 0 && this.defaultroute_code === '') {
- return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
- }
-
+ console.log(this.dialogForm.minstockqty, 1)
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
materialcode: this.dialogForm.materialcode,
@@ -951,15 +1139,21 @@
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,
- OperType: this.operation === 'add' ? 'Add' : 'Update'
+ 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',
+ is_incheck: this.isInCheck ? 'Y' : 'N',
+ is_outcheck: this.isOutCheck ? 'Y' : 'N'
}
+ console.log(data, 111)
AddUpdateInventoryFile(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getInventoryFileSelect()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -971,55 +1165,70 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 255
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
/* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
// 宸ヨ壓璺嚎鐐瑰嚮
- async routeClick(row) {
- console.log(row)
+ routeClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
this.defaultroute_code = row.default_route
this.dialogFormRoute.projectCode = row.partcode
this.dialogFormRoute.projectName = row.partname
- this.dialogVisibleRoute = true
- const { data: res } = await InventoryFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
- this.dialogFormRoute.routeOperationArr = res
- // let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
- this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
- item.isSelected1 = false
- item.isSelected2 = false
- if (index === 0) {
- item.isSelected1 = true
- this.projectTableData = item.Data
- }
- if (item.flag === 'Y') {
- item.isSelected2 = true
- this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)
- })
+ InventoryFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.dialogVisibleRoute = true
+ this.dialogFormRoute.routeOperationArr = res.data
+ // let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
- // const interval = setInterval(() => {
- // if ($('input:checkbox').length > 0) {
- // waitFlag = true
- // }
- // if (waitFlag) {
- // clearInterval(interval)
- // this.$nextTick(() => {
- // $('input:checkbox').eq(index).prop('checked', true)
- // })
- // }
- // }, 100)
+ this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
+ item.isSelected1 = false
+ item.isSelected2 = false
+ if (index === 0) {
+ item.isSelected1 = true
+ this.projectTableData = item.Data
+ }
+ if (item.flag === 'Y') {
+ item.isSelected2 = true
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)
+ })
+
+ // const interval = setInterval(() => {
+ // if ($('input:checkbox').length > 0) {
+ // waitFlag = true
+ // }
+ // if (waitFlag) {
+ // clearInterval(interval)
+ // this.$nextTick(() => {
+ // $('input:checkbox').eq(index).prop('checked', true)
+ // })
+ // }
+ // }, 100)
+ }
+ })
+
+ this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
+ }, 1000)
+ } else {
+ loading.close()
}
})
-
- this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
-
- console.log(this.defaultroute_codeArr, 123)
},
// 瀵硅瘽妗嗗叧闂�
handleCloseRoute() {
@@ -1032,8 +1241,8 @@
},
// 纭畾
async routeDialogVisibleConfirm() {
- const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
- if (this.defaultroute_code === '' && temp.length > 0) {
+ console.log(this.defaultroute_code)
+ if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
}
@@ -1044,12 +1253,13 @@
data.push({ code: item.code, name: item.name })
}
})
-
+ this.$store.state.app.buttonIsDisabled = true
const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
if (res.code === '200') {
+ this.dialogVisibleRoute = false
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getInventoryFileSelect()
- this.dialogVisibleRoute = false
+ this.$store.state.app.buttonIsDisabled = false
}
},
// 澶х洅瀛愮偣鍑讳簨浠�
@@ -1063,8 +1273,8 @@
},
// 灏忕洅瀛愮偣鍑讳簨浠�
myCheckboxInputClick(val) {
- console.log(val, 2)
- val.isSelected2 = !val.isSelected2
+ // console.log(val, 2)
+ val.isSelected2 = !!val.isSelected2
this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
if (val.code === item.code) {
@@ -1210,10 +1420,19 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
+ }
+
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
}
}
@@ -1256,7 +1475,7 @@
}
}
-.defaultroute_code ::v-deep .el-input__suffix-inner{
+.defaultroute_code ::v-deep .el-input__suffix-inner {
display: flex;
align-items: center;
justify-content: center;
@@ -1267,11 +1486,12 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.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;
}
@@ -1298,7 +1518,8 @@
}
::v-deep .el-dialog__body {
- padding: 20px 100px !important;
+ //padding: 20px 100px !important;
+ padding: 20px 20px !important;
}
::v-deep .dialogVisibleRoles .el-dialog__body {
@@ -1332,8 +1553,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 {
@@ -1349,12 +1570,29 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
.el-table .custom-row {
background: #f8f8fa;
--
Gitblit v1.9.3