This commit is contained in:
曹辉 2023-04-10 10:27:03 +08:00
parent 8abaeab59a
commit 14a5c616a9
19 changed files with 174 additions and 449 deletions

View File

@ -383,7 +383,6 @@ export default {
if (response.data.goodAttributeDetailsLists) { if (response.data.goodAttributeDetailsLists) {
this.goodDetailsLists = response.data.goodAttributeDetailsLists; this.goodDetailsLists = response.data.goodAttributeDetailsLists;
} }
// console.log(this.form.parentIdList)
// this.form.goodsCategoryId = this.form.goodsCategoryName // this.form.goodsCategoryId = this.form.goodsCategoryName
// this.form.value = this.form.goodsCategoryId // this.form.value = this.form.goodsCategoryId
// this.form.label = this.form.goodsCategoryName // this.form.label = this.form.goodsCategoryName

View File

@ -718,7 +718,6 @@ export default {
this.form.nurseStationDepartmentList[0].nurseStationName; this.form.nurseStationDepartmentList[0].nurseStationName;
this.form.phone = this.form.nurseStationDepartmentList[0].phone; this.form.phone = this.form.nurseStationDepartmentList[0].phone;
} }
console.log(this.form);
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {

View File

@ -535,7 +535,6 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
console.log(row);
this.$modal this.$modal
.confirm("是否确认删除?") .confirm("是否确认删除?")
.then(function() { .then(function() {

View File

@ -25,19 +25,14 @@
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item label="所属区域" prop="areaCode"> <el-form-item label="所属区域" prop="areaCode">
<el-select <el-select v-model="queryParams.province" clearable placeholder="请选择省">
v-model="queryParams.province"
clearable
placeholder="请选择省"
>
<el-option <el-option
v-for="item in arealist" v-for="item in arealist"
:key="item.id" :key="item.id"
:label="item.areaName" :label="item.areaName"
:value="item.id" :value="item.id"
@click.native="province(item)" @click.native="province(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select
@ -52,8 +47,7 @@
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickcity(item)" @click.native="clickcity(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select
v-model="queryParams.area" v-model="queryParams.area"
@ -67,8 +61,7 @@
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickarea(item)" @click.native="clickarea(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select
v-model="queryParams.areaCode" v-model="queryParams.areaCode"
@ -82,15 +75,10 @@
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickstreet(item)" @click.native="clickstreet(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="社区名称" prop="communityName" style="margin-left: 20px">
label="社区名称"
prop="communityName"
style="margin-left: 20px"
>
<el-input <el-input
v-model="queryParams.communityName" v-model="queryParams.communityName"
placeholder="请输入社区名称" placeholder="请输入社区名称"
@ -100,16 +88,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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> </el-form-item>
</el-form> </el-form>
@ -122,8 +102,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:communityInfo:add']" v-hasPermi="['system:communityInfo:add']"
>新增</el-button >新增</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -134,8 +113,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:communityInfo:edit']" v-hasPermi="['system:communityInfo:edit']"
>修改</el-button >修改</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -146,8 +124,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:communityInfo:remove']" v-hasPermi="['system:communityInfo:remove']"
>删除</el-button >删除</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -157,13 +134,9 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:communityInfo:export']" v-hasPermi="['system:communityInfo:export']"
>导出</el-button >导出</el-button>
>
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table
@ -177,21 +150,9 @@
<el-table-column label="社区编码" align="center" prop="communityCode" />--> <el-table-column label="社区编码" align="center" prop="communityCode" />-->
<el-table-column label="所属区域" align="center" prop="area" width="300" /> <el-table-column label="所属区域" align="center" prop="area" width="300" />
<el-table-column label="社区名称" align="center" prop="communityName" /> <el-table-column label="社区名称" align="center" prop="communityName" />
<el-table-column <el-table-column label="社区经度" align="center" prop="communityLongitude" />
label="社区经度" <el-table-column label="社区纬度" align="center" prop="communityLatitude" />
align="center" <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
prop="communityLongitude"
/>
<el-table-column
label="社区纬度"
align="center"
prop="communityLatitude"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -199,16 +160,14 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:communityInfo:edit']" v-hasPermi="['system:communityInfo:edit']"
>修改</el-button >修改</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:communityInfo:remove']" v-hasPermi="['system:communityInfo:remove']"
>删除</el-button >删除</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -221,19 +180,8 @@
@pagination="liststationinfo" @pagination="liststationinfo"
/> />
<!-- 添加居住社区信息对话框 --> <!-- 添加居住社区信息对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open2" width="1060px" append-to-body>
:title="title" <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
:visible.sync="open2"
width="1060px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="80px"
:inline="true"
>
<div <div
v-for="(item, index) in form.communityInfoList" v-for="(item, index) in form.communityInfoList"
:key="index" :key="index"
@ -251,54 +199,35 @@
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="province2(item, index)" @click.native="province2(item, index)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="item.city" clearable placeholder="请选择市" style="margin-left: 10px">
v-model="item.city"
clearable
placeholder="请选择市"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in citylist" v-for="item in citylist"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickcity2(item, index)" @click.native="clickcity2(item, index)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="item.area" clearable placeholder="请选择区" style="margin-left: 10px">
v-model="item.area"
clearable
placeholder="请选择区"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in arealists" v-for="item in arealists"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickarea2(item, index)" @click.native="clickarea2(item, index)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="item.code" clearable placeholder="请选择街道" style="margin-left: 10px">
v-model="item.code"
clearable
placeholder="请选择街道"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in streetlist" v-for="item in streetlist"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickcode(item, index)" @click.native="clickcode(item, index)"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -306,11 +235,7 @@
:rules="rules.communityInfoList.communityName" :rules="rules.communityInfoList.communityName"
:prop="`communityInfoList.${index}.communityName`" :prop="`communityInfoList.${index}.communityName`"
> >
<el-input <el-input v-model="item.communityName" placeholder="请输入社区名称" maxlength="30" />
v-model="item.communityName"
placeholder="请输入社区名称"
maxlength="30"
/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="社区经度" label="社区经度"
@ -366,19 +291,8 @@
</el-dialog> </el-dialog>
<!-- 修改居住社区信息对话框 --> <!-- 修改居住社区信息对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open" width="1060px" append-to-body>
:title="title" <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
:visible.sync="open"
width="1060px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="80px"
:inline="true"
>
<!-- <el-form-item label="所属区域" prop="areaCode"> <!-- <el-form-item label="所属区域" prop="areaCode">
<el-input <el-input
v-model="form.areaName" v-model="form.areaName"
@ -394,54 +308,35 @@
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="province3(item)" @click.native="province3(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="form.city" clearable placeholder="请选择市" style="margin-left: 10px">
v-model="form.city"
clearable
placeholder="请选择市"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in citylist" v-for="item in citylist"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickcity3(item)" @click.native="clickcity3(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="form.area" clearable placeholder="请选择区" style="margin-left: 10px">
v-model="form.area"
clearable
placeholder="请选择区"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in arealists" v-for="item in arealists"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native="clickarea3(item)" @click.native="clickarea3(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
<el-select <el-select v-model="form.code" clearable placeholder="请选择街道" style="margin-left: 10px">
v-model="form.code"
clearable
placeholder="请选择街道"
style="margin-left: 10px"
>
<el-option <el-option
v-for="item in streetlist" v-for="item in streetlist"
:key="item.areaCode" :key="item.areaCode"
:label="item.areaName" :label="item.areaName"
:value="item.areaCode" :value="item.areaCode"
@click.native='clickcode2(item)' @click.native="clickcode2(item)"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区名称" prop="communityName"> <el-form-item label="社区名称" prop="communityName">
@ -490,7 +385,7 @@ import {
updateCommunityInfo, updateCommunityInfo,
FirstLevels, FirstLevels,
SecondaryLevelInfo, SecondaryLevelInfo,
SubordinateRegions, SubordinateRegions
} from "@/api/system/communityInfo"; } from "@/api/system/communityInfo";
export default { export default {
@ -518,10 +413,10 @@ export default {
{ {
provinceName: null, provinceName: null,
cityName: null, cityName: null,
streetName: null, streetName: null
}, }
], ]
}, }
], ],
// //
arealist: [], arealist: [],
@ -547,7 +442,7 @@ export default {
city: "", city: "",
area: "", area: "",
areaCode: "", areaCode: "",
province: "", province: ""
// areaCode: null, // areaCode: null,
// communityCode: null, // communityCode: null,
// communityName: null, // communityName: null,
@ -557,7 +452,7 @@ export default {
getProvincequeryParams: { getProvincequeryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
// pageSize: 10, // pageSize: 10,
// searchValue: null, // searchValue: null,
// createBy: null, // createBy: null,
@ -573,7 +468,7 @@ export default {
getProvincequeryParams2: { getProvincequeryParams2: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
// pageSize: 10, // pageSize: 10,
// searchValue: null, // searchValue: null,
// createBy: null, // createBy: null,
@ -593,12 +488,12 @@ export default {
areaCode: { areaCode: {
required: true, required: true,
message: "所属区域不能为空", message: "所属区域不能为空",
trigger: "blur", trigger: "blur"
}, },
communityName: { communityName: {
required: true, required: true,
message: "社区名称不能为空", message: "社区名称不能为空",
trigger: "blur", trigger: "blur"
}, },
// communityLongitude: { // communityLongitude: {
// required: true, // required: true,
@ -614,13 +509,13 @@ export default {
areaCode: { areaCode: {
required: true, required: true,
message: "所属区域不能为空", message: "所属区域不能为空",
trigger: "blur", trigger: "blur"
}, },
communityName: { communityName: {
required: true, required: true,
message: "社区名称不能为空", message: "社区名称不能为空",
trigger: "blur", trigger: "blur"
}, }
// communityLongitude: { // communityLongitude: {
// required: true, // required: true,
// message: "", // message: "",
@ -631,8 +526,8 @@ export default {
// message: "", // message: "",
// trigger: "blur", // trigger: "blur",
// }, // },
}, }
}, }
}; };
}, },
created() { created() {
@ -642,28 +537,20 @@ export default {
methods: { methods: {
clickcode2(item) { clickcode2(item) {
this.form.areaCode = Number(item.areaCode); this.form.areaCode = Number(item.areaCode);
console.log(this.form); this.$forceUpdate();
this.$forceUpdate()
}, },
clickcode(item, index) { clickcode(item, index) {
console.log(item);
this.form.communityInfoList[index].areaCode = Number(item.areaCode); this.form.communityInfoList[index].areaCode = Number(item.areaCode);
// this.form.communityInfoList[index].areaCode = Number(this.form.communityInfoList[index].areaCode); // this.form.communityInfoList[index].areaCode = Number(this.form.communityInfoList[index].areaCode);
console.log(this.form);
}, },
// //
province(item) { province(item) {
// this.form.xxx[index].code='' // this.form.xxx[index].code=''
console.log(item);
this.queryParams.city = ""; this.queryParams.city = "";
this.queryParams.area = ""; this.queryParams.area = "";
this.queryParams.areaCode = ""; this.queryParams.areaCode = "";
SecondaryLevelInfo(item.id).then((res) => { SecondaryLevelInfo(item.id).then(res => {
console.log(res);
// this.SecondaryLevelInfolist = res.data; // this.SecondaryLevelInfolist = res.data;
// console.log(this.SecondaryLevelInfolist);
this.citylist = res.data; this.citylist = res.data;
}); });
}, },
@ -672,35 +559,27 @@ export default {
this.form.communityInfoList[index].city = ""; this.form.communityInfoList[index].city = "";
this.form.communityInfoList[index].area = ""; this.form.communityInfoList[index].area = "";
this.form.communityInfoList[index].areaCode = ""; this.form.communityInfoList[index].areaCode = "";
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
// this.SecondaryLevelInfolist = res.data; // this.SecondaryLevelInfolist = res.data;
// console.log(this.SecondaryLevelInfolist);
this.citylist = res.data; this.citylist = res.data;
}); });
}, },
// //
province3(item) { province3(item) {
// this.form.xxx[index].code='' // this.form.xxx[index].code=''
console.log(item);
this.form.city = ""; this.form.city = "";
this.form.area = ""; this.form.area = "";
this.form.code = ""; this.form.code = "";
SecondaryLevelInfo(item.id).then((res) => { SecondaryLevelInfo(item.id).then(res => {
console.log(res);
// this.SecondaryLevelInfolist = res.data; // this.SecondaryLevelInfolist = res.data;
// console.log(this.SecondaryLevelInfolist);
this.citylist = res.data; this.citylist = res.data;
}); });
}, },
// //
clickcity(item) { clickcity(item) {
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
this.queryParams.area = ""; this.queryParams.area = "";
this.queryParams.areaCode = ""; this.queryParams.areaCode = "";
console.log(res);
this.arealists = res.data; this.arealists = res.data;
}); });
}, },
@ -712,19 +591,15 @@ export default {
// this.value3 = ""; // this.value3 = "";
this.form.communityInfoList[index].area = ""; this.form.communityInfoList[index].area = "";
this.form.communityInfoList[index].areaCode = ""; this.form.communityInfoList[index].areaCode = "";
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.arealists = res.data; this.arealists = res.data;
}); });
}, },
// //
clickcity3(item) { clickcity3(item) {
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
this.form.area = ""; this.form.area = "";
this.form.code = ""; this.form.code = "";
console.log(res);
this.arealists = res.data; this.arealists = res.data;
}); });
}, },
@ -733,9 +608,7 @@ export default {
this.queryParams.areaCode = ""; this.queryParams.areaCode = "";
// this.queryParams.areaCode = ""; // this.queryParams.areaCode = "";
// this.value3 = ""; // this.value3 = "";
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.streetlist = res.data; this.streetlist = res.data;
}); });
}, },
@ -745,9 +618,7 @@ export default {
// this.value3 = ""; // this.value3 = "";
this.form.communityInfoList[index].areaCode = ""; this.form.communityInfoList[index].areaCode = "";
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.streetlist = res.data; this.streetlist = res.data;
}); });
}, },
@ -756,53 +627,42 @@ export default {
this.form.code = ""; this.form.code = "";
// this.queryParams.areaCode = ""; // this.queryParams.areaCode = "";
// this.value3 = ""; // this.value3 = "";
console.log(item); SecondaryLevelInfo(item.id).then(res => {
SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.streetlist = res.data; this.streetlist = res.data;
}); });
}, },
// //
clickstreet(item) { clickstreet(item) {
this.form.areaCode = item.areaCode; this.form.areaCode = item.areaCode;
console.log(this.form);
}, },
// clickstreet3(item) { // clickstreet3(item) {
// this.form.areaCode = item.areaCode; // this.form.areaCode = item.areaCode;
// // console.log(this.queryParams);
// }, // },
// //
loadMore() { loadMore() {
console.log("1");
var a = Math.ceil(this.total2 / 10); var a = Math.ceil(this.total2 / 10);
console.log(this.arealist.length);
if (this.arealist.length + 1 >= this.total2) { if (this.arealist.length + 1 >= this.total2) {
} else { } else {
if (this.getProvincequeryParams.pageNum >= a) { if (this.getProvincequeryParams.pageNum >= a) {
} else { } else {
this.getProvincequeryParams.pageNum++; this.getProvincequeryParams.pageNum++;
FirstLevels(this.getProvincequeryParams).then((res) => { FirstLevels(this.getProvincequeryParams).then(res => {
console.log(res); res.rows.forEach(e => {
res.rows.forEach((e) => {
this.arealist.push(e); this.arealist.push(e);
console.log(this.arealist);
}); });
}); });
} }
} }
}, },
Provincelist() { Provincelist() {
FirstLevels(this.getProvincequeryParams).then((res) => { FirstLevels(this.getProvincequeryParams).then(res => {
console.log(res);
this.arealist = res.data; this.arealist = res.data;
this.total2 = res.total; this.total2 = res.total;
console.log(this.arealist);
}); });
}, },
//delcommunity //delcommunity
delcommunity(index) { delcommunity(index) {
this.form.communityInfoList.splice(index, 1); this.form.communityInfoList.splice(index, 1);
console.log(this.form.communityInfoList);
}, },
//addcommunity //addcommunity
addcommunity() { addcommunity() {
@ -811,7 +671,7 @@ export default {
communityCode: "", communityCode: "",
communityName: "", communityName: "",
communityLongitude: "", communityLongitude: "",
communityLatitude: "", communityLatitude: ""
// diseaseName: "", // diseaseName: "",
// description: "", // description: "",
// sort: "", // sort: "",
@ -852,16 +712,16 @@ export default {
communityCode: "", communityCode: "",
communityName: "", communityName: "",
communityLongitude: "", communityLongitude: "",
communityLatitude: "", communityLatitude: ""
}, }
], ]
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
liststationinfo() { liststationinfo() {
listCommunityInfo(this.queryParams).then((response) => { listCommunityInfo(this.queryParams).then(response => {
response.rows.forEach((e) => { response.rows.forEach(e => {
if (e.sysAreaVOList == []) { if (e.sysAreaVOList == []) {
} else if (e.sysAreaVOList == null) { } else if (e.sysAreaVOList == null) {
} else if (!e.sysAreaVOList) { } else if (!e.sysAreaVOList) {
@ -924,13 +784,13 @@ export default {
area: null, area: null,
areaCode: null, areaCode: null,
areaName: null, areaName: null,
areaLevel: null, areaLevel: null
}; };
this.handleQuery(); this.handleQuery();
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id); this.ids = selection.map(item => item.id);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -944,16 +804,13 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
console.log(row);
const id = row.id || this.ids; const id = row.id || this.ids;
getCommunityInfo(id).then((response) => { getCommunityInfo(id).then(response => {
this.form = response.data; this.form = response.data;
this.title = "修改居住社区信息"; this.title = "修改居住社区信息";
this.form.code = null; this.form.code = null;
console.log(1); SubordinateRegions(response.data.areaCode).then(res => {
SubordinateRegions(response.data.areaCode).then((res) => {
console.log(res);
if (res.data !== null) { if (res.data !== null) {
this.form.province = String(res.data.provinceCode); this.form.province = String(res.data.provinceCode);
// this.form.province = res.data.provinceCode; // this.form.province = res.data.provinceCode;
@ -961,7 +818,6 @@ export default {
this.form.area = res.data.regionName; this.form.area = res.data.regionName;
// this.form.areaCode = res.data.streetName; // this.form.areaCode = res.data.streetName;
this.form.code = res.data.streetName; this.form.code = res.data.streetName;
console.log(this.form);
this.open = true; this.open = true;
} }
}); });
@ -969,13 +825,13 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
// let newStr = JSON.stringify(this.form.areaCode); // let newStr = JSON.stringify(this.form.areaCode);
// let newObj = JSON.parse(newStr); // let newObj = JSON.parse(newStr);
if (this.form.id != null) { if (this.form.id != null) {
updateCommunityInfo(this.form).then((response) => { updateCommunityInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open2 = false; this.open2 = false;
this.open = false; this.open = false;
@ -983,7 +839,7 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
addCommunityInfo(this.form).then((response) => { addCommunityInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.open2 = false; this.open2 = false;
@ -1012,11 +868,11 @@ export default {
this.download( this.download(
"system/communityInfo/export", "system/communityInfo/export",
{ {
...this.queryParams, ...this.queryParams
}, },
`communityInfo_${new Date().getTime()}.xlsx` `communityInfo_${new Date().getTime()}.xlsx`
); );
}, }
}, }
}; };
</script> </script>

View File

@ -321,7 +321,6 @@ export default {
//deldisease //deldisease
deldisease(index) { deldisease(index) {
this.form.diseaseInfoList.splice(index, 1); this.form.diseaseInfoList.splice(index, 1);
console.log(this.form.diseaseInfoList);
}, },
//adddisease //adddisease
adddisease() { adddisease() {

View File

@ -57,16 +57,8 @@
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@ -78,8 +70,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:goodsCategory:add']" v-hasPermi="['system:goodsCategory:add']"
>新增</el-button >新增</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -90,8 +81,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:goodsCategory:edit']" v-hasPermi="['system:goodsCategory:edit']"
>修改</el-button >修改</el-button>
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -102,8 +92,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:goodsCategory:remove']" v-hasPermi="['system:goodsCategory:remove']"
>删除</el-button >删除</el-button>
>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
@ -116,10 +105,7 @@
>导出</el-button >导出</el-button
> >
</el-col>--> </el-col>-->
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table
@ -134,11 +120,7 @@
align="center" align="center"
prop="goodsCategoryName" prop="goodsCategoryName"
/> />
<el-table-column <el-table-column label="商品分类编码" align="center" prop="goodsCategoryCode" />
label="商品分类编码"
align="center"
prop="goodsCategoryCode"
/>
<!-- <el-table-column label="商品分类图片地址" align="center" prop="goodsCategoryPicture" /> --> <!-- <el-table-column label="商品分类图片地址" align="center" prop="goodsCategoryPicture" /> -->
<el-table-column <el-table-column
label="分类概述" label="分类概述"
@ -147,11 +129,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="显示顺序" align="center" prop="sort" /> <el-table-column label="显示顺序" align="center" prop="sort" />
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -159,16 +137,14 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:goodsCategory:edit']" v-hasPermi="['system:goodsCategory:edit']"
>修改</el-button >修改</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:goodsCategory:remove']" v-hasPermi="['system:goodsCategory:remove']"
>删除</el-button >删除</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -192,12 +168,7 @@
:before-close="cancel" :before-close="cancel"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item <el-form-item label="父级分类名称" prop="parentName" :required="true" v-if="form.parentId">
label="父级分类名称"
prop="parentName"
:required="true"
v-if="form.parentId"
>
<el-cascader <el-cascader
:props="treeOption" :props="treeOption"
@change="change" @change="change"
@ -206,8 +177,7 @@
ref="cascader" ref="cascader"
:key="isResouceShow" :key="isResouceShow"
:placeholder="form.parentName ? form.parentName : ''" :placeholder="form.parentName ? form.parentName : ''"
> ></el-cascader>
</el-cascader>
<!-- <el-input <!-- <el-input
v-model="form.parentName" v-model="form.parentName"
placeholder="请输入父级分类名称" placeholder="请输入父级分类名称"
@ -216,11 +186,7 @@
/>--> />-->
</el-form-item> </el-form-item>
<el-form-item label="商品分类名称" prop="goodsCategoryName"> <el-form-item label="商品分类名称" prop="goodsCategoryName">
<el-input <el-input v-model="form.goodsCategoryName" placeholder="请输入商品分类名称" maxlength="10" />
v-model="form.goodsCategoryName"
placeholder="请输入商品分类名称"
maxlength="10"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品分类编码" prop="goodsCategoryCode"> <!-- <el-form-item label="商品分类编码" prop="goodsCategoryCode">
<el-input <el-input
@ -238,11 +204,7 @@
<!-- <img :src="form.goodsCategoryPicture" alt="" /> --> <!-- <img :src="form.goodsCategoryPicture" alt="" /> -->
</el-form-item> </el-form-item>
<el-form-item label="分类概述" prop="categoryRemark"> <el-form-item label="分类概述" prop="categoryRemark">
<el-input <el-input v-model="form.categoryRemark" placeholder="请输入分类概述" maxlength="300" />
v-model="form.categoryRemark"
placeholder="请输入分类概述"
maxlength="300"
/>
</el-form-item> </el-form-item>
<el-form-item label="显示顺序" prop="sort"> <el-form-item label="显示顺序" prop="sort">
<el-input <el-input
@ -269,7 +231,7 @@ import {
updatePicture, updatePicture,
addGoodsCategory, addGoodsCategory,
updateGoodsCategory, updateGoodsCategory,
getStationCategoryList, getStationCategoryList
} from "@/api/system/goodsCategory"; } from "@/api/system/goodsCategory";
import stationAcatar from "../stationAvatar/index.vue"; import stationAcatar from "../stationAvatar/index.vue";
import baseurl from "@/api/baseurl"; import baseurl from "@/api/baseurl";
@ -286,22 +248,22 @@ export default {
lazyLoad(node, resolve) { lazyLoad(node, resolve) {
const id = node.level === 0 ? 0 : node.data.id; const id = node.level === 0 ? 0 : node.data.id;
setTimeout(() => { setTimeout(() => {
getStationCategoryList(id).then((res) => { getStationCategoryList(id).then(res => {
// //
res.data.forEach((e) => { res.data.forEach(e => {
e.value = e.id; e.value = e.id;
e.label = e.goodsCategoryName; e.label = e.goodsCategoryName;
}); });
resolve( resolve(
res.data.map((item) => { res.data.map(item => {
return { return {
...item, ...item
}; };
}) })
); );
}); });
}, 300); }, 300);
}, }
}, },
imgone: "", imgone: "",
baseurl: "", baseurl: "",
@ -333,35 +295,33 @@ export default {
categoryRemark: null, categoryRemark: null,
sort: null, sort: null,
parentId: 0, parentId: 0,
parentName: "", parentName: ""
}, },
// //
form: {}, form: {},
// //
rules: { rules: {
goodsCategoryName: [ goodsCategoryName: [
{ required: true, message: "商品分类名称不能为空", trigger: "blur" }, { required: true, message: "商品分类名称不能为空", trigger: "blur" }
], ],
goodsCategoryCode: [ goodsCategoryCode: [
{ required: true, message: "商品分类编码不能为空", trigger: "blur" }, { required: true, message: "商品分类编码不能为空", trigger: "blur" }
], ],
goodsCategoryPicture: [ goodsCategoryPicture: [
{ required: true, message: "商品分类图片不能为空", trigger: "blur" }, { required: true, message: "商品分类图片不能为空", trigger: "blur" }
], ],
categoryRemark: [ categoryRemark: [
{ required: true, message: "分类概述不能为空", trigger: "blur" }, { required: true, message: "分类概述不能为空", trigger: "blur" }
],
sort: [
{ required: true, message: "显示顺序不能为空", trigger: "blur" },
], ],
sort: [{ required: true, message: "显示顺序不能为空", trigger: "blur" }]
}, },
// //
deptOptions: undefined, deptOptions: undefined,
categoryLevel: null, categoryLevel: null,
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "goodsCategoryName", label: "goodsCategoryName"
}, }
}; };
}, },
@ -383,12 +343,12 @@ export default {
this.queryParams.parentName = data.goodsCategoryName; this.queryParams.parentName = data.goodsCategoryName;
// this.categoryLevel = data.categoryLevel; // this.categoryLevel = data.categoryLevel;
this.handleQuery(); this.handleQuery();
getStationCategoryList(data.id).then((res) => { getStationCategoryList(data.id).then(res => {
res.data.forEach((e) => { res.data.forEach(e => {
e.children = [ e.children = [
{ {
goodsCategoryName: "", goodsCategoryName: ""
}, }
]; ];
}); });
this.loading = false; this.loading = false;
@ -398,20 +358,20 @@ export default {
/** 查询商品分类信息列表 */ /** 查询商品分类信息列表 */
info() { info() {
this.loading = true; this.loading = true;
getStationCategoryList(0).then((res) => { getStationCategoryList(0).then(res => {
res.data.forEach((e) => { res.data.forEach(e => {
e.children = [ e.children = [
{ {
goodsCategoryName: "", goodsCategoryName: ""
}, }
]; ];
}); });
var obj = [ var obj = [
{ {
goodsCategoryName: "商品分类名称", goodsCategoryName: "商品分类名称",
children: res.data, children: res.data,
id: 0, id: 0
}, }
]; ];
this.deptOptions = obj; this.deptOptions = obj;
this.loading = false; this.loading = false;
@ -419,7 +379,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
listGoodsCategory(this.queryParams).then((response) => { listGoodsCategory(this.queryParams).then(response => {
this.goodsCategoryList = response.rows; this.goodsCategoryList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -433,7 +393,7 @@ export default {
obj.pictureUrlList.push(this.form.goodsCategoryPicture); obj.pictureUrlList.push(this.form.goodsCategoryPicture);
} }
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {}); updatePicture(obj).then(res => {});
} }
this.open = false; this.open = false;
this.reset(); this.reset();
@ -452,7 +412,7 @@ export default {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
parentId: null, parentId: null,
parentName: null, parentName: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -466,14 +426,14 @@ export default {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
parentId: 0, parentId: 0
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id); this.ids = selection.map(item => item.id);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -482,7 +442,6 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加商品分类信息"; this.title = "添加商品分类信息";
console.log(this.queryParams);
// if (this.queryParams.parentId != 0) { // if (this.queryParams.parentId != 0) {
this.form.parentId = this.queryParams.parentId; this.form.parentId = this.queryParams.parentId;
// } // }
@ -493,26 +452,25 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getGoodsCategory(id).then((response) => { getGoodsCategory(id).then(response => {
this.form = response.data; this.form = response.data;
this.imgone = this.form.goodsCategoryPicture; this.imgone = this.form.goodsCategoryPicture;
this.open = true; this.open = true;
this.title = "修改商品分类信息"; this.title = "修改商品分类信息";
console.log(this.form);
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateGoodsCategory(this.form).then((response) => { updateGoodsCategory(this.form).then(response => {
var obj = { pictureUrlList: [] }; var obj = { pictureUrlList: [] };
if (this.imgone != this.form.goodsCategoryPicture) { if (this.imgone != this.form.goodsCategoryPicture) {
obj.pictureUrlList.push(this.imgone); obj.pictureUrlList.push(this.imgone);
} }
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {}); updatePicture(obj).then(res => {});
} }
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
++this.isResouceShow; ++this.isResouceShow;
@ -521,7 +479,7 @@ export default {
this.info(); this.info();
}); });
} else { } else {
addGoodsCategory(this.form).then((response) => { addGoodsCategory(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
++this.isResouceShow; ++this.isResouceShow;
this.open = false; this.open = false;
@ -534,7 +492,6 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row);
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm("是否确认删除?") .confirm("是否确认删除?")
@ -545,9 +502,7 @@ export default {
var obj = { pictureUrlList: [] }; var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsCategoryPicture); obj.pictureUrlList.push(row.goodsCategoryPicture);
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => { updatePicture(obj).then(res => {});
console.log(res);
});
} }
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
@ -559,15 +514,15 @@ export default {
this.download( this.download(
"system/goodsCategory/export", "system/goodsCategory/export",
{ {
...this.queryParams, ...this.queryParams
}, },
`goodsCategory_${new Date().getTime()}.xlsx` `goodsCategory_${new Date().getTime()}.xlsx`
); );
}, },
imgUrl(imgUrl) { imgUrl(imgUrl) {
this.form.goodsCategoryPicture = imgUrl; this.form.goodsCategoryPicture = imgUrl;
}, }
}, }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -210,7 +210,6 @@ export default {
}, },
// //
uploadImg() { uploadImg() {
// console.log(this.types);
this.$refs.cropper.getCropBlob((data) => { this.$refs.cropper.getCropBlob((data) => {
let formData = new FormData(); let formData = new FormData();
formData.append("file", data); formData.append("file", data);

View File

@ -73,8 +73,7 @@ export default {
label: "是", label: "是",
}, },
], ],
integraloption: [ integraloption: [{
{
value: 0, value: 0,
label: "否", label: "否",
}, },
@ -183,7 +182,6 @@ export default {
this.imgsurl.pictureUrlList.push(item); this.imgsurl.pictureUrlList.push(item);
}, },
upwhetherShelf(row) { upwhetherShelf(row) {
console.log(row);
if (row.whetherShelf == false) { if (row.whetherShelf == false) {
var obj = { var obj = {
id: row.goodsInfoId, id: row.goodsInfoId,
@ -196,7 +194,6 @@ export default {
}; };
} }
editGoodsWhetherShelf(obj).then((res) => { editGoodsWhetherShelf(obj).then((res) => {
console.log(obj);
if (obj.whetherShelf == 0) { if (obj.whetherShelf == 0) {
this.$modal.msgSuccess("已修改上架状态为未上架"); this.$modal.msgSuccess("已修改上架状态为未上架");
} else { } else {
@ -217,14 +214,12 @@ export default {
} }
}); });
this.goodsInfoList = response.rows; this.goodsInfoList = response.rows;
console.log(this.goodsInfoList);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
// 添加 // 添加
addgoodAttributeDetail() { addgoodAttributeDetail() {
console.log(this.goodDetailsLists);
if (this.goodDetailsLists.length == 5) { if (this.goodDetailsLists.length == 5) {
this.$message.error("最多只能5条"); this.$message.error("最多只能5条");
} else { } else {
@ -270,9 +265,7 @@ export default {
obj.pictureUrlList.push(this.form.goodsPictureUrl); obj.pictureUrlList.push(this.form.goodsPictureUrl);
} }
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => { updatePicture(obj).then((res) => {});
console.log(res);
});
} }
if (this.imgsurl.pictureUrlList.length > 0) { if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {}); updatePicture(this.imgsurl).then((res) => {});
@ -367,7 +360,6 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
console.log(selection);
this.ids = selection.map((item) => item.goodsInfoId); this.ids = selection.map((item) => item.goodsInfoId);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
@ -396,7 +388,6 @@ export default {
// this.reset(); // this.reset();
const id = row.goodsInfoId || this.ids; const id = row.goodsInfoId || this.ids;
getGoodsInfo(id).then((response) => { getGoodsInfo(id).then((response) => {
console.log(response);
this.form = response.data; this.form = response.data;
this.form.nurseStationName = row.nurseStationName; this.form.nurseStationName = row.nurseStationName;
this.imgone = this.form.goodsPictureUrl; this.imgone = this.form.goodsPictureUrl;
@ -409,8 +400,6 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.form);
console.log(this.goodDetailsLists);
this.form.goodAttributeDetailsLists = []; this.form.goodAttributeDetailsLists = [];
this.form.goodDetailsLists = this.goodDetailsLists; this.form.goodDetailsLists = this.goodDetailsLists;
if (!this.form.goodDetailsLists.integralExchangeFlag) { if (!this.form.goodDetailsLists.integralExchangeFlag) {
@ -423,7 +412,6 @@ export default {
if (this.form.goodDetailsLists.integralExchangeCount == "") { if (this.form.goodDetailsLists.integralExchangeCount == "") {
this.form.goodDetailsLists.integralExchangeCount = null this.form.goodDetailsLists.integralExchangeCount = null
} }
console.log(this.form);
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.goodsInfoId != null) { if (this.form.goodsInfoId != null) {
@ -437,9 +425,7 @@ export default {
obj.pictureUrlList.push(this.imgone); obj.pictureUrlList.push(this.imgone);
} }
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => { updatePicture(obj).then((res) => {});
console.log(res);
});
} }
this.imgsurl = { pictureUrlList: [] }; this.imgsurl = { pictureUrlList: [] };
++this.isResouceShow; ++this.isResouceShow;
@ -464,7 +450,6 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log("row :>> ", row);
this.$confirm("是否确认删除订单信息的数据项?", "提示", { this.$confirm("是否确认删除订单信息的数据项?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -473,14 +458,11 @@ export default {
.then(() => { .then(() => {
var obj = { pictureUrlList: [] }; var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsPictureUrl); obj.pictureUrlList.push(row.goodsPictureUrl);
updatePicture(obj).then((res) => { updatePicture(obj).then((res) => {});
console.log(res);
});
delGoodsInfo(row.goodsInfoId).then((res) => { delGoodsInfo(row.goodsInfoId).then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.getList(); this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
}); });
}) })
.catch(() => {}); .catch(() => {});
@ -509,11 +491,9 @@ export default {
// ); // );
// }, // },
imgUrl(imgUrl) { imgUrl(imgUrl) {
console.log(imgUrl);
this.form.goodsPictureUrl = imgUrl; this.form.goodsPictureUrl = imgUrl;
}, },
attributePitureUrl(imgUrl) { attributePitureUrl(imgUrl) {
console.log(imgUrl);
// this.form.attributePitureUrl = imgUrl; // this.form.attributePitureUrl = imgUrl;
}, },
attributePitureitem(item) { attributePitureitem(item) {
@ -535,12 +515,9 @@ export default {
//权限列表 //权限列表
info() { info() {
goodsCategory().then((res) => { goodsCategory().then((res) => {
console.log(res);
console.log(this.form);
this.goodsCategorylist = res.rows; this.goodsCategorylist = res.rows;
}); });
getListByUser(this.getListByUserquery).then((res) => { getListByUser(this.getListByUserquery).then((res) => {
console.log(res);
this.total2 = res.total; this.total2 = res.total;
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id; this.queryParams.nurseStationId = res.rows[0].id;
@ -558,7 +535,6 @@ export default {
pageSize: 9999, pageSize: 9999,
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
console.log(res)
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, },

View File

@ -708,14 +708,12 @@ export default {
}, },
// //
seelogistics(row) { seelogistics(row) {
// console.log(id);
// this.queryexpressNo.id = row.id; // this.queryexpressNo.id = row.id;
this.queryexpressNo = JSON.parse(JSON.stringify(row)); this.queryexpressNo = JSON.parse(JSON.stringify(row));
this.innerlogistics = true; this.innerlogistics = true;
}, },
// //
searchlogistics() { searchlogistics() {
console.log(this.queryexpressNo);
editExpressNo(this.queryexpressNo).then(res => { editExpressNo(this.queryexpressNo).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$modal.msgSuccess("录入成功"); this.$modal.msgSuccess("录入成功");
@ -732,10 +730,8 @@ export default {
}, },
// 退 // 退
refund(id) { refund(id) {
console.log(id);
goodsOrderRefundinfo(id).then(res => { goodsOrderRefundinfo(id).then(res => {
this.refundlist = res.data; this.refundlist = res.data;
console.log(this.refundlist);
this.innerrefund = true; this.innerrefund = true;
// this.getList(); // this.getList();
}); });
@ -758,7 +754,6 @@ export default {
}); });
}, },
// refund(id){ // refund(id){
// console.log(id);
// this.$confirm('退?', '', { // this.$confirm('退?', '', {
// confirmButtonText: '', // confirmButtonText: '',
// cancelButtonText: '', // cancelButtonText: '',
@ -937,7 +932,6 @@ export default {
pageSize: 9999 pageSize: 9999
}; };
getListByUser(queryFor).then(res => { getListByUser(queryFor).then(res => {
console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
} }

View File

@ -284,7 +284,6 @@ export default {
//deldisease //deldisease
deldisease(index) { deldisease(index) {
this.form.nurseTypeList.splice(index, 1); this.form.nurseTypeList.splice(index, 1);
console.log(this.form.nurseTypeList);
}, },
adddisease() { adddisease() {
var obj = { var obj = {

View File

@ -539,7 +539,6 @@ export default {
} }
this.getList(); this.getList();
this.innerrefund = false; this.innerrefund = false;
console.log(res);
}); });
}, },
// //
@ -629,7 +628,6 @@ export default {
getPerson(this.querynursePersonname).then(res => { getPerson(this.querynursePersonname).then(res => {
this.dispatchlist = res.rows; this.dispatchlist = res.rows;
this.total2 = res.total; this.total2 = res.total;
console.log(this.dispatchlist);
this.nursePersonNameinfo = true; this.nursePersonNameinfo = true;
}); });
}, },
@ -653,7 +651,6 @@ export default {
this.nursePersonid = row.nurseStationPersonId; this.nursePersonid = row.nurseStationPersonId;
this.nurseName = row.nursePersonName; this.nurseName = row.nursePersonName;
this.nursePersonNameinfo = false; this.nursePersonNameinfo = false;
console.log(row);
}, },
// //
cencel(row) { cencel(row) {
@ -694,7 +691,6 @@ export default {
handleQuery2() { handleQuery2() {
getPerson(this.querynursePersonname).then(res => { getPerson(this.querynursePersonname).then(res => {
this.dispatchlist = res.rows; this.dispatchlist = res.rows;
console.log(this.querynursePersonname);
// this.innerdispatch = true; // this.innerdispatch = true;
}); });
}, },
@ -733,7 +729,6 @@ export default {
pageSize: 9999 pageSize: 9999
}; };
getListByUser(queryFor).then(res => { getListByUser(queryFor).then(res => {
console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, },
@ -749,7 +744,6 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
// console.log('row :>> ', row);
this.$confirm("是否确认删除订单信息的数据项?", "提示", { this.$confirm("是否确认删除订单信息的数据项?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",

View File

@ -602,9 +602,7 @@ export default {
methods: { methods: {
// //
handleResetPwd(row) { handleResetPwd(row) {
console.log(row)
const id= row.id const id= row.id
console.log(id)
// const id=row.userId // const id=row.userId
this.$prompt('请输入新的密码', "提示", { this.$prompt('请输入新的密码', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -614,7 +612,6 @@ export default {
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间", inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
}) })
.then((res) => { .then((res) => {
console.log(res)
const params = { const params = {
id, id,
password: res.value password: res.value
@ -627,7 +624,6 @@ export default {
}, },
// //
province(item) { province(item) {
console.log(item);
this.queryParams.city = ""; this.queryParams.city = "";
this.queryParams.area = ""; this.queryParams.area = "";
this.queryParams.areaCode = ""; this.queryParams.areaCode = "";
@ -635,9 +631,7 @@ export default {
// this.value2 = ""; // this.value2 = "";
// this.value3 = ""; // this.value3 = "";
SecondaryLevelInfo(item.id).then((res) => { SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.SecondaryLevelInfolist = res.data; this.SecondaryLevelInfolist = res.data;
// console.log(this.SecondaryLevelInfolist);
this.citylist = res.data; this.citylist = res.data;
}); });
}, },
@ -647,41 +641,32 @@ export default {
this.queryParams.areaCode = ""; this.queryParams.areaCode = "";
// this.value2 = ""; // this.value2 = "";
// this.value3 = ""; // this.value3 = "";
console.log(item);
SecondaryLevelInfo(item.id).then((res) => { SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.arealists = res.data; this.arealists = res.data;
}); });
}, },
// //
clickarea(item) { clickarea(item) {
// this.value3 = ""; // this.value3 = "";
console.log(item);
SecondaryLevelInfo(item.id).then((res) => { SecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.streetlist = res.data; this.streetlist = res.data;
}); });
}, },
// //
clickstreet(item) { clickstreet(item) {
this.form.areaCode = item.areaCode; this.form.areaCode = item.areaCode;
console.log(this.form);
}, },
// //
loadMore() { loadMore() {
console.log("1");
var a = Math.ceil(this.total2 / 10); var a = Math.ceil(this.total2 / 10);
console.log(this.arealist.length);
if (this.arealist.length + 1 >= this.total2) { if (this.arealist.length + 1 >= this.total2) {
} else { } else {
if (this.getProvincequeryParams.pageNum >= a) { if (this.getProvincequeryParams.pageNum >= a) {
} else { } else {
this.getProvincequeryParams.pageNum++; this.getProvincequeryParams.pageNum++;
FirstLevel(this.getProvincequeryParams).then((res) => { FirstLevel(this.getProvincequeryParams).then((res) => {
console.log(res);
res.rows.forEach((e) => { res.rows.forEach((e) => {
this.arealist.push(e); this.arealist.push(e);
console.log(this.arealist);
}); });
}); });
} }
@ -689,10 +674,8 @@ export default {
}, },
Provincelist() { Provincelist() {
FirstLevel(this.getProvincequeryParams).then((res) => { FirstLevel(this.getProvincequeryParams).then((res) => {
console.log(res);
this.arealist = res.data; this.arealist = res.data;
this.total2 = res.total; this.total2 = res.total;
console.log(this.arealist);
}); });
}, },
/** 查询被护理人基本信息列表 */ /** 查询被护理人基本信息列表 */

View File

@ -265,7 +265,6 @@ export default {
//接收图片所属的item //接收图片所属的item
imgclassifyItem(item) { imgclassifyItem(item) {
let items = JSON.parse(item); let items = JSON.parse(item);
console.log(items)
if (items.idd && !items.id) { if (items.idd && !items.id) {
this.form.nurseStationPersonCertificateList.forEach((e) => { this.form.nurseStationPersonCertificateList.forEach((e) => {
if (e.idd == items.idd) { if (e.idd == items.idd) {
@ -284,7 +283,6 @@ export default {
departclick(item, index) { departclick(item, index) {
if (this.form.nurseStationId != null) { if (this.form.nurseStationId != null) {
this.getList3(); this.getList3();
console.log(item);
this.departid = item.departmentCode; this.departid = item.departmentCode;
this.innerVisible2 = true; this.innerVisible2 = true;
this.index = index; this.index = index;
@ -295,7 +293,6 @@ export default {
}, },
// // 修改所属科室按钮 // // 修改所属科室按钮
departclick2() { departclick2() {
console.log(this.form.nurseStationId);
if (this.form.nurseStationId != null) { if (this.form.nurseStationId != null) {
this.getList3(); this.getList3();
this.departid2 = this.form.departmentCode; this.departid2 = this.form.departmentCode;
@ -321,7 +318,6 @@ export default {
}, },
// 修改护理站 // 修改护理站
nurseclick2(row) { nurseclick2(row) {
console.log(row);
this.nurseStationName = row.nurseStationName; this.nurseStationName = row.nurseStationName;
this.stationid2 = row.id; this.stationid2 = row.id;
this.form.nurseStationId = row.id; this.form.nurseStationId = row.id;
@ -343,10 +339,8 @@ export default {
}, },
// 所属科室 // 所属科室
StationDepartmentclick(row) { StationDepartmentclick(row) {
console.log(row);
this.departname = row.departmentName; this.departname = row.departmentName;
this.departid = row.departmentCode; this.departid = row.departmentCode;
console.log(this.departid);
this.departmentCode = row.departmentCode; this.departmentCode = row.departmentCode;
// this.form.nurseStationId = row.id; // this.form.nurseStationId = row.id;
this.innerVisible2 = false; this.innerVisible2 = false;
@ -355,11 +349,9 @@ export default {
row.departmentName; row.departmentName;
this.form.nurseStationPersonList[this.index].departmentCode = this.form.nurseStationPersonList[this.index].departmentCode =
row.departmentCode; row.departmentCode;
console.log(this.form);
}, },
// 修改科室 // 修改科室
StationDepartmentclick2(row) { StationDepartmentclick2(row) {
console.log(row);
this.departmentName = row.departmentName; this.departmentName = row.departmentName;
this.form.departmentCode = row.departmentCode; this.form.departmentCode = row.departmentCode;
this.departid2 = row.departmentCode; this.departid2 = row.departmentCode;
@ -503,7 +495,6 @@ export default {
handleUpdate(row) { handleUpdate(row) {
const id = row.id || this.ids; const id = row.id || this.ids;
getPerson(id).then((response) => { getPerson(id).then((response) => {
console.log(response);
this.departmentName = response.data.departmentName; this.departmentName = response.data.departmentName;
this.nurseStationName = response.data.nurseStationName; this.nurseStationName = response.data.nurseStationName;
this.form = response.data; this.form = response.data;

View File

@ -804,8 +804,6 @@ export default {
this.form.stationIntroducePcitureUrl = imgUrl; this.form.stationIntroducePcitureUrl = imgUrl;
}, },
delnurseStationLabelList(index, item) { delnurseStationLabelList(index, item) {
console.log(index, item);
console.log();
// this.looknurseStationLabel.splice(index,1) // this.looknurseStationLabel.splice(index,1)
if (this.looknurseStationLabel.length === 1) { if (this.looknurseStationLabel.length === 1) {
this.looknurseStationLabel = [{ this.looknurseStationLabel = [{
@ -833,7 +831,6 @@ export default {
// //
clickstreet(item) { clickstreet(item) {
this.form.areaCode = item.areaCode; this.form.areaCode = item.areaCode;
console.log(item, this.form);
}, },
// //
clickarea(item) { clickarea(item) {
@ -1056,7 +1053,6 @@ export default {
this.looknurseStationLabel = response.data.nurseStationLabel; this.looknurseStationLabel = response.data.nurseStationLabel;
this.open = true; this.open = true;
this.loading = false; this.loading = false;
console.log(this.form);
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

View File

@ -168,7 +168,6 @@ export default {
} else { } else {
this.video.VideoPath = baseurl + this.tovideo; this.video.VideoPath = baseurl + this.tovideo;
} }
console.log(this.video);
if (this.img == null) { if (this.img == null) {
this.options.img = null; this.options.img = null;
} else if (this.img == "") { } else if (this.img == "") {
@ -294,7 +293,6 @@ export default {
if (this.types == "certificateUrl") { if (this.types == "certificateUrl") {
this.items.certificateUrl = response.imgUrl; this.items.certificateUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items)); this.$emit("item", JSON.stringify(this.items));
console.log(this.item);
} }
if (this.types == "personCertificateUrl") { if (this.types == "personCertificateUrl") {
this.items.certificateUrl = response.imgUrl; this.items.certificateUrl = response.imgUrl;

View File

@ -496,7 +496,6 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {

View File

@ -1161,7 +1161,6 @@ export default {
e.consumableCount = Number(e.consumableCount); e.consumableCount = Number(e.consumableCount);
}); });
} }
console.log(this.form)
if (this.form.nurseStationItemPrices.length > 0) { if (this.form.nurseStationItemPrices.length > 0) {
this.form.nurseStationItemPrices.forEach(e => { this.form.nurseStationItemPrices.forEach(e => {
if (!e.commissionAmount || e.commissionAmount == "") { if (!e.commissionAmount || e.commissionAmount == "") {

View File

@ -661,21 +661,18 @@ export default {
methods: { methods: {
listinfo() { listinfo() {
list(this.nurseStationqueryParams).then((res) => { list(this.nurseStationqueryParams).then((res) => {
console.log(res);
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.total2 = res.total; this.total2 = res.total;
}); });
}, },
loadMore() { loadMore() {
var a = Math.ceil(this.total2 / 10); var a = Math.ceil(this.total2 / 10);
console.log(this.nurseStationlist.length);
if (this.nurseStationlist.length + 1 >= this.total2) { if (this.nurseStationlist.length + 1 >= this.total2) {
} else { } else {
if (this.nurseStationqueryParams.pageNum >= a) { if (this.nurseStationqueryParams.pageNum >= a) {
} else { } else {
this.nurseStationqueryParams.pageNum++; this.nurseStationqueryParams.pageNum++;
list(this.nurseStationqueryParams).then((res) => { list(this.nurseStationqueryParams).then((res) => {
console.log(res);
res.rows.forEach((e) => { res.rows.forEach((e) => {
this.nurseStationlist.push(e); this.nurseStationlist.push(e);
}); });
@ -814,8 +811,6 @@ export default {
// return (e = Number(e)); // return (e = Number(e));
// }); // });
// } // }
console.log(this.form);
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; this.roleOptions = response.roles;
this.form.postIds = response.postIds; this.form.postIds = response.postIds;
@ -855,7 +850,6 @@ export default {
// this.form.nurseStationIds = JSON.stringify(this.form.nurseStationIds); // this.form.nurseStationIds = JSON.stringify(this.form.nurseStationIds);
// var obj = []; // var obj = [];
// obj.push(this.form.nurseStationIds); // obj.push(this.form.nurseStationIds);
// console.log(obj)
// this.form.nurseStationIds = obj; // this.form.nurseStationIds = obj;
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
@ -865,7 +859,6 @@ export default {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
// console.log('bbb',this.form)
}); });
} else { } else {
this.form.nurseStationIds = Number(this.form.nurseStationIds); this.form.nurseStationIds = Number(this.form.nurseStationIds);
@ -873,7 +866,6 @@ export default {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
// console.log('bbb',this.form)
}); });
} }

View File

@ -12,15 +12,13 @@ export default {
}, },
methods: { methods: {
info() { info() {
getListByUser().then((res) => { getListByUser().then(res => {
console.log(res);
if (res.rows[0].isAdmin == "1") { if (res.rows[0].isAdmin == "1") {
console.log(true);
} else { } else {
this.$emit("itemlist", res.rows); this.$emit("itemlist", res.rows);
} }
}); });
}, }
}, }
}; };
</script> </script>