Wangxubin 3 years ago
commit b98aaeee4f

@ -129,6 +129,21 @@ export function selectOne(params) {
data: params data: params
}); });
} }
export function selectPage(params) {
return service({
url: "/api" + "/demay/ssm/storeConversion/selectPage",
method: "post",
data: params
});
}
export function checkHumam(params) {
return service({
url: "/api" + "/demay/ssm/storeConversion/check",
method: "post",
data: params
});
}
// 员工月度任务 // 员工月度任务
export function monthJob(params) { export function monthJob(params) {
return service({ return service({
@ -945,6 +960,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) { export function storeConversionPage(params) {
return service({ return service({

@ -56,6 +56,11 @@ export default {
docType: "recharge_roll_course", docType: "recharge_roll_course",
docTypeName: "疗程转充值卡", docTypeName: "疗程转充值卡",
}, },
{
docType: "card_change",
docTypeName: "加价转疗程",
},
{ {
docType: "card_use", docType: "card_use",
docTypeName: "疗程开卡", docTypeName: "疗程开卡",
@ -64,6 +69,11 @@ export default {
docType: "store_cash", docType: "store_cash",
docTypeName: "收银", docTypeName: "收银",
}, },
{
docType: "store_room",
docTypeName: "前台收银",
},
{ {
docType: "card_repay", docType: "card_repay",
docTypeName: "还款", docTypeName: "还款",
@ -84,6 +94,10 @@ export default {
docType: "promotion", docType: "promotion",
docTypeName: "促销活动", docTypeName: "促销活动",
}, },
{
docType: "promotion_card_repay",
docTypeName: "促销还款",
},
], ],
form: {}, // form: {}, //
}; };
@ -113,6 +127,44 @@ export default {
} }
}); });
}); });
res.rows.forEach((item) => {
if (item.type == "card_repay") {
item.docTypeName = "还款";
}
if (item.type == "card_repay") {
if (item.orderType == "course") {
item.docTypeName = "疗程" + item.docTypeName;
}
if (item.orderType == "recharge") {
item.docTypeName = "充值" + item.docTypeName;
}
}
if (item.docType == "refund_cash_room") {
if (item.accountType == "refund_cash_unaudit_room") {
item.docTypeName = "房间退反审核";
}
if (item.accountType == "refund_cash_audit_room") {
item.docTypeName = "房间消费退";
}
}
if (item.docType == "recharge_Transition") {
if (item.accountType == "recharge_Transition_out") {
item.docTypeName = "充值卡内调转出";
}
if (item.accountType == "recharge_Transition_out_cancel") {
item.docTypeName = "充值内调作废";
}
if (item.accountType == "recharge_Transition_in") {
item.docTypeName = "充值卡内调转入";
}
if (item.accountType == "recharge_Transition_in_cancel") {
item.docTypeName = "充值内调作废";
}
if (item.accountType == "recharge_Transition_out_cancel") {
item.docTypeName = "充值转出反审核";
}
}
});
this.list = res.rows; this.list = res.rows;
} else { } else {
this.$alert(res.message, "提示", { this.$alert(res.message, "提示", {

@ -1166,7 +1166,9 @@ export default {
confirmButtonClass: "confirmbtnFalses", confirmButtonClass: "confirmbtnFalses",
type: "warning", type: "warning",
center: true, center: true,
callback: (action) => {}, callback: (action) => {
},
}); });
} }
}); });

@ -21,7 +21,7 @@
{{form.mobilePhone}} {{form.mobilePhone}}
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="补单日期:" v-if="form.additionDate"> <el-form-item label="补单日期:" v-if="form.additionDate&&form.isAddition==1">
<div class="form-width-xxs"> <div class="form-width-xxs">
{{form.additionDate}} {{form.additionDate}}
</div> </div>

File diff suppressed because it is too large Load Diff

