Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

This commit is contained in:
德仔
2021-02-22 19:49:36 +08:00
committed by Gitee
38 changed files with 3066 additions and 380 deletions

View File

@ -179,6 +179,16 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="外食热量统计" align="center" v-hasPermi="['custom:foodHeatStatistics:list']">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleClickHeatStatistics(scope.row)"
>详情
</el-button>
</template>
</el-table-column>
<el-table-column label="食谱计划" align="center" v-hasPermi="['recipes:recipesPlan:list']">
<template slot-scope="scope">
<el-button
@ -312,6 +322,8 @@
<contract-drawer ref="cusContractDrawerRef"></contract-drawer>
<!-- 健康评估弹窗 -->
<physical-signs-dialog ref="physicalSignsDialogRef" />
<!-- 外食热量统计 -->
<heatStatisticsDrawer ref="heatStatisticsRef"></heatStatisticsDrawer>
<!-- 食谱计划抽屉 -->
</div>
</template>
@ -333,13 +345,15 @@ import { getOptions } from "@/api/custom/order";
import OrderDrawer from "@/components/OrderDrawer";
import PhysicalSignsDialog from "@/components/PhysicalSignsDialog";
import ContractDrawer from "@/components/ContractDrawer";
import HeatStatisticsDrawer from "@/components/HeatStatisticsDrawer";
export default {
name: "Customer",
components: {
"order-drawer": OrderDrawer,
"physical-signs-dialog": PhysicalSignsDialog,
"contract-drawer": ContractDrawer
"contract-drawer": ContractDrawer,
"heatStatisticsDrawer": HeatStatisticsDrawer
},
data() {
const userId = store.getters && store.getters.userId;
@ -490,6 +504,9 @@ export default {
handleOnMenuClick(row) {
// console.log(row);
},
handleClickHeatStatistics(row){
this.$refs["heatStatisticsRef"].showDrawer(row);
},
// 取消按钮
cancel() {
this.open = false;

View File

@ -9,7 +9,7 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="销售" prop="userId">
<el-form-item label="销售" prop="userId" label-width="68px">
<el-select v-model="queryParams.userId" placeholder="请选择销售" filterable clearable>
<el-option
v-for="dict in preSaleIdOptions"
@ -19,7 +19,17 @@
/>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item label="进粉渠道" prop="accountId" label-width="88px">
<el-select v-model="queryParams.accountId" filterable placeholder="请选择渠道" clearable>
<el-option
v-for="dict in accountIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
<el-form-item style="margin-left: 20px">
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
@ -128,7 +138,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="销售" prop="userId">
<el-select v-model="form.userId" placeholder="请选择销售" filterable clearable size="small" @change="getWxByUserId">
<el-select v-model="form.userId" placeholder="请选择销售" filterable clearable size="small">
<el-option
v-for="dict in preSaleIdOptions"
:key="dict.dictValue"
@ -218,7 +228,8 @@
pageNum: 1,
pageSize: 10,
fanTime: nowDate,
userId: null
userId: null,
accountId: null
},
// 表单参数
form: {},
@ -232,6 +243,8 @@
wxList:[],
//销售列表
preSaleIdOptions:[],
//进粉渠道列表
accountIdOptions:[],
editOpen: false,
editForm:{},
// 表单校验
@ -244,6 +257,9 @@
created() {
this.getList();
this.getSaleUserList();
this.getDicts("fan_channel").then((response) => {
this.accountIdOptions = response.data;
});
},
methods: {
/** 查询进粉统计列表 */
@ -354,6 +370,7 @@
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.reset();
this.getList();
}
});
@ -444,6 +461,12 @@
}
});
},
},
watch: {
// 监听用户ID变化
"form.userId": function (newVal, oldVal) {
this.getWxByUserId(newVal);
},
}
};
</script>

View File

@ -0,0 +1,21 @@
<template>
<div>
</div>
</template>
<script>
export default {
name: "index",
data() {
},
methods: {
},
watch: {
}
};
</script>

View File

