diff --git a/src/api/foodManage/purchaseManage.js b/src/api/foodManage/purchaseManage.js index 307ca375..1121f4d3 100644 --- a/src/api/foodManage/purchaseManage.js +++ b/src/api/foodManage/purchaseManage.js @@ -22,7 +22,7 @@ export function getMaterialListApi(data) { } export function fetchUsers(data) { return request({ - url: '/system/user/list', + url: '/smart-canteen/person_setting/getList', method: 'get', headers: { }, diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue index 8ced67b8..57858bc5 100644 --- a/src/views/foodManage/purchaseManage/contractList/edit.vue +++ b/src/views/foodManage/purchaseManage/contractList/edit.vue @@ -404,15 +404,15 @@ export default { let param = { pageNum:1, pageSize: 1000, - roleIds: 130, // 过滤角色 + roleId: 1 } fetchUsers(param).then((response) => { console.log(response); if (response.rows) { // 从接口返回的数据中提取用户选项 this.contractPersonOptions = response.rows.map(user => ({ - value: user.userId, // 下拉框绑定的值 - label: user.userName, // 下拉框显示的文本 + value: user.id, // 下拉框绑定的值 + label: user.name, // 下拉框显示的文本 })); } }); diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue index 55210698..a21765e8 100644 --- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue +++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue @@ -405,14 +405,14 @@ export default { let param = { pageNum:1, pageSize: 1000, - roleIds: 130, // 过滤角色 + roleId: 1 } fetchUsers(param).then((response) => { if (response.rows) { // 从接口返回的数据中提取用户选项 this.contractPersonOptions = response.rows.map(user => ({ - value: user.userId, // 下拉框绑定的值 - label: user.userName, // 下拉框显示的文本 + value: user.id, // 下拉框绑定的值 + label: user.name, // 下拉框显示的文本 })); } }); diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue index 43b7957b..55c0a576 100644 --- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue +++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue @@ -416,15 +416,15 @@ export default { let param = { pageNum:1, pageSize: 1000, - roleIds: 130, // 过滤角色 + roleId: 1 } fetchUsers(param).then((response) => { console.log(response); if (response.rows) { // 从接口返回的数据中提取用户选项 this.contractPersonOptions = response.rows.map(user => ({ - value: user.userId+'', // 下拉框绑定的值 - label: user.userName, // 下拉框显示的文本 + value: user.id, // 下拉框绑定的值 + label: user.name, // 下拉框显示的文本 })); } }); @@ -886,11 +886,11 @@ export default { row.qualifiedNum=0 }else{ row.qualifiedNum = row.qualifiedNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1') - } + } if(Number(row.deliveryNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){ if(Number(row.qualifiedNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){ - setTimeout(()=>{ - row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum) + setTimeout(()=>{ + row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum) },200) } } @@ -900,7 +900,7 @@ export default { // row.qualifiedNum = Number(row.deliveryNum) // } // },200) - // } + // } }, //日期 formatDate(date) { diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue index b9ba8cdf..095960c9 100644 --- a/src/views/foodManage/stockManage/depotManage/index.vue +++ b/src/views/foodManage/stockManage/depotManage/index.vue @@ -365,15 +365,15 @@ export default { let param = { pageNum:1, pageSize: 1000, - roleIds: 130, // 过滤角色 + roleId: 1 } fetchUsers(param).then((response) => { console.log(response); if (response.rows) { // 从接口返回的数据中提取用户选项 this.contractPersonOptions = response.rows.map(user => ({ - value: user.userId, // 下拉框绑定的值 - label: user.userName, // 下拉框显示的文本 + value: user.id, // 下拉框绑定的值 + label: user.name, // 下拉框显示的文本 })); } });