@ -149,6 +149,7 @@ export default {
sessionStorageData: JSON.parse( sessionStorageData: JSON.parse(
sessionStorage.getItem("sessionStorageData") sessionStorage.getItem("sessionStorageData")
), ),
format: "YYYY-MM-DD hh:mm:ss",
rules: { rules: {
projectTypeName: { projectTypeName: {
required: true, required: true,
@ -391,6 +392,7 @@ export default {
if (res.code == "000000") { if (res.code == "000000") {
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.$emit("editData"); this.$emit("editData");
this.$message.success({ this.$message.success({
message: res.message, message: res.message,
}); });

@ -64,7 +64,7 @@
<el-cascader :disabled="title=='查看'" class="form-width" v-model="form.grade" :options="grade" :emitPath="false" :show-all-levels="false" @change="gradechange"></el-cascader> <el-cascader :disabled="title=='查看'" class="form-width" v-model="form.grade" :options="grade" :emitPath="false" :show-all-levels="false" @change="gradechange"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="工种"> <el-form-item label="工种">
<el-select :disabled="title=='查看'" v-model="form.wordTypeName" placeholder="请选择" @change="jobchange"> <el-select :disabled="title=='查看'" v-model="form.wordTypeName" placeholder="请选择" >
<el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id"> <el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
@ -420,17 +420,7 @@ export default {
} }
}, },
// //
jobchange(e) {
console.log(e);
this.jobList.forEach((item) => {
if (item.id == e) {
this.form.wordTypeNum = item.wordTypeNum;
this.form.wordTypeName = item.wordTypeName;
this.form.wordTypeId = item.id;
console.log(this.form);
}
});
},
// //
confirm() { confirm() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {

@ -24,7 +24,7 @@
<el-form-item label="工种"> <el-form-item label="工种">
<el-select :disabled="title=='修改'" v-model="form.wordTypeName" placeholder="请选择" @change="jobchange"> <el-select :disabled="title=='修改'" v-model="form.wordTypeName" placeholder="请选择" >
<el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id"> <el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
@ -60,8 +60,10 @@ import {
pageBasePost, pageBasePost,
pageBaseWorkType, pageBaseWorkType,
reinstated, reinstated,
staffStart staffStart,
editStateStoreConversion
} from "@/api/storeManage.js"; } from "@/api/storeManage.js";
export default { export default {
data() { data() {
return { return {
@ -260,6 +262,7 @@ export default {
this.title = title; this.title = title;
} }
this.dialogFormVisible = true; this.dialogFormVisible = true;
console.log(row)
this.getData(); this.getData();
}, },
// //
@ -317,7 +320,8 @@ export default {
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
}); });
}else{ }else if(this.type=="启用"){
staffStart({ id: this.rowForm.id, mobilePhone: this.rowForm.mobilePhone,brandNumber:this.form.brandNumber }).then( staffStart({ id: this.rowForm.id, mobilePhone: this.rowForm.mobilePhone,brandNumber:this.form.brandNumber }).then(
(res) => { (res) => {
console.log(res); console.log(res);
@ -338,6 +342,24 @@ export default {
} }
} }
); );
}else{
editStateStoreConversion({ ids: this.rowForm.ids, mobilePhone: this.rowForm.mobilePhone,brandNumber:this.form.brandNumber,statu:2 }).then((res) => {
if (res.code == "000000") {
this.$emit("editData");
this.dialogFormVisible = false;
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
});
// console.log("🚀 ~ file: editother.vue ~ line 362 ~ //editStateStoreConversion ~ this.rowForm", this.rowForm)
} }
}, },

@ -0,0 +1,148 @@
<template>
<el-dialog
:close-on-click-modal="false"
:title="title + '批量确认'"
:visible.sync="dialogFormVisible"
width="70vw"
v-dialogDrag
:before-close="handleClose"
>
<el-form
ref="from"
:model="from"
label-position="right"
label-width="100px"
>
<el-form-item>
<div
v-for="(item, index) in from.rows"
:key="index"
style="width: 48%;border: 1px solid #DCDFE6;border-radius: 20px;margin-left: 2%;padding: 10px;"
>
<el-form-item :prop="'rows.' + index + '.staffName'" label="员工姓名">
<el-input v-model="item.staffName" disabled />
</el-form-item>
<el-form-item :prop="'rows.' + index + '.staffNum'" label="员工编号">
<el-input v-model="item.staffNum" disabled />
</el-form-item>
<el-form-item :prop="'rows.' + index + '.brandNumber'" label="水牌号">
<el-input v-model="item.brandNumber" clearable />
</el-form-item>
<texts v-show="item.tag == 1" />
</div>
</el-form-item>
<el-form-item>
<div
style="width:100%;display:flex ;justify-content: center;align-items:center;"
>
<el-button
type="primary"
@click="inspect()"
style="margin-right: 60px;"
>检测</el-button
>
<el-button @click="confirm"></el-button>
</div>
</el-form-item>
</el-form>
</el-dialog>
</template>
<script>
import { checkHumam, editStateStoreConversions } from "@/api/storeManage.js";
import { re } from "semver";
import texts from "./text";
export default {
components: { texts },
data() {
return {
dialogFormVisible: false, //
title: "", //
from: {}, //
sessionStorageData: JSON.parse(
sessionStorage.getItem("sessionStorageData")
) //
};
},
methods: {
//
handleClose() {
this.form = {};
this.dialogFormVisible = false;
// this.$refs.form.clearValidate();
},
//
show(row) {
this.from = { ...row };
console.log(
"🚀 ~ file: editothers.vue ~ line 64 ~ show ~ this.from",
this.from.rows
);
this.dialogFormVisible = true;
},
//
inspect() {
console.log(
"🚀 ~ file: editothers.vue ~ line 87 ~ this.form.rows.forEach ~ this.form.rows",
this.from.rows
);
let arrayNum = [];
this.from.rows.forEach(item => {
let arr = {};
arr.id = item.id;
arr.brandNumber = item.brandNumber;
arrayNum.push(arr);
});
checkHumam(arrayNum).then(res => {
this.from.rows = res.rows;
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "success",
center: true,
callback: action => {}
});
});
},
//
confirm() {
let arrayNum = [];
this.from.rows.forEach(item => {
let arr = {};
arr.id = item.id;
arr.brandNumber = item.brandNumber;
arrayNum.push(arr);
});
editStateStoreConversions(arrayNum).then(res => {
if (res.code == "000000") {
this.$message.success({
message: res.message
});
this.$emit("editData");
this.dialogFormVisible = false;
} else {
this.from.rows = res.rows;
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "success",
center: true,
callback: action => {}
});
}
});
}
}
};
</script>
<style>
.el-form-item__content {
display: flex !important;
flex-wrap: wrap !important;
margin-left: 0px !important;
}
</style>

