diff --git a/src/api/storeManage.js b/src/api/storeManage.js index 91773dc..f5f0fb2 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -945,6 +945,13 @@ export function editStateStoreConversion(params) { }); } +export function editStateStoreConversions(params) { + return service({ + url: "/api" + "/demay/ssm/storeConversion/updateStatu2", + method: "post", + data: params + }); +} // 添加门店员工转店申请查询 export function storeConversionPage(params) { return service({ diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue index d7095b4..e2bf1b0 100644 --- a/src/pages/eashier/collectionList/collectionList.vue +++ b/src/pages/eashier/collectionList/collectionList.vue @@ -1166,7 +1166,9 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: (action) => { + + }, }); } }); diff --git a/src/pages/storeManage/baseProject/baseProject.vue b/src/pages/storeManage/baseProject/baseProject.vue index 48f8ce2..79da4a2 100644 --- a/src/pages/storeManage/baseProject/baseProject.vue +++ b/src/pages/storeManage/baseProject/baseProject.vue @@ -3,150 +3,488 @@
- 添加 + 添加 - 引入项目 + 引入项目
- + - 条件搜索 - 刷新 - 下载模板 - 导入 + 条件搜索 + 刷新 + 下载模板 + 导入 导出
- - + +
- - - + + + - - + + - - - + + + - - - + + + - - + + - + - + - + - + - - - - - + + + + + - + - + - + - - - - - + + + + + - + - + - +
- +
编码:{{ wageForm.projectNum }} 名称: {{ wageForm.projectName }}
输入值大于1为固定金额 , 输入值小于等于1为百分比 - +
@@ -160,47 +498,111 @@ @@ -208,59 +610,134 @@
销售（次）现付 {{ wageForm.salesAchievement }} - + {{ wageForm.achievementLarge }} - + - {{ wageForm.achievementZhonggong }} - + {{ + wageForm.achievementZhonggong + }} + - {{ wageForm.achievementTechnician }} - + {{ + wageForm.achievementTechnician + }} + {{ wageForm.achievementSmall }} - +
卡付 - {{ wageForm.cardSalesAchievement }} - + {{ + wageForm.cardSalesAchievement + }} + - {{ wageForm.cardAchievementLarge }} - + {{ + wageForm.cardAchievementLarge + }} + - {{ wageForm.cardAchievementZhonggong }} - + {{ + wageForm.cardAchievementZhonggong + }} + - {{ wageForm.cardAchievementTechnician }} - + {{ + wageForm.cardAchievementTechnician + }} + - {{ wageForm.cardAchievementSmall }} - + {{ + wageForm.cardAchievementSmall + }} +
现付 {{ wageForm.salesCommission }} - + {{ wageForm.commissionLarge }} - + {{ wageForm.commissionZhonggong }} - + - {{ wageForm.commissionTechnician }} - + {{ + wageForm.commissionTechnician + }} + {{ wageForm.commissionSmall }} - +
卡付 {{ wageForm.cardSalesCommission }} - + {{ wageForm.cardCommissionLarge }} - + - {{ wageForm.cardCommissionZhonggong }} - + {{ + wageForm.cardCommissionZhonggong + }} + - {{ wageForm.cardCommissionTechnician }} - + {{ + wageForm.cardCommissionTechnician + }} + {{ wageForm.cardCommissionSmall }} - +
+
- 编辑 - 复制 - 分派 + 编辑 + 复制 + 分派
- 取 消 - 确 定 + 取 消 + 确 定
@@ -268,105 +745,265 @@
- +
- +
- +
- +
- - 精准标识 - - 模糊标识 + + 精准标识 + + 模糊标识
- - 启用中 - - 已停用 + + 启用中 + + 已停用
- 直接消费 + 直接消费 - 非直接消费 + 非直接消费 - 取 消 - 确 定 + 取 消 + 确 定 - + - 以下导入的项目类别的 编码 或者 名称 存在重复 , - 请检查修改后重新导入 + 以下导入的项目类别的 编码 或者 名称 存在重复 , + 请检查修改后重新导入 - - + + - - + + - - + + - + - + - + - + - + - 关 闭 + 关 闭 - + @@ -388,7 +1025,7 @@ import { setAchiComm, proExport, proImport, - proDownload, + proDownload } from "@/api/storeManage.js"; import allot from "./components/allot.vue"; export default { @@ -399,7 +1036,7 @@ export default { edit, project, selectpro, - allot, + allot }, data() { return { @@ -417,7 +1054,7 @@ export default { //查询对象 projectNature: 0, parentId: "", - export: 0, + export: 0 }, infoList: [], sessionStorageData: {}, //门店参数集合 @@ -428,12 +1065,12 @@ export default { projectTypeName: null, projectNum: null, directConsumption: null, - export: 0, + export: 0 }, total: 0, //分页总条数 // 总条数 pageInfo: { total: 0, //分页总条数 - tableList: [], + tableList: [] }, list: [], //主数组 projectTypeId: "", @@ -442,10 +1079,14 @@ export default { searchTrue: false, //搜索判断 infoDialog: false, //上传文件弹窗开关 radioRow: {}, + format: "YYYY-MM-DD hh:mm:ss" }; }, methods: { //列表数组双击方法 + editData() { + this.getData(); + }, rowdbClick(row) { console.log(row); this.$refs.edit.show(row, "明细"); @@ -478,7 +1119,7 @@ export default { }, //下载模板方法 download() { - proDownload().then((res) => { + proDownload().then(res => { let blob = new Blob([res]); console.log(blob); var a = document.createElement("a"); @@ -496,7 +1137,7 @@ export default { if (this.searchForm.projectTypeName == "") { delete this.searchForm.projectTypeName; } - proExport(this.searchForm).then((res) => { + proExport(this.searchForm).then(res => { let blob = new Blob([res]); var a = document.createElement("a"); var url = window.URL.createObjectURL(blob); @@ -516,18 +1157,18 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } else { fileData.append("multipartFile", v); - proImport(fileData).then((res) => { + proImport(fileData).then(res => { if (res.rows != undefined) { this.infoList = res.rows; this.infoErrorDialog = true; } else { if (res.code == "000000") { this.$message.success({ - message: res.message, + message: res.message }); this.getData(); } else { @@ -536,7 +1177,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } } @@ -570,9 +1211,9 @@ export default { search() { //条件搜索 - propage(this.searchForm).then((res) => { + propage(this.searchForm).then(res => { if (res.code == "000000") { - res.pageInfo.list.forEach((item) => { + res.pageInfo.list.forEach(item => { this.searchTrue = true; if (item.storeId == sessionStorage.getItem("parentId")) { item.headOffice = true; @@ -584,11 +1225,11 @@ export default { this.pageInfo = res.pageInfo; if (res.pageInfo.total == 0) { this.$message.warning({ - message: "没有找到相对应的项目", + message: "没有找到相对应的项目" }); } else { this.$message.success({ - message: "已显示符合条件全部数据", + message: "已显示符合条件全部数据" }); } } else { @@ -597,7 +1238,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -610,17 +1251,17 @@ export default { cancelButtonText: "取消", type: "warning", cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", + confirmButtonClass: "confirmbtnFalses" }) .then(() => { var id = { - id: row.id, + id: row.id }; - delpro(id).then((res) => { + delpro(id).then(res => { if (res.code == "000000") { this.$message.success({ - message: "删除成功!", - }); + message: "删除成功!" + });getData if (this.pageInfo.total % this.pageSize == 1) { this.pageNum = this.pageNum - 1; } @@ -632,7 +1273,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } else { this.$alert(res.message, "提示", { @@ -640,7 +1281,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } } @@ -648,100 +1289,115 @@ export default { }) .catch(() => { this.$message.info({ - message: "已取消操作！", + message: "已取消操作！" }); }); }, //状态 0 1 state(row) { - var id = { - id: row.id, - state: row.state, - }; - if (row.state == 0) { - this.$confirm("停用项目, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - }) - .then(() => { - proStates(id).then((res) => { - if (res.code == "000000") { - this.getData(); - row.state = 0; - this.$message({ - type: "success", - message: "项目已停用", - }); - } else { - this.$alert(res.message, "提示", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - center: true, - callback: (action) => {}, - }); - } - }); - }) - .catch(() => { - row.state = 1; - this.$message({ - type: "info", - message: "取消停用!", - }); - }); + if (row.unifiedDue < this.format) { + this.$alert( + "过期时间小于当前时间，请修改过期时间，再进行启用操作", + "提示", + { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: action => {} + } + ); + row.state = 0; } else { - this.$confirm("启用项目, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - }) - .then(() => { - proStates(id).then((res) => { - if (res.code == "000000") { - this.getData(); - row.state = 1; - this.$message({ - type: "success", - message: "启用成功!", - }); - } else { - this.getData(); - row.state = 0; - this.$alert(res.message, "提示", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - center: true, - callback: (action) => {}, - }); - } + var id = { + id: row.id, + state: row.state + }; + if (row.state == 0) { + this.$confirm("停用项目, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + cancelButtonClass: "cancelbtnFalses", + confirmButtonClass: "confirmbtnFalses", + type: "warning" + }) + .then(() => { + proStates(id).then(res => { + if (res.code == "000000") { + this.getData(); + row.state = 0; + this.$message({ + type: "success", + message: "项目已停用" + }); + } else { + this.$alert(res.message, "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: action => {} + }); + } + }); + }) + .catch(() => { + row.state = 1; + this.$message({ + type: "info", + message: "取消停用!" + }); }); + } else { + this.$confirm("启用项目, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + cancelButtonClass: "cancelbtnFalses", + confirmButtonClass: "confirmbtnFalses", + type: "warning" }) - .catch(() => { - row.state = 0; - this.$message({ - type: "info", - message: "取消启用", + .then(() => { + proStates(id).then(res => { + if (res.code == "000000") { + this.getData(); + row.state = 1; + this.$message({ + type: "success", + message: "启用成功!" + }); + } else { + this.getData(); + row.state = 0; + this.$alert(res.message, "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: action => {} + }); + } + }); + }) + .catch(() => { + row.state = 0; + this.$message({ + type: "info", + message: "取消启用" + }); }); - }); + } } }, wageButton(row) { this.wageForm = { - ...row, + ...row }; }, edits() { this.editShow = false; this.editShow = true; this.$message.success({ - message: "你现在可以在表格内直接编辑,点击确定自动保存!", + message: "你现在可以在表格内直接编辑,点击确定自动保存!" }); }, openCopy() { @@ -772,7 +1428,7 @@ export default { salesAchievement: v.salesAchievement, cardSalesAchievement: v.cardSalesAchievement, salesCommission: v.salesCommission, - cardSalesCommission: v.cardSalesCommission, + cardSalesCommission: v.cardSalesCommission }; this.wageForm = Object.assign(this.wageForm, form); console.log(this.wageForm); @@ -785,10 +1441,10 @@ export default { delete this.wageForm.salesCommission; delete this.wageForm.cardSalesAchievement; } - setAchiComm(this.wageForm).then((res) => { + setAchiComm(this.wageForm).then(res => { if (res.code == "000000") { this.$message.success({ - message: res.message, + message: res.message }); this.wageDialogVisible = false; this.getData(); @@ -798,7 +1454,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -834,10 +1490,10 @@ export default { } } propage(this.queryForm) - .then((res) => { + .then(res => { if (res.code == "000000") { if (res.pageInfo.list != null) { - res.pageInfo.list.forEach((item) => { + res.pageInfo.list.forEach(item => { if (item.storeId == sessionStorage.getItem("parentId")) { item.headOffice = true; } else { @@ -847,11 +1503,47 @@ export default { if (this.refreshtext == true) { this.searchTrue = false; this.$message.success({ - message: "已刷新最新数据", + message: "已刷新最新数据" }); this.refreshtext = false; } + + var date = new Date(); + var obj = { + YYYY: date.getFullYear(), + MM: date.getMonth() + 1, + DD: date.getDate(), + hh: date.getHours(), + mm: date.getMinutes(), + ss: date.getSeconds() + }; + + // 定义改变后的格式 + for (var x in obj) { + // 遍历对象 x为key + if (obj[x] < 10) { + // 当获取的值小于10 加一个0在前面 + obj[x] = "0" + obj[x]; + } + this.format = this.format.replace([x], obj[x]); + // x 为键 replace[x]值，replace[x]替换成obj[x] + } + + console.log(this.format); + + res.pageInfo.list.forEach(item => { + if (item.unifiedDue < this.format) { + item.state = 0; + }else{ + item.state = 1; + } + }); + console.log( + "🚀 ~ file: chargeType.vue ~ line 730 ~ TypePage ~ res.pageInfo.tableList", + res.pageInfo.tableList + ); res.pageInfo.tableList = res.pageInfo.list; + this.pageInfo = res.pageInfo; } } else { @@ -860,21 +1552,21 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }) - .catch((err) => { + .catch(err => { //console.log(err); }); }, getType() { proTypeList() - .then((res) => { - res.rows.forEach((item) => { + .then(res => { + res.rows.forEach(item => { item.value = item.projectTypeNum + " - " + item.projectTypeName; }); - res.rows.forEach((item) => { + res.rows.forEach(item => { if (!item.parentId) { item.parentId = 0; } @@ -882,18 +1574,18 @@ export default { this.options = handleTree(res.rows, "id", "parentId", "children", 0); this.options.unshift({ projectTypeNum: "+", - projectTypeName: "显示全部", + projectTypeName: "显示全部" }); }) - .catch((err) => { + .catch(err => { //console.log(err); }); - }, + } }, created() { this.getType(); let list = JSON.parse(sessionStorage.getItem("list")); - list.forEach((item) => { + list.forEach(item => { if (item.id == 4005001) { this.getData(); } @@ -907,15 +1599,19 @@ export default { tableData() { var search = this.input.toString().toLowerCase(); //将用户输入的值变字符串并小写 if (search) { - return this.pageInfo.tableList.filter(function (dataNews) { - return Object.keys(dataNews).some(function (key) { - return String(dataNews[key]).toLowerCase().indexOf(search) > -1; + return this.pageInfo.tableList.filter(function(dataNews) { + return Object.keys(dataNews).some(function(key) { + return ( + String(dataNews[key]) + .toLowerCase() + .indexOf(search) > -1 + ); }); }); } return this.pageInfo.tableList; - }, - }, + } + } };