From d1f08bfc65d459b893fb6d5134927e0c078d32e5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 24 一月 2025 13:50:59 +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/InEdit.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/stock/components/InEdit.vue b/admin/src/views/stock/components/InEdit.vue
index b19d3a0..71441e5 100644
--- a/admin/src/views/stock/components/InEdit.vue
+++ b/admin/src/views/stock/components/InEdit.vue
@@ -1,5 +1,5 @@
<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">
@@ -37,13 +37,13 @@
<el-table-column prop="qrcode" label="鏉″舰鐮�" show-overflow-tooltip min-width="70px"></el-table-column>
<el-table-column prop="brand" label="鍝佺墝" show-overflow-tooltip min-width="70px"></el-table-column>
<el-table-column prop="unitName" label="鍗曚綅" show-overflow-tooltip min-width="70px"></el-table-column>
- <el-table-column prop="dealUserName" label="鍏ュ簱鏁伴噺" min-width="90px">
+ <el-table-column prop="dealUserName" label="鍏ュ簱鏁伴噺" min-width="100px">
<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>
- <el-table-column prop="maxStock" label="搴撳瓨鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ <!-- <el-table-column prop="maxStock" label="搴撳瓨鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column> -->
<el-table-column label="鎿嶄綔" min-width="60px">
<template v-slot="scope">
<span @click="handleDel(scope)" class="red pointer">鍒犻櫎</span>
@@ -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: 0
},
@@ -118,9 +119,9 @@
})
},
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 || []
-
})
},
changeSel(val) {
@@ -130,6 +131,7 @@
if(index == -1){
item.materialId = item.id
item.multifile = null
+ item.createDate = null
this.list.push(item)
}
})
--
Gitblit v1.9.3