From a0f65b9cc2efbbbcfb1b2a7974a44b54ba937d04 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 08 二月 2025 17:18:54 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/stock/components/OutEdit.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/stock/components/OutEdit.vue b/admin/src/views/stock/components/OutEdit.vue
index dd12706..6b6f47b 100644
--- a/admin/src/views/stock/components/OutEdit.vue
+++ b/admin/src/views/stock/components/OutEdit.vue
@@ -1,10 +1,10 @@
<template>
- <GlobalWindow title="鏂板缓鍑哄簱鍗�" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
+ <GlobalWindow title="鏂板缓鍑哄簱鍗�" :visible.sync="isShowModal" :confirm-working="isLoading" width="1000px" @close="close"
@confirm="confirm">
<el-form :model="param" ref="form" :rules="rules">
<div class="df_ac">
<el-form-item class="w3" label="鍑哄簱浠撳簱" prop="warehouseId">
- <el-select :disabled="param.id" v-model="param.warehouseId" placeholder="璇烽�夋嫨">
+ <el-select :disabled="param.id" @change="changeStore" v-model="param.warehouseId" placeholder="璇烽�夋嫨">
<el-option v-for="op in storeList" :key="op.id" :label="op.name" :value="op.id"></el-option>
</el-select>
</el-form-item>
@@ -39,7 +39,7 @@
<el-table-column prop="unitName" label="鍗曚綅" show-overflow-tooltip min-width="70px"></el-table-column>
<el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" min-width="90px">
<template v-slot="{ row }">
- <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="row.stock"
+ <el-input oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" v-model="row.stock"
class="w100"></el-input>
</template>
</el-table-column>
@@ -62,6 +62,7 @@
import { ywOutinboundCreate } from '@/api/store/index'
import { StoreTypeOps, rules } from './config'
import { Message } from 'element-ui'
+import dayjs from 'dayjs'
export default {
name: 'OperaCategoryWindow',
components: { GlobalWindow, AssetSel },
@@ -69,7 +70,7 @@
return {
// 琛ㄥ崟鏁版嵁
param: {
- createUserName: this.$store.state.userInfo.username,
+ createUserName: this.$store.state.userInfo.realname || this.$store.state.userInfo.username,
creator: this.$store.state.userInfo.id,
inOut: 1
},
@@ -81,7 +82,7 @@
rules,
storeList: [],
list: [],
- StoreTypeOps: StoreTypeOps.filter(i => i.type == 1),
+ StoreTypeOps: StoreTypeOps.filter(i => i.type == 1 && i.id != 10),
dataList: [],
}
@@ -115,8 +116,12 @@
}
})
},
+ changeStore() {
+ this.list = []
+ },
initData() {
- getStoreList({ capacity: 9999, page: 1, model: {} }).then(res => {
+ this.$set(this.param, 'doneDate', dayjs().format('YYYY-MM-DD'))
+ getStoreList({ capacity: 9999, page: 1, model: {status: 0} }).then(res => {
this.storeList = res.records || []
})
},
@@ -126,6 +131,7 @@
if(this.list.indexOf(item.id) === -1){
item.materialId = item.id
item.stock = null
+ item.createDate = null
this.list.push(item)
}
})
@@ -136,10 +142,12 @@
},
handleOpenMaterial() {
+ if(!this.param.warehouseId) return Message.warning('璇峰厛閫夋嫨鍑哄簱浠撳簱')
this.isShowSel = true
this.$nextTick(() => {
this.$refs.AssetSelRef.isShowModal = true
this.$refs.AssetSelRef.isOut = true
+ this.$refs.AssetSelRef.warehouseId = this.param.warehouseId
this.$refs.AssetSelRef.getList()
console.log('-----');
--
Gitblit v1.9.3