@ -0,0 +1,17 @@
<template>
<div style="color: red;margin-left: 45px;">*水牌号已存在请重新输入</div>
</template>
<script>
export default {
data() {
return {
}
},
};
</script>
<style>
</style>

@ -60,6 +60,8 @@
<el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
<edit ref="edit" @editData="getData"></edit> <edit ref="edit" @editData="getData"></edit>
<editother ref="editother" @editData="getData"></editother>
<editothers ref="editothers" @editData="getData"></editothers>
</div> </div>
</template> </template>
@ -67,12 +69,16 @@
import { import {
storeConversionPage, storeConversionPage,
editStateStoreConversionPage, editStateStoreConversionPage,
editStateStoreConversions,
selectOne,
selectPage
} from "@/api/storeManage.js"; } from "@/api/storeManage.js";
import edit from "./edit.vue"; import edit from "./edit.vue";
import { editStateStoreConversion } from "../../../../../api/storeManage"; import editother from "../editother.vue";
import editothers from "../editothers.vue";
export default { export default {
components: { edit }, components: { edit,editother,editothers },
data() { data() {
return { return {
dialogFormVisible: false, dialogFormVisible: false,
@ -108,8 +114,10 @@ export default {
this.selection = selection; this.selection = selection;
}, },
quer(row) { quer(row) {
console.log("🚀 ~ file: index.vue ~ line 114 ~ quer ~ row", row)
let list = [row.id]; let list = [row.id];
let form = { statu: 2, ids: list }; let form = { statu: 2, ids: list,mobilePhone:row.mobilePhone,brandNumber:row.brandNumber };
this.confirm(form); this.confirm(form);
}, },
quers() { quers() {
@ -117,13 +125,19 @@ export default {
this.selection.forEach((item) => { this.selection.forEach((item) => {
list.push(item.id); list.push(item.id);
}); });
let form = { statu: 2, ids: list }; let form = {ids: list };
this.confirm(form);
console.log("🚀 ~ file: index.vue ~ line 129 ~ quers ~ form", form)
this.confirms(form);
}, },
confirm(form) { confirm(row) {
editStateStoreConversion(form).then((res) => { var id = { id: row.id };
if (res.code == "000000") {
this.getData(); console.log("🚀 ~ file: index.vue ~ line 129 ~ confirm ~ row", row)
selectOne(id)
.then((res) => {
if ((res.code = "000000")) {
this.$refs.editother.show(row, "修改",'转门店');
} else { } else {
this.$alert(res.message, "提示", { this.$alert(res.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -133,8 +147,33 @@ export default {
callback: (action) => {}, callback: (action) => {},
}); });
} }
})
.catch((err) => {
//console.log(err);
}); });
}, },
confirms(row) {
selectPage(row)
.then((res) => {
if ((res.code = "000000")) {
this.$refs.editothers.show(res, "修改",'转门店');
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
})
.catch((err) => {
//console.log(err);
});
// this.$refs.editothers.show(row);
},
// //
handleSizeChange(val) { handleSizeChange(val) {
// console.log(` ${val} `); // console.log(` ${val} `);

@ -111,6 +111,7 @@ export default {
rowForm: {}, // rowForm: {}, //
title: "", // title: "", //
dialogFormVisible: false, // dialogFormVisible: false, //
}; };
}, },
methods: { methods: {

@ -717,15 +717,12 @@ export default {
this.format = this.format.replace([x], obj[x]); this.format = this.format.replace([x], obj[x]);
// x replace[x]replace[x]obj[x] // x replace[x]replace[x]obj[x]
} }
console.log(this.format); console.log(this.format);
res.pageInfo.list.forEach(item => { res.pageInfo.list.forEach(item => {
if (item.unifiedDue < this.format) { if (item.unifiedDue< this.format) {
item.state = 0; item.state = 0;
} }
}); });
res.pageInfo.tableList = res.pageInfo.list; res.pageInfo.tableList = res.pageInfo.list;
this.pageInfo = res.pageInfo; this.pageInfo = res.pageInfo;
}); });

Loading…
Cancel
Save