From 6889f803219d9643b10cef47dbbea524e32ca514 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 7 Nov 2025 16:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canteen/base/mobile/complaint/index.vue | 13 +++++-
.../purchaseManage/contractList/edit.vue | 4 +-
.../purchaseManage/goodsInquiry/edit.vue | 2 +-
.../purchaseManage/goodsInquiry/index.vue | 15 +++++--
.../purchaseInspection/edit.vue | 2 +-
.../stockManage/depotManage/index.vue | 2 +-
.../supplierManage/supplierList/index.vue | 43 ++++++++++---------
src/views/ims/supplier_person/index.vue | 2 +-
.../wasteManage/wasteDetails/index.vue | 13 +++++-
.../wasteManage/wasteGarbage/index.vue | 13 +++++-
.../wasteManage/wasteSummary/index.vue | 13 +++++-
11 files changed, 84 insertions(+), 38 deletions(-)
diff --git a/src/views/canteen/base/mobile/complaint/index.vue b/src/views/canteen/base/mobile/complaint/index.vue
index 5fdbfb66..458289c1 100644
--- a/src/views/canteen/base/mobile/complaint/index.vue
+++ b/src/views/canteen/base/mobile/complaint/index.vue
@@ -174,7 +174,7 @@
content:null,
canteenId:null,
},
- dateRange:[],
+ dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -249,7 +249,7 @@
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange=[]
+ this.dateRange=this.defaultDateRange()
this.queryParams = {
pageNum: 1,
pageSize: 10,
@@ -328,6 +328,15 @@
this.dialogImageUrl = row.imgUrl;
this.dialogVisible = true;
},
+ defaultDateRange() {
+ const end = new Date(new Date().toLocaleDateString());
+ end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+ const start = new Date((new Date().toLocaleDateString()));
+ start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
+ this.start = parseInt(start.getTime() / 1000)
+ this.end = parseInt(end.getTime() / 1000)
+ return [start, end]
+ },
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index 84c05e55..a228549f 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -399,12 +399,12 @@ export default {
},
},
methods: {
- // 公用方法
+ // 公用方法
fetchUsers() {
let param = {
pageNum:1,
pageSize: 1000,
- roleId: 1
+ roleId: 3
}
fetchUsersApi(param).then((response) => {
console.log(response);
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
index 09649b6e..5e93e402 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
@@ -405,7 +405,7 @@ export default {
let param = {
pageNum:1,
pageSize: 1000,
- roleId: 1
+ roleId: 3
}
fetchUsersApi(param).then((response) => {
if (response.rows) {
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index 6c7b15d1..933c09bb 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
@@ -84,7 +84,7 @@
待提交
已决价
进行中
- 未决标
+ 未决标
已取消
@@ -200,7 +200,7 @@ export default {
},
treeAreaOptions:[],//区域树
wareHouseOptions:[],//仓库下拉选
- dateRange:[],
+ dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -270,7 +270,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange = []
+ this.dateRange = this.defaultDateRange()
this.queryParams = {
pageNum: 1,
pageSize: 10,
@@ -378,6 +378,15 @@ export default {
const day = String(date.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
},
+ defaultDateRange() {
+ const end = new Date(new Date().toLocaleDateString());
+ end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+ const start = new Date((new Date().toLocaleDateString()));
+ start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
+ this.start = parseInt(start.getTime() / 1000)
+ this.end = parseInt(end.getTime() / 1000)
+ return [start, end]
+ },
//日期时间
formatDateTime(date) {
// 格式化为 YYYY-MM-DD
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index 78cc50e2..2ce4faeb 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -416,7 +416,7 @@ export default {
let param = {
pageNum:1,
pageSize: 1000,
- roleId: 1
+ roleId: 3
}
fetchUsersApi(param).then((response) => {
console.log(response);
diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue
index cb0a5412..6c168877 100644
--- a/src/views/foodManage/stockManage/depotManage/index.vue
+++ b/src/views/foodManage/stockManage/depotManage/index.vue
@@ -363,7 +363,7 @@ export default {
let param = {
pageNum:1,
pageSize: 1000,
- roleId: 1
+ roleId: 2
}
fetchUsersApi(param).then((response) => {
console.log(response);
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 2bb767d1..5e31ab12 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -138,13 +138,12 @@
-
+
@@ -633,6 +632,7 @@ import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi } from "@/api/dish/material";
import { imgUpLoadTwo } from '@/api/system/upload'
import { listUserAll,supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage";
+import { fetchUsersApi } from "@/api/foodManage/purchaseManage";
export default {
name: "",
dicts: [],
@@ -780,13 +780,27 @@ export default {
}
},
created() {
+ this.fetchUsers();
this.getTypeTreeData();
this.getTreeData();
- this.getList();
- this.getSupplierUserList();
+ this.getList();
},
methods: {
+ // 供应商用户
+ fetchUsers() {
+ let param = {
+ pageNum:1,
+ pageSize: 1000,
+ roleId: 1
+ }
+ fetchUsersApi(param).then((response) => {
+ if (response.rows) {
+ // 从接口返回的数据中提取用户选项
+ this.supplierUserList = response.rows
+ }
+ });
+ },
//类型树
getTypeTreeData() {
let param = {}
@@ -799,19 +813,7 @@ export default {
systemAreaTreeApi({}).then((response) => {
this.treeOptions = response.data;
});
- },
- getSupplierUserList(){
- let param = {
- pageNum:1,
- pageSize:100,
- deptId:225,
- queryTyoe:2
- }
- listUserAll(param).then((response) => {
- this.supplierUserList = response.rows;
- // this.total = response.total
- })
- },
+ },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -920,7 +922,6 @@ export default {
},
// 表单重置
reset() {
- this.getSupplierUserList()
this.activeName='baseInfo'
this.fileList1=[]
this.idCardImgZ=[]
diff --git a/src/views/ims/supplier_person/index.vue b/src/views/ims/supplier_person/index.vue
index 14669d7c..052b334f 100644
--- a/src/views/ims/supplier_person/index.vue
+++ b/src/views/ims/supplier_person/index.vue
@@ -267,7 +267,7 @@ export default {
handleUpdate(row) {
console.log("row", row);
this.reset();
- getListApi(row.id).then(response => {
+ getListApi({id:row.id}).then(response => {
console.log("response",response);
this.form = response.rows[0];
if(response.rows[0].photoUrl){
diff --git a/src/views/kitchen/wasteManage/wasteDetails/index.vue b/src/views/kitchen/wasteManage/wasteDetails/index.vue
index 2fa58dcf..21ee91d1 100644
--- a/src/views/kitchen/wasteManage/wasteDetails/index.vue
+++ b/src/views/kitchen/wasteManage/wasteDetails/index.vue
@@ -99,7 +99,7 @@ export default {
pageSize: 10,
mealtimeType: undefined
},
- dateRange:[],
+ dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -142,7 +142,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange=[]
+ this.dateRange=this.defaultDateRange()
this.queryParams = {
pageNum: 1,
pageSize: 10,
@@ -176,6 +176,15 @@ export default {
this.dialogImageUrl = row.fileUrl;
this.dialogVisible = true;
},
+ defaultDateRange() {
+ const end = new Date(new Date().toLocaleDateString());
+ end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+ const start = new Date((new Date().toLocaleDateString()));
+ start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
+ this.start = parseInt(start.getTime() / 1000)
+ this.end = parseInt(end.getTime() / 1000)
+ return [start, end]
+ },
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD
diff --git a/src/views/kitchen/wasteManage/wasteGarbage/index.vue b/src/views/kitchen/wasteManage/wasteGarbage/index.vue
index b772ce40..2d2fadfe 100644
--- a/src/views/kitchen/wasteManage/wasteGarbage/index.vue
+++ b/src/views/kitchen/wasteManage/wasteGarbage/index.vue
@@ -278,7 +278,7 @@ export default {
pageSize: 10,
mealtimeType: undefined
},
- dateRange:[],
+ dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -391,7 +391,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange=[]
+ this.dateRange=this.defaultDateRange()
this.queryParams = {
pageNum: 1,
pageSize: 10,
@@ -563,6 +563,15 @@ export default {
this.dialogImageUrl = item;
this.dialogVisible = true;
},
+ defaultDateRange() {
+ const end = new Date(new Date().toLocaleDateString());
+ end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+ const start = new Date((new Date().toLocaleDateString()));
+ start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
+ this.start = parseInt(start.getTime() / 1000)
+ this.end = parseInt(end.getTime() / 1000)
+ return [start, end]
+ },
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD
diff --git a/src/views/kitchen/wasteManage/wasteSummary/index.vue b/src/views/kitchen/wasteManage/wasteSummary/index.vue
index c965a583..f59600b9 100644
--- a/src/views/kitchen/wasteManage/wasteSummary/index.vue
+++ b/src/views/kitchen/wasteManage/wasteSummary/index.vue
@@ -127,7 +127,7 @@ export default {
canteenName: undefined,
areaNameStr: undefined,
},
- dateRange:[],
+ dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -179,7 +179,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange=[]
+ this.dateRange=this.defaultDateRange()
this.queryParams = {
pageNum: 1,
pageSize: 10,
@@ -234,6 +234,15 @@ export default {
this.dialogImageUrl = row.fileUrl;
this.dialogVisible = true;
},
+ defaultDateRange() {
+ const end = new Date(new Date().toLocaleDateString());
+ end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+ const start = new Date((new Date().toLocaleDateString()));
+ start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000);
+ this.start = parseInt(start.getTime() / 1000)
+ this.end = parseInt(end.getTime() / 1000)
+ return [start, end]
+ },
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD