From cc6ef0ce4ccb7d3979f879473ef57c319fd944ba Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 21 Aug 2025 09:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E6=8A=A5=E4=BB=B7=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B8=A6=E5=85=A5=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/foodManage/supplierManage.js | 9 ++ .../supplierQuotation/edit.vue | 16 ++- .../supplierManage/supplierList/index.vue | 120 +++++++++++------- 3 files changed, 91 insertions(+), 54 deletions(-) diff --git a/src/api/foodManage/supplierManage.js b/src/api/foodManage/supplierManage.js index 88515cbf..8ed835da 100644 --- a/src/api/foodManage/supplierManage.js +++ b/src/api/foodManage/supplierManage.js @@ -1,5 +1,14 @@ import request from '@/utils/request' +// 查询用户列表-全量查询 +export function listUserAll(query) { + return request({ + url: '/system/user/list_all', + method: 'get', + params: query + }) +} + // 分页查询 列表 export function supplierPageApi(data) { return request({ diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue index 90629958..5070e92b 100644 --- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue +++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue @@ -48,23 +48,25 @@ {{ baseInfo.inquiryNotes }} - - + --> - - + + {{ baseInfo.supplierName }} + @@ -350,7 +352,7 @@ export default { delMaterial(){ this.batchIds.forEach(ID=>{ let index = this.materialList.findIndex(v=>v.materialId==ID) - if(index>-1){ + if(index>-1){ this.materialList.splice(index,1) } }) @@ -369,7 +371,6 @@ export default { }else{ this.$modal.msgError("请先选择区域"); } - }, /** 搜索按钮操作 */ handleQuery() { @@ -426,6 +427,7 @@ export default { let param = Object.assign({},this.baseInfo); param.arrivalTime = this.formatDateTime(this.baseInfo.arrivalTime) param.detailList = [] + console.log(param.arrivalTime) if(param.arrivalTime.includes('1970')){ this.$modal.msgError("请选择交货时间！"); return; diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue index 2ff05862..34dcc4c8 100644 --- a/src/views/foodManage/supplierManage/supplierList/index.vue +++ b/src/views/foodManage/supplierManage/supplierList/index.vue @@ -72,39 +72,39 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + @@ -591,7 +603,7 @@ --> - +
@@ -618,8 +630,7 @@ import { systemAreaTreeApi } from "@/api/base/stall"; import { systemMaterialTreeApi } from "@/api/dish/material"; import { imgUpLoadTwo } from '@/api/system/upload' -import { supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage"; - +import { listUserAll,supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage"; export default { name: "", dicts: [], @@ -675,6 +686,9 @@ export default { categoryIdList: [ { required: true, message: "主要供应类别不能为空", trigger: "change" } ], + supplierUserId: [ + { required: true, message: "供应商用户不能为空", trigger: "change" } + ], telephone: [ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, @@ -749,6 +763,7 @@ export default { attachmentList:[], dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 + supplierUserList:[], }; }, computed: { @@ -767,6 +782,7 @@ export default { this.getTypeTreeData(); this.getTreeData(); this.getList(); + this.getSupplierUserList(); }, methods: { @@ -783,6 +799,15 @@ export default { this.treeOptions = response.data; }); }, + getSupplierUserList(){ + let param = { + deptId:225 + } + listUserAll(param).then((response) => { + this.supplierUserList = response.rows + // this.total = response.total + }) + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -878,6 +903,7 @@ export default { arr.push(item.categoryId) }) this.$set(this.form,"categoryIdList",arr) + this.$set(this.form,"supplierUserId",Number(row.supplierUserId)) this.open = true; this.title = "修改"; },