From c0ae2d732eb9fc13d3cfc0c2f2f2ab71d2592ac6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 30 一月 2023 12:49:13 +0800
Subject: [PATCH] 1.存货档案 对话框新增 高级设置属性
---
src/views/zzmx/chda.vue | 183 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 24 deletions(-)
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 80ce719..d1debbf 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -96,7 +96,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <div
+ 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>
</div>
@@ -248,8 +251,18 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <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)" />
+ <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>
@@ -261,7 +274,11 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i :style="{color:$store.state.settings.theme}" 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 :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
@@ -295,7 +312,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>
@@ -377,10 +404,91 @@
<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>
@@ -537,7 +645,9 @@
@close="handleCloseRoute"
>
<div>
- <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 浜у搧鍚嶇О锛歿{
+ dialogFormRoute.projectName
+ }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
@@ -637,10 +747,12 @@
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
<i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 鏄�</div>
+ 鏄�
+ </div>
<div v-if="row.enable==='N'">
<i class="el-icon-info" style="margin-right: 2px" />
- 鍚�</div>
+ 鍚�
+ </div>
</template>
</el-table-column>
</el-table>
@@ -779,7 +891,11 @@
},
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
- projectTableData: []// 璁惧鍒楄〃
+ projectTableData: [], // 璁惧鍒楄〃
+ isBatchNo: false, // 鏄惁鎵规绠＄悊
+ isFifo: false, // 鏄惁鍏堣繘鍏堝嚭
+ isInCheck: false, // 鏄惁鍏ュ簱妫�楠�
+ isOutCheck: false// 鏄惁鍑哄巶妫�楠�
}
},
created() {
@@ -825,7 +941,7 @@
}
},
// 鍚屾瀛樿揣妗ｆ
- async syncInventoryFileSelect() {
+ async syncInventoryFileSelect() {
const loading = this.$loading({
lock: true,
text: '姝ｅ湪鍚屾瀛樿揣妗ｆ锛岃绋嶇瓑...',
@@ -939,7 +1055,7 @@
this.getuomSelect()
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
// await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
@@ -954,6 +1070,10 @@
this.dialogForm.materialtypecode = row.materialtypecode
this.dialogForm.minstockqty = row.maxqty
this.dialogForm.maxstockqty = row.minqty
+ 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()
},
@@ -988,6 +1108,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()
},
// 瀵硅瘽妗嗗彇娑�
@@ -1010,8 +1134,13 @@
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'
+ 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.dialogVisible = false
@@ -1339,7 +1468,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;
@@ -1350,11 +1479,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;
}
@@ -1381,7 +1511,8 @@
}
::v-deep .el-dialog__body {
- padding: 20px 100px !important;
+ //padding: 20px 100px !important;
+ padding: 20px 20px !important;
}
::v-deep .dialogVisibleRoles .el-dialog__body {
@@ -1415,8 +1546,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 {
@@ -1432,26 +1563,30 @@
.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{
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
</style>
<style>
-.osloading{
+.osloading {
font-size: 26px !important;
}
-.el-loading-text{
+.el-loading-text {
font-size: 26px !important;
}
+
.el-table .custom-row {
background: #f8f8fa;
}
--
Gitblit v1.9.3