From 274894a41f857dac30877a5dee1c711a2a8049b6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 29 五月 2025 10:38:57 +0800
Subject: [PATCH] 自动填充功能修改
---
src/views/salesManagement/invoiceLedger/index.vue | 1 +
src/views/basicData/supplierManage/index.vue | 17 ++++++++++++++++-
src/views/salesManagement/receiptPayment/index.vue | 13 +++++++++++--
src/store/modules/user.js | 2 ++
src/views/basicData/customerFile/index.vue | 21 ++++++++++++++++++---
src/views/salesManagement/salesLedger/index.vue | 4 ++--
src/views/salesManagement/invoiceRegistration/index.vue | 2 +-
7 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 24e6871..4b8734c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -35,6 +35,7 @@
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(res => {
+ console.log('user',res)
const user = res.user
let avatar = user.avatar || ""
if (!isHttp(avatar)) {
@@ -49,6 +50,7 @@
this.id = user.userId
this.name = user.userName
this.avatar = avatar
+ this.nickName = user.nickName
resolve(res)
}).catch(error => {
reject(error)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 49ddc7b..01f5e84 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -64,13 +64,13 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="缁存姢浜猴細" prop="maintainer">
- <el-select v-model="form.maintainer" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="form.maintainer" placeholder="璇烽�夋嫨" clearable disabled>
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="缁存姢鏃堕棿锛�" prop="maintenanceTime">
+ <el-form-item label="缁存姢鏃堕棿锛�" prop="maintenanceTime" >
<el-date-picker
style="width: 100%"
v-model="form.maintenanceTime"
@@ -79,6 +79,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ disabled
/>
</el-form-item>
</el-col>
@@ -100,7 +101,9 @@
import {addCustomer, delCustomer, getCustomer, listCustomer, updateCustomer} from "@/api/basicData/customerFile.js";
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
+import useUserStore from "@/store/modules/user"
const { proxy } = getCurrentInstance()
+const userStore = useUserStore()
const tableColumn = ref([
{
@@ -213,6 +216,8 @@
const openForm = (type, row) => {
operationType.value = type
form.value = {}
+ form.value.maintainer = userStore.nickName
+ form.value.maintenanceTime = getCurrentDate();
userListNoPage().then(res => {
userList.value = res.data
})
@@ -299,9 +304,19 @@
proxy.$modal.msg("宸插彇娑�")
})
}
+
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+ const day = String(today.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+}
+
getList()
</script>
<style scoped lang="scss">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index ce4dac7..23d55c5 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -76,7 +76,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="缁存姢浜猴細" prop="maintainUserId">
- <el-select v-model="form.maintainUserId" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="form.maintainUserId" placeholder="璇烽�夋嫨" clearable disabled>
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
@@ -91,6 +91,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ disabled
/>
</el-form-item>
</el-col>
@@ -113,7 +114,9 @@
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import {addSupplier,getSupplier,listSupplier,updateSupplier} from "@/api/basicData/supplierManageFile.js";
+import useUserStore from "@/store/modules/user"
const { proxy } = getCurrentInstance()
+const userStore = useUserStore()
const tableColumn = ref([
{
@@ -239,6 +242,8 @@
const openForm = (type, row) => {
operationType.value = type
form.value = {}
+ form.value.maintainUserId = userStore.id
+ form.value.maintainTime = getCurrentDate();
userListNoPage().then(res => {
userList.value = res.data
})
@@ -325,6 +330,16 @@
proxy.$modal.msg("宸插彇娑�")
})
}
+
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+ const day = String(today.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+}
+
getList()
</script>
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 240286a..53ee516 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -310,6 +310,7 @@
};
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
+ console.log('file',file)
// 鏍℃鏂囦欢澶у皬
if (file.size > 1024 * 1024 * 10) {
proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 27c2be2..df97bfc 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -199,7 +199,7 @@
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
console.log('selection', selection)
- selectedRows.value = selection.filter(item => item.children !== undefined);
+ selectedRows.value = selection.filter(item => item.salesContractNo !== undefined);
}
const expandedRowKeys = ref([])
// 灞曞紑琛�
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index d894833..c37883b 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -73,7 +73,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏈鍥炴閲戦锛�" prop="receiptPaymentAmount">
- <el-input type="number" v-model="form.receiptPaymentAmount" placeholder="璇疯緭鍏�" :step="0.01" clearable/>
+ <el-input type="number" min="0" v-model="form.receiptPaymentAmount" placeholder="璇疯緭鍏�" :step="0.01" clearable/>
</el-form-item>
</el-col>
</el-row>
@@ -87,7 +87,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐧昏浜猴細" prop="registrant">
- <el-input v-model="form.registrant" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.registrant" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -125,6 +125,8 @@
bindInvoiceNoRegPage,
invoiceInfo
} from "../../../api/salesManagement/receiptPayment.js";
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
const selectedRows = ref([])
@@ -222,10 +224,17 @@
proxy.$modal.msgError("璇烽�夋嫨涓�鏉℃暟鎹�")
return
}
+ //
+ console.log('(selectedRows.value',selectedRows.value)
+ if(selectedRows.value[0].noReceiptAmount === 0){
+ proxy.$modal.msgError("寰呭洖娆鹃噾棰濅负0鍏�")
+ return
+ }
invoiceInfo({id: selectedRows.value[0].id}).then(res => {
form.value = {...res.data}
form.value.invoiceLedgerId = form.value.id
form.value.id = ''
+ form.value.registrant = userStore.nickName
})
dialogFormVisible.value = true
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3c2ff8e..78779b7 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -104,7 +104,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
- <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs">
+ <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs" disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
@@ -284,7 +284,6 @@
import { getToken } from "@/utils/auth"
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
-import {Search} from "@element-plus/icons-vue";
import {ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
import {userListNoPage} from "@/api/system/user.js";
@@ -537,6 +536,7 @@
customerList().then(res => {
customerOption.value = res
})
+ form.value.entryPerson = userStore.id
if (type === 'edit') {
currentId.value = row.id;
getSalesLedgerWithProducts({id: row.id, type: 1}).then(res => {
--
Gitblit v1.9.3