diff --git a/src/api/accountCenter/manager.js b/src/api/accountCenter/manager.js
index c1488bbc..b46d69bb 100644
--- a/src/api/accountCenter/manager.js
+++ b/src/api/accountCenter/manager.js
@@ -90,7 +90,7 @@ export function rechargeAccWalletApi(data) {
// 账户管理-个人钱包-离职时，清空金额
export function clearAccWalletApi(data) {
return request({
- url: '/smart-canteen/acc_info/acc/leave/clear',
+ url: '/smart-canteen/acc_info/leave/clear',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
diff --git a/src/views/accountCenter/account/accountManager/index.vue b/src/views/accountCenter/account/accountManager/index.vue
index 85f504fc..29c8b4e0 100644
--- a/src/views/accountCenter/account/accountManager/index.vue
+++ b/src/views/accountCenter/account/accountManager/index.vue
@@ -79,7 +79,17 @@
-
+
+
+
+
+
+
+
+ 正常
+ 停用
+
+
{{ (scope.row.accBalTotal/100).toFixed(2) }}
@@ -120,7 +130,7 @@
{{ (scope.row.minSubBalLimit/100).toFixed(2) }}
-
+
diff --git a/src/views/accountCenter/account/tradeRecords/index.vue b/src/views/accountCenter/account/tradeRecords/index.vue
index 463e640f..e7c12b33 100644
--- a/src/views/accountCenter/account/tradeRecords/index.vue
+++ b/src/views/accountCenter/account/tradeRecords/index.vue
@@ -80,9 +80,14 @@
-
+
-
+
+
+ 启用
+ 停用
+
+
-
+
{{ (scope.row.walletBal/100).toFixed(2) }}
-
+
{{ (scope.row.subsidyBal/100).toFixed(2) }}
-
+
{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}
@@ -86,11 +96,11 @@
{{ (scope.row.minSubBalLimit/100).toFixed(2) }}
-->
-
+
-
+
-
-
+
+
+
+
+
+
+
+ 正常
+ 停用
+
+
+
{{ (scope.row.accBalTotal/100).toFixed(2) }}
@@ -58,29 +68,29 @@
{{ (scope.row.accAvailableBal/100).toFixed(2) }}
-->
-
+
{{ (scope.row.walletBal/100).toFixed(2) }}
-
+
{{ (scope.row.subsidyBal/100).toFixed(2) }}
-
-
+
{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}
-
+
-
+
-
+
+
+
+
+
+
{{ (scope.row.amount/100).toFixed(2) }}
@@ -160,7 +165,12 @@
-
+
+
+
+
+
+
{{ (scope.row.amount/100).toFixed(2) }}
diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue
index 862b8d08..d897e205 100644
--- a/src/views/device/doubleScreen/index.vue
+++ b/src/views/device/doubleScreen/index.vue
@@ -464,7 +464,7 @@
"canteenId":this.queryParams.canteenId,
"stallId":this.queryParams.stallId,
"keyWord":this.queryParams.keyWord,
- // "deviceType":20
+ "deviceType":20
}
console.log("param",param)
// let str = base64.encode(JSON.stringify(param))
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 8aa3750d..6e30cf02 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -1303,7 +1303,7 @@
},
/** 查询列表 */
getList() {
- console.log(this.$refs.typeTree.getCheckedKeys())
+ // console.log(this.$refs.typeTree.getCheckedKeys())
this.loading = true;
let params= {
"pageSize": this.queryParams.pageSize,
@@ -1312,7 +1312,7 @@
"canteenId": this.queryParams.canteenId,
"shopstallId": this.queryParams.shopstallId,
"dishesName": this.queryParams.dishesName,
- // "typeIdList": this.$refs.typeTree.getCheckedKeys(),
+ "typeIdList": this.$refs.typeTree.getCheckedKeys(),
}
getMenuDishesListApi(params).then((response) => {
this.tableList = response.rows;
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index 8d3b6c48..78b4b637 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -23,7 +23,7 @@
:data="treeOptions"
:props="defaultProps"
:show-checkbox="true"
- :default-expand-all="false"
+ :default-expand-all="true"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="typeTree"
@@ -600,7 +600,7 @@ export default {
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
- // this.$refs.typeTree.setCheckedNodes([]);
+ this.$refs.typeTree.setCheckedNodes([]);
this.handleQuery();
},
/** 查询列表 */
@@ -678,7 +678,7 @@ export default {
},
handleSelectionChange(selection){
this.batchIds = []
- this.batchIds = selection.map((item) => item.materialId)
+ this.batchIds = selection.map((item) => item.id)
this.editForm.categoryNames = "";
this.editForm.categoryNames = selection.map((item) => item.materialName);
this.single = selection.length !== 1
@@ -687,7 +687,7 @@ export default {
// 批量删除
handleBatchDel(){
console.log(this.batchIds)
- batchRemoveMaterialApi(this.batchIds).then(response => {
+ removeMaterialApi({"ids":this.batchIds}).then(response => {
this.$modal.msgSuccess("删除成功");
this.$refs.multipleTable.clearSelection()
this.getList();
diff --git a/src/views/dish/nutritionInfo/index.vue b/src/views/dish/nutritionInfo/index.vue
index 5e3f97c9..36a69ebb 100644
--- a/src/views/dish/nutritionInfo/index.vue
+++ b/src/views/dish/nutritionInfo/index.vue
@@ -24,15 +24,15 @@
:data="cascaderOptions" :props="defaultProps"
:show-checkbox="true" :default-expand-all="true"
:expand-on-click-node="false" :filter-node-method="filterNode"
- ref="typeTree" node-key="id" highlight-current @node-click="handleNodeClick"
+ ref="nutritionTypeTree" node-key="id" highlight-current @node-click="handleNodeClick"
>
- {{
+ {{
node.label.slice(0, 10) + "..."
}}
{{ node.label }}
-
+
-
+
({
- value: item.id,
+ id: item.id,
label: item.bigType,
parentId:0,
level:1,
children: item.littleTypeList.map(subItem => ({
- value: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分
+ id: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分
label: subItem.bigType,
bigType: item.bigType,
parentId:item.id,
@@ -719,7 +719,7 @@ export default {
console.log(data)
if(data&&data.level==1){
this.typeForm={}
- this.typeForm.parentId = data.value;
+ this.typeForm.parentId = data.id;
this.typeForm.parentName = data.label;
}else{
this.typeForm={}
@@ -734,7 +734,7 @@ export default {
console.log(data)
this.typeForm={}
this.resetForm("typeForm");
- this.$set(this.typeForm,"id",data.value)
+ this.$set(this.typeForm,"id",data.id)
this.$set(this.typeForm,"name",data.label)
// this.typeForm = {
// ...data
@@ -758,7 +758,7 @@ export default {
.catch(() => {});
},
onMousemove(data) {
- this.isMousemoveId = data.value;
+ this.isMousemoveId = data.id;
},
onMouseleave() {
this.isMousemoveId = null;
@@ -799,9 +799,12 @@ export default {
this.queryParams.littleType = undefined;
}
},
- /** 查询岗位列表 */
+ /** 查询列表 */
getList() {
this.loading = true;
+ // console.log(this.$refs.nutritionTypeTree.getCheckedKeys())
+ let arr = this.$refs.nutritionTypeTree.getCheckedKeys()||[]
+ this.queryParams.categoryIds = arr;
console.log(this.queryParams)
listNutrition(this.queryParams).then(response => {
this.menuNutritionList = response.rows;
@@ -856,15 +859,16 @@ export default {
* @description 重置页码为1并获取列表数据
*/
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
- this.typeSelected = []; // 清空级联选择器的选中值
- this.queryParams.bigType = undefined;
- this.queryParams.littleType = undefined;
+ this.$refs.nutritionTypeTree.setCheckedNodes([]);
+ // this.typeSelected = []; // 清空级联选择器的选中值
+ // this.queryParams.bigType = undefined;
+ // this.queryParams.littleType = undefined;
this.handleQuery();
},
/** 新增按钮操作 */
@@ -883,6 +887,7 @@ export default {
getNutrition(data).then(response => {
this.form = response.data;
this.$set(this.form,"categoryId",Number(response.data.categoryId))
+ this.chosenType(this.form.categoryId)
this.open = true;
this.title = "修改营养信息";
});
@@ -891,7 +896,7 @@ export default {
getParentCategoryName(Id) {
const findNode = (nodes) => {
for (let node of nodes) {
- if (node.value === Id) {
+ if (node.id === Id) {
return node;
}
if (node.children) {
@@ -904,9 +909,11 @@ export default {
return findNode(this.cascaderOptions);
},
chosenType(e){
+ console.log(e)
let obj = this.getParentCategoryName(e)
this.form.bigType = obj.bigType
this.form.littleType = obj.label
+ console.log(this.form)
},
/** 提交按钮 */
submitForm: function() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 236b5852..f8f9344d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -467,7 +467,7 @@
-
+