From cf18870ae5cf0ac31aa5495c092b43723f3f5c08 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Fri, 28 Mar 2025 17:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/template/批量新增原料模板.xlsx | Bin 0 -> 13032 bytes public/template/批量新增商品模板.xlsx | Bin 0 -> 12908 bytes src/api/dish/material.js | 39 ++++++++++++++- .../account/accountManager/index.vue | 4 +- .../butie/butieRecordsTab/index.vue | 2 +- src/views/base/area/index.vue | 8 +-- src/views/base/canteen/index.vue | 2 +- src/views/base/stall/index.vue | 10 ++-- src/views/device/doubleScreen/index.vue | 12 +++-- src/views/dish/material/index.vue | 33 +++++++----- src/views/dish/menu/detail.vue | 26 +++++++--- src/views/dish/menu/edit.vue | 47 +++++++++++------- src/views/dish/menu/index.vue | 4 +- src/views/dish/nutritionInfo/index.vue | 2 +- src/views/order/offlineManagement/index.vue | 12 ++--- src/views/order/reserveManagement/index.vue | 12 ++--- src/views/superstore/doubleScreen/index.vue | 2 +- src/views/superstore/shopMaterial/index.vue | 26 +++++++--- src/views/superstore/super/index.vue | 4 +- src/views/superstore/superOrder/index.vue | 2 +- src/views/superstore/superUitId/index.vue | 2 +- 21 files changed, 166 insertions(+), 83 deletions(-) create mode 100644 public/template/批量新增原料模板.xlsx create mode 100644 public/template/批量新增商品模板.xlsx diff --git a/public/template/批量新增原料模板.xlsx b/public/template/批量新增原料模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2fb67d84e5345d843a41c3d7adf3eb35849c45b8 GIT binary patch literal 13032 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 JpZ>A;{{b^`kw^dl literal 0 HcmV?d00001 diff --git a/public/template/批量新增商品模板.xlsx b/public/template/批量新增商品模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..79d4b53d010681c9e8e319c301c1fc179658efe6 GIT binary patch literal 12908 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 + placeholder="请输入最小金额" style="width: 240px" clearable @input="(v)=>(queryParams.walletMinAmount=v.replace(/[^\d.]/g,''))"> + placeholder="请输入最大金额" style="width: 240px" clearable @input="(v)=>(queryParams.walletMaxAmount=v.replace(/[^\d.]/g,''))"> diff --git a/src/views/accountCenter/butie/butieRecordsTab/index.vue b/src/views/accountCenter/butie/butieRecordsTab/index.vue index a6e42e37..33edf895 100644 --- a/src/views/accountCenter/butie/butieRecordsTab/index.vue +++ b/src/views/accountCenter/butie/butieRecordsTab/index.vue @@ -20,7 +20,7 @@ - + @@ -183,7 +183,7 @@ @@ -205,7 +205,7 @@ @@ -217,7 +217,7 @@ v-model="form.contactTel" type="text" @input="(v)=>(form.contactTel=v.replace(/[^\d]/g,''))" placeholder="请输入联系方式" - maxlength="11" + maxlength="11" clearable /> diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue index 2c551cca..5e57c428 100644 --- a/src/views/base/canteen/index.vue +++ b/src/views/base/canteen/index.vue @@ -4,7 +4,7 @@ diff --git a/src/views/base/stall/index.vue b/src/views/base/stall/index.vue index 0ff6b614..2d92dcc4 100644 --- a/src/views/base/stall/index.vue +++ b/src/views/base/stall/index.vue @@ -4,11 +4,11 @@ - + - + - + > --> diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue index 1d83d931..3bf8cead 100644 --- a/src/views/device/doubleScreen/index.vue +++ b/src/views/device/doubleScreen/index.vue @@ -539,8 +539,7 @@ ], stallId: [ { required: true, message: "所属档口不能为空", trigger: "blur" } - ], - + ] }, metadata:{ "voiceRemindSuccess": "1", @@ -573,7 +572,7 @@ openMenu:false, dialogMenuParams:{ keyWord:"早餐", - applyDate:new Date().toISOString().substr(0, 10) + applyDate:this.formatDate(new Date()) }, recipeId:"", menuData:[], @@ -820,6 +819,13 @@ }); }); }, + formatDate(date) { + // 格式化为 YYYY-MM-DD + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始 + const day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; + } } diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue index 3424d80e..31eb9ed4 100644 --- a/src/views/dish/material/index.vue +++ b/src/views/dish/material/index.vue @@ -144,7 +144,6 @@ 批量修改类别 - + - + + 模板下载 + + @@ -366,9 +365,10 @@ import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { systemMaterialTreeApi,addMaterialTypeApi,updateMaterialTypeApi,removeMaterialTypeApi,systemAreaTreeApi} from "@/api/dish/material"; -import { getMaterialListApi,addMaterialApi, updateMaterialApi, removeMaterialApi,batchRemoveMaterialApi,batchUpdateMaterialApi} from "@/api/dish/material"; +import { getMaterialListApi,addMaterialApi, updateMaterialApi, removeMaterialApi,batchRemoveMaterialApi,batchUpdateMaterialApi,downLoadExportTemplate} from "@/api/dish/material"; import MaterialDialog from './components/MaterialDialog.vue'; -import { getToken } from '@/utils/auth' +import { getToken } from '@/utils/auth'; +import { downloadFileByUrl } from '@/utils/download' export default { name: "Material", components: { @@ -728,6 +728,13 @@ export default { this.getList() }, + /** 下载模板操作 */ + importTemplate() { + let url = window.location.origin + '/glweb/template/批量新增原料模板.xlsx'; + console.log(url) + downloadFileByUrl(url) + }, + // getParentName(list, id) { // try { diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue index bb9ee24f..8c8dd74f 100644 --- a/src/views/dish/menu/detail.vue +++ b/src/views/dish/menu/detail.vue @@ -542,8 +542,8 @@ export default { var days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']; var dayOfWeek = start.getDay(); let obj = { - applyDate:start.toISOString().split('T')[0], - applyDateStr:start.toISOString().split('T')[0]+" "+days[dayOfWeek], + applyDate:this.formatDate(start), + applyDateStr:this.formatDate(start)+" "+days[dayOfWeek], detailList:[ { mealtimeType:"1", @@ -700,6 +700,11 @@ export default { item.isChecked = true; } }) + //判断是否为新菜品类型 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==obj.typeId) + if(typeIndex==-1){ + this.dishesTypeList.push({typeId:obj.typeId,typeName:obj.typeName}) + } }else{ this.dishesList.splice(index,1) //反显选中样式 @@ -708,11 +713,6 @@ export default { item.isChecked = null; } }) - } - //判断是否为新菜品类型 - let index2 = this.dishesTypeList.findIndex(v=>v.typeId==obj.typeId) - if(index2==-1){ - this.dishesTypeList.push({typeId:obj.typeId,typeName:obj.typeName}) } //选中类型 this.choseDishesType(obj) @@ -726,6 +726,12 @@ export default { this.dishesTableList.push(dish) } }) + if(this.dishesTableList.length==0){//单个菜品分类中无菜品时，删除该分类 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==item.typeId) + if(typeIndex>-1){ + this.dishesTypeList.splice(typeIndex,1) + } + } }, //弹窗右侧表格删除菜谱 handleDelDishes(item){ @@ -740,6 +746,12 @@ export default { dish.isChecked = null; } }) + if(this.dishesTableList.length==0){//单个菜品分类中无菜品时，删除该分类 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==item.typeId) + if(typeIndex>-1){ + this.dishesTypeList.splice(typeIndex,1) + } + } } }).catch(() => {}); }, diff --git a/src/views/dish/menu/edit.vue b/src/views/dish/menu/edit.vue index 9979b6a9..f43a776b 100644 --- a/src/views/dish/menu/edit.vue +++ b/src/views/dish/menu/edit.vue @@ -436,12 +436,10 @@ export default { //菜谱编辑 initEditDetail(){ console.log(this.baseInfo) - if(this.baseInfo.recipeType==1){//指定日期 - console.log(this.baseInfo.applyDateList) + if(this.baseInfo.recipeType==1){//指定日期 let length = this.baseInfo.applyDateList.length this.dateRange[0] = this.baseInfo.applyDateList[0] this.dateRange[1] = this.baseInfo.applyDateList[length-1] - console.log(this.dateRange) this.dateRangeList = this.getDateRange(this.dateRange[0],this.dateRange[1]) this.dateRangeRadio = this.dateRange[0]; this.detailList = this.dateRangeList[0].detailList; @@ -615,11 +613,14 @@ export default { this.effOptions = response.data.records; }); }, - //切换菜谱类型 + + //-------切换菜谱类型--------- changeRecipeType(e){ console.log(this.baseInfo.recipeType) - if(this.baseInfo.recipeType==1){//日期范围 + if(this.baseInfo.recipeType==1){//日期范围 + console.log(this.dateRange) this.dateRangeList = this.getDateRange(this.dateRange[0],this.dateRange[1]) + console.log(this.dateRangeList) this.dateRangeRadio = this.formatDate(this.dateRange[0]) this.detailList = this.dateRangeList[0].detailList } @@ -673,15 +674,15 @@ export default { //获取两日期间所有日期-构建每日菜谱数据 getDateRange(startDate, endDate) { let start = new Date(startDate); - let end = new Date(endDate); + let end = new Date(endDate) let dateArray = []; - while (start <= end) { + while (start <= end) { //周几 var days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']; var dayOfWeek = start.getDay(); let obj = { - applyDate:start.toISOString().split('T')[0], - applyDateStr:start.toISOString().split('T')[0]+" "+days[dayOfWeek], + applyDate:this.formatDate(start), + applyDateStr:this.formatDate(start)+" "+days[dayOfWeek], detailList:[ { mealtimeType:"1", @@ -827,7 +828,7 @@ export default { chosenDishes(obj){ //判断是否为新菜品类型 let index = this.dishesList.findIndex(v=>v.dishesId==obj.dishesId) - if(index==-1){ + if(index==-1){//新-加入 let dish = Object.assign({}, obj) this.$set(dish,'price',Number(dish.price/100)) this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) @@ -840,6 +841,11 @@ export default { item.isChecked = true; } }) + //判断是否为新菜品类型 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==obj.typeId) + if(typeIndex==-1){ + this.dishesTypeList.push({typeId:obj.typeId,typeName:obj.typeName}) + } }else{ this.dishesList.splice(index,1) //反显选中样式 @@ -848,18 +854,12 @@ export default { item.isChecked = null; } }) - } - //判断是否为新菜品类型 - let index2 = this.dishesTypeList.findIndex(v=>v.typeId==obj.typeId) - if(index2==-1){ - this.dishesTypeList.push({typeId:obj.typeId,typeName:obj.typeName}) } //选中类型 this.choseDishesType(obj) }, //选中菜品类型-更新右侧表格数据 - choseDishesType(item){ - console.log(item) + choseDishesType(item){ this.dishesType = item.typeId; this.dishesTableList = [] this.dishesList.forEach(dish=>{ @@ -867,7 +867,12 @@ export default { this.dishesTableList.push(dish) } }) - console.log(this.dishesTableList) + if(this.dishesTableList.length==0){//单个菜品分类中无菜品时，删除该分类 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==item.typeId) + if(typeIndex>-1){ + this.dishesTypeList.splice(typeIndex,1) + } + } }, //弹窗右侧表格删除菜谱 handleDelDishes(item){ @@ -882,6 +887,12 @@ export default { dish.isChecked = null; } }) + if(this.dishesTableList.length==0){//单个菜品分类中无菜品时，删除该分类 + let typeIndex = this.dishesTypeList.findIndex(v=>v.typeId==item.typeId) + if(typeIndex>-1){ + this.dishesTypeList.splice(typeIndex,1) + } + } } }).catch(() => {}); }, diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue index 0851d475..4ecb2930 100644 --- a/src/views/dish/menu/index.vue +++ b/src/views/dish/menu/index.vue @@ -27,7 +27,7 @@ - + - + diff --git a/src/views/order/offlineManagement/index.vue b/src/views/order/offlineManagement/index.vue index aa17b64e..945e5eb8 100644 --- a/src/views/order/offlineManagement/index.vue +++ b/src/views/order/offlineManagement/index.vue @@ -25,7 +25,7 @@ - + @@ -48,11 +48,11 @@ emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的 value:'id',label:'treeName' - }" clearable @change="handleAreaChange"> + }" clearable collapse-tags @change="handleAreaChange"> - + - + - + - + - + - + - + - + - + - + - + 批量修改类别 @@ -182,6 +178,13 @@ + + 模板下载 + + @@ -348,7 +351,8 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { systemMaterialTreeApi,addMaterialTypeApi,updateMaterialTypeApi,removeMaterialTypeApi,systemAreaTreeApi} from "@/api/superStore/shopMaterial"; import { getMaterialListApi,addMaterialApi, updateMaterialApi, removeMaterialApi,batchRemoveMaterialApi,batchUpdateMaterialApi} from "@/api/superStore/shopMaterial"; import MaterialDialog from './components/MaterialDialog.vue'; -import { getToken } from '@/utils/auth' +import { getToken } from '@/utils/auth'; +import { downloadFileByUrl } from '@/utils/download' export default { name: "Material", components: { @@ -438,7 +442,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: 'Bearer ' + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + '/smart-canteen/api/v1/menumaterial/batch/import/material', + url: process.env.VUE_APP_BASE_API + '/smart-canteen/api/v1/menumaterial/batch/import/material-product', }, }; }, @@ -707,6 +711,12 @@ export default { this.$modal.msgSuccess("后台导入中..."); this.getList() }, + /** 下载模板操作 */ + importTemplate() { + let url = window.location.origin + '/glweb/template/批量新增商品模板.xlsx'; + console.log(url) + downloadFileByUrl(url) + }, // getParentName(list, id) { diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue index 27f94b3f..1b59f6f8 100644 --- a/src/views/superstore/super/index.vue +++ b/src/views/superstore/super/index.vue @@ -4,11 +4,11 @@ - + - + + }" clearable collapse-tags>