@ -0,0 +1,322 @@
<template>
<section>
<div style="padding: 5px; text-align: center">
<img :src="logo" style="width: 150px; height: 35px" alt="logo" />
</div>
<!--<div style="margin: 10px 15px 10px 15px;" >
<el-steps :active="stepActive" finish-status="success">
<el-step v-for="(item,index) in stepArray" title=""></el-step>
</el-steps>
</div>-->
<el-form ref="form" label-position="top" :model="form" :rules="rules" label-width="100px" style="padding: 16px">
<div>
<h3>个人信息</h3>
<!--<div><span>{{form.name}}</span></div>-->
</div>
<el-form-item :label="'姓名:'+customer.name" prop="name">
<!--<el-input v-model="customer.name" :readonly="true" placeholder="请输入真实姓名" maxlength="20"/>-->
</el-form-item>
<el-form-item :label="'手机号:'+customer.phone" prop="phone" style="margin-top: -15px">
<!--<el-input v-model="customer.name" :readonly="true" placeholder="请输入真实姓名" maxlength="20"/>-->
</el-form-item>
<div>
<h3>外食计算</h3>
</div>
<el-row>
<el-button v-for="(item,index) in modular" type="primary" plain @click="modularChange(index)">{{item}}</el-button>
</el-row>
<div style="margin-top: 40px">
<h3>{{currentTitle}}</h3>
</div>
<div v-show="currentShow == 0">
<el-form-item label="已添加的食材" prop="name">
<el-tag style="margin-left: 5px" v-for="tag in ingredientTagArray" :key="tag" closable :disable-transitions="false" @close="handleClose(tag)">
{{tag}}
</el-tag>
</el-form-item>
<div>
<el-form-item label="日期" prop="edibleDate">
<el-date-picker
v-model="form.edibleDate"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="食材名称" prop="ingredient">
<el-input v-model="form.ingredient" placeholder="请输入食材名称" maxlength="20"/>
</el-form-item>
<el-form-item label="通俗计量" prop="numberUnit">
<el-input v-model="form.number" style="width: 48%" placeholder="请输入食材数量" maxlength="10"/>
<el-select v-model="form.unit" placeholder="请选择单位" style="margin-left:5px;width: 50%" filterable clearable>
<el-option
v-for="dict in cusUnitOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
<el-form-item label="重量(克)" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入食材重量(整数)" maxlength="10"/>
</el-form-item>
</div>
<el-form-item style="text-align: center; margin: 40px auto" >
<el-button type="primary" @click="continueAdd()" >继续添加</el-button>
<el-button type="success" @click="submit()" >提交数据</el-button>
</el-form-item>
</div>
</el-form>
</section>
</template>
<script>
import { getDictData,getCustomerBaseMessage,addFoodHeatStatistics } from "@/api/custom/customerInvestigation";
import dayjs from "dayjs";
const nowDate = dayjs().format("YYYY-MM-DD");
const logo = require("@/assets/logo/st_logo.png");
export default {
name: "index",
data() {
const checkNumberUnit = (rule, value, callback) => {
if (this.form.number) {
if(!/^[1-9]\d*$/.test(value)){
return callback(new Error("通俗计量的数量格式错误"));
}
if(!this.form.unit){
return callback(new Error("请选择通俗计量单位"));
}
}
callback();
};
return {
modular:["食材提交"],
currentShow: -1,
currentTitle: "",
logo,
timer: null,
customerExistFlag: false,
submitFlag: false,
customer:{
customerEncId: null,
name: null,
phone: null
},
form: {
edibleDate: nowDate,
ingredient: null,
number: null,
unit: null,
quantity: null,
},
rules: {
ingredient: [{ required: true, trigger: "blur", message: "请输入食材名称" }],
edibleDate: [{ required: true, trigger: "blur", message: "请选择日期" }]
},
ingredientTagArray:[
],
ingredientArray: [
],
//通俗计量单位
cusUnitOptions:[],
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
};
},
components: {
},
methods: {
modularChange(index){
if(index != this.currentShow){
this.currentShow = index;
this.currentTitle = this.modular[index];
}else{
this.currentShow = -1;
this.currentTitle = "";
}
},
//根据用户ID获取用户基本信息手机号、姓名
getCustomerBase(id){
if(id == null || id == undefined){
return;
}
getCustomerBaseMessage(id).then((response) => {
if (response.code === 200) {
if(response.data){
this.customerExistFlag = true;
this.customer.name = response.data.name;
this.customer.phone = response.data.phone;
}
}
}).catch(function() {
console.log("error");
});
},
continueAdd(){
this.$refs.form.validate((valid) => {
if (valid) {
if(this.verify() && this.ingredientTagArray.indexOf(this.form.ingredient.trim()) == -1){
this.ingredientArray.push(this.form);
this.ingredientTagArray.push(this.form.ingredient);
this.reset();
}
} else {
this.$message({message: "食材数据未填写完整", type: "warning"});
}
});
},
verify(){
var reg = /^([1-9]\d*|[0]{1,1})$/;
if(this.form.number != null && this.form.number != ""){
if(!reg.test(this.form.number+"")){
this.$message({message: "通俗计量的数量格式错误", type: "warning"});
return false;
}
if(this.form.unit == null || this.form.unit == ""){
this.$message({message: "请选择通俗计量单位", type: "warning"});
return false;
}
}
if(this.form.quantity != null && this.form.quantity != "" && !reg.test(this.form.quantity)){
this.$message({message: "重量格式错误", type: "warning"});
return false;
}
if((this.form.number == null || this.form.number == "") && (this.form.quantity == null || this.form.quantity == "")){
this.$message({message: "通俗计量和重量不能都为空", type: "warning"});
return false;
}
return true;
},
reset(){
this.form = {
edibleDate: nowDate,
ingredient: null,
number: null,
unit: null,
quantity: null
}
},
againSumbit(){
this.submitFlag = false;
},
submit(){
if (this.submitFlag) {
this.$message({
message: "请勿频繁提交,一分钟后重试",
type: "warning",
});
return;
}
if(this.form.ingredient && this.ingredientTagArray.indexOf(this.form.ingredient.trim()) == -1){
if(!this.verify()){
return;
}
this.ingredientArray.push(this.form);
this.ingredientTagArray.push(this.form.ingredient);
this.reset();
}
if(this.ingredientArray.length == 0){
this.$message({message: "还未添加食材数据,无法提交", type: "warning"});
return;
}
this.timer = setTimeout(this.againSumbit,1000*60);
let submitObject = {};
submitObject.ingredientArray = JSON.stringify(this.ingredientArray);
submitObject.customerEncId = this.customer.customerEncId;
this.submitFlag = true;
addFoodHeatStatistics(submitObject).then((response) => {
this.$notify({title: "提交成功", message: "", type: "success"});
}).catch(function() {
console.log("error");
});
},
handleClose(tag) {
this.ingredientTagArray.splice(this.ingredientTagArray.indexOf(tag), 1);
let tagIndex = -1;
this.ingredientArray.forEach((item, index) => {
if(tag == item.ingredient){
tagIndex = index;
}
});
this.ingredientArray.splice(tagIndex, 1);
console.log( JSON.stringify(this.ingredientArray))
}
},
created() {
this.customer.customerEncId = this.$route.params.id;
this.getCustomerBase(this.customer.customerEncId);
getDictData("cus_cus_unit").then(response => {
this.cusUnitOptions = response.data;
});
},
beforeCreate() {
document.title = this.$route.meta.title;
},
};
</script>
<style scoped>
.el-form-item {
margin-bottom: 8px;
}
.p_title_1{
font-size: 18px;
font-weight: bold;
margin-top: 30px;
}
.p_title_2{
font-size: 16px;
font-weight: bold;
margin-top: 30px;
}
.p_title_3{
font-size: 14px;
font-weight: bold;
margin-top: 30px;
}
.margin-left{
margin-left: 14px;
}
.el-input__inner{
width: 30%;
}
.margin-top-10{
margin-top: 10px;
}
.width-50-left-8-right-5{
width:50%;
margin-left: 8px;
margin-right: 5px;
}
.width-70-left-8-right-5{
width:70%;
margin-left: 8px;
margin-right: 5px;
}
.el-tag + .el-tag {
margin-left: 10px;
}
.button-new-tag {
margin-left: 10px;
height: 32px;
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
}
.input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
